Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
09a1672d
Commit
09a1672d
authored
Apr 09, 2021
by
吴春
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
提交代码
parent
5e286859
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
16 additions
and
8 deletions
+16
-8
RB_Web_Advisory.cs
Edu.Model/Entity/Web/RB_Web_Advisory.cs
+5
-0
RB_Web_Advisory_ViewModel.cs
Edu.Model/ViewModel/Web/RB_Web_Advisory_ViewModel.cs
+3
-0
StudentModule.cs
Edu.Module.User/StudentModule.cs
+1
-1
MessageCore.cs
Edu.ThirdCore/Message/MessageCore.cs
+1
-0
APPStudentLoginController.cs
Edu.WebApi/Controllers/APP/APPStudentLoginController.cs
+6
-7
No files found.
Edu.Model/Entity/Web/RB_Web_Advisory.cs
View file @
09a1672d
...
@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.Web
...
@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.Web
/// 学校编号
/// 学校编号
/// </summary>
/// </summary>
public
int
School_Id
{
get
;
set
;
}
public
int
School_Id
{
get
;
set
;
}
public
string
BgImg
{
get
;
set
;
}
public
string
LinkUrl
{
get
;
set
;
}
public
string
NavType
{
get
;
set
;
}
}
}
}
}
Edu.Model/ViewModel/Web/RB_Web_Advisory_ViewModel.cs
View file @
09a1672d
...
@@ -40,5 +40,8 @@ namespace Edu.Model.ViewModel.Web
...
@@ -40,5 +40,8 @@ namespace Edu.Model.ViewModel.Web
/// 处理时间字符串
/// 处理时间字符串
/// </summary>
/// </summary>
public
string
DealTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
DealTime
);
}
}
public
string
DealTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
DealTime
);
}
}
}
}
}
}
Edu.Module.User/StudentModule.cs
View file @
09a1672d
...
@@ -245,7 +245,7 @@ namespace Edu.Module.User
...
@@ -245,7 +245,7 @@ namespace Edu.Module.User
{
{
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
Dictionary
<
string
,
object
>
fileds
=
new
Dictionary
<
string
,
object
>()
{
{
{
nameof
(
RB_Student_ViewModel
.
Interest
),
model
.
Interest
.
Trim
()
},
{
nameof
(
RB_Student_ViewModel
.
Interest
),
model
.
Interest
},
{
nameof
(
RB_Student_ViewModel
.
JapanBaseInfo
),(
int
)
model
.
JapanBaseInfo
},
{
nameof
(
RB_Student_ViewModel
.
JapanBaseInfo
),(
int
)
model
.
JapanBaseInfo
},
{
nameof
(
RB_Student_ViewModel
.
StuIcon
),
model
.
StuIcon
.
Trim
()
},
{
nameof
(
RB_Student_ViewModel
.
StuIcon
),
model
.
StuIcon
.
Trim
()
},
{
nameof
(
RB_Student_ViewModel
.
StuSex
),
model
.
StuSex
},
{
nameof
(
RB_Student_ViewModel
.
StuSex
),
model
.
StuSex
},
...
...
Edu.ThirdCore/Message/MessageCore.cs
View file @
09a1672d
...
@@ -76,6 +76,7 @@ namespace Edu.ThirdCore.Message
...
@@ -76,6 +76,7 @@ namespace Edu.ThirdCore.Message
if
(!
sendSmsResponse
.
Code
.
Equals
(
"OK"
))
if
(!
sendSmsResponse
.
Code
.
Equals
(
"OK"
))
{
{
var
data
=
new
{
phoneNumber
=
obj
[
"phoneNumber"
].
ToString
(),
templateParam
=
obj
[
"templateParam"
].
ToString
(),
code
=
sendSmsResponse
.
Code
,
message
=
sendSmsResponse
.
Message
};
var
data
=
new
{
phoneNumber
=
obj
[
"phoneNumber"
].
ToString
(),
templateParam
=
obj
[
"templateParam"
].
ToString
(),
code
=
sendSmsResponse
.
Code
,
message
=
sendSmsResponse
.
Message
};
Common
.
Plugin
.
LogHelper
.
WriteInfo
(
string
.
Format
(
"SendSMS0_{0}"
,
Common
.
Plugin
.
JsonHelper
.
Serialize
(
data
)));
}
}
var
datatst
=
new
{
phoneNumber
=
obj
[
"phoneNumber"
].
ToString
(),
templateParam
=
obj
[
"templateParam"
].
ToString
(),
code
=
sendSmsResponse
.
Code
,
message
=
sendSmsResponse
.
Message
};
var
datatst
=
new
{
phoneNumber
=
obj
[
"phoneNumber"
].
ToString
(),
templateParam
=
obj
[
"templateParam"
].
ToString
(),
code
=
sendSmsResponse
.
Code
,
message
=
sendSmsResponse
.
Message
};
}
}
...
...
Edu.WebApi/Controllers/APP/APPStudentLoginController.cs
View file @
09a1672d
...
@@ -179,13 +179,12 @@ namespace Edu.WebApi.Controllers.APP
...
@@ -179,13 +179,12 @@ namespace Edu.WebApi.Controllers.APP
}
}
else
if
(
model
.
ActivationStatus
==
0
)
else
if
(
model
.
ActivationStatus
==
0
)
{
{
//暂时去掉
// string mobileNumber = customerInfo.ContactNumber;
//bool canSendCode = Cache.App.MsgUserRedisCache.CheckCanSendCode(account, out string message);
bool
canSendCode
=
Cache
.
App
.
MsgUserRedisCache
.
CheckCanSendCode
(
account
,
out
string
message
);
//if (!canSendCode)
if
(!
canSendCode
)
//{
{
// return ApiResult.Failed(message);
return
ApiResult
.
Failed
(
message
);
//}
}
string
code
=
StringHelper
.
CreateRandomCode
(
4
);
string
code
=
StringHelper
.
CreateRandomCode
(
4
);
//新增短信记录信息
//新增短信记录信息
var
msgLogModel
=
new
Model
.
Entity
.
System
.
RB_Msg_Log
var
msgLogModel
=
new
Model
.
Entity
.
System
.
RB_Msg_Log
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment