Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xyqb-user2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
head_group
xyqb-user2
Commits
224c9c6e
Commit
224c9c6e
authored
Feb 19, 2025
by
xuepeng.chang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
注释
parent
472e53b2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
17 additions
and
5 deletions
+17
-5
OauthApiV2Controller.java
...antgroup/xyqb/controller/api/v2/OauthApiV2Controller.java
+5
-0
UserController.java
...n/quantgroup/xyqb/controller/external/UserController.java
+3
-2
SMSLoginStrategy.java
.../java/cn/quantgroup/xyqb/service/v2/SMSLoginStrategy.java
+1
-1
SMSVerificationCodeStrategy.java
...antgroup/xyqb/service/v2/SMSVerificationCodeStrategy.java
+3
-0
SMSVoiceVerificationCodeStrategy.java
...oup/xyqb/service/v2/SMSVoiceVerificationCodeStrategy.java
+3
-0
WechatMiniLoginStrategy.java
...n/quantgroup/xyqb/service/v2/WechatMiniLoginStrategy.java
+1
-1
WechatMiniPhoneLoginStrategy.java
...ntgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java
+1
-1
No files found.
src/main/java/cn/quantgroup/xyqb/controller/api/v2/OauthApiV2Controller.java
View file @
224c9c6e
...
...
@@ -41,6 +41,11 @@ public class OauthApiV2Controller implements IBaseController {
return
JsonResult
.
buildSuccessResultGeneric
(
loginContext
.
interLogin
(
loginReq
));
}
/**
* 消费地图历史数据清洗转换
* @param req
* @return
*/
@PostMapping
(
"/shop-map/user-data-convert"
)
public
JsonResult
<
List
<
ShopMapRsp
>>
shopMapDataConvert
(
@RequestBody
UserInfoConvertReq
req
){
...
...
src/main/java/cn/quantgroup/xyqb/controller/external/UserController.java
View file @
224c9c6e
...
...
@@ -464,8 +464,9 @@ public class UserController implements IBaseController {
@Deprecated
@PasswordFreeAccessValidator
@RequestMapping
(
path
=
"/resetPassword"
,
method
=
RequestMethod
.
POST
)
public
JsonResult
resetPassword
(
@RequestParam
String
phoneNo
,
@RequestParam
String
password
,
@RequestParam
(
required
=
false
)
String
passwordNew
,
@RequestHeader
(
value
=
Constants
.
X_AUTH_TENANT
,
defaultValue
=
UserConstant
.
defaultTenantIdString
)
Integer
tenantId
)
{
public
JsonResult
resetPassword
(
@RequestParam
String
phoneNo
,
@RequestParam
String
password
,
@RequestParam
(
required
=
false
)
String
passwordNew
,
@RequestHeader
(
value
=
Constants
.
X_AUTH_TENANT
,
defaultValue
=
UserConstant
.
defaultTenantIdString
)
Integer
tenantId
)
{
if
(!
ValidationUtil
.
validatePhoneNo
(
phoneNo
))
{
return
JsonResult
.
buildErrorStateResult
(
"手机号错误"
,
null
);
}
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/SMSLoginStrategy.java
View file @
224c9c6e
...
...
@@ -86,7 +86,7 @@ public class SMSLoginStrategy implements LoginStrategy {
}
}
// 线上的神策埋点 scIsOpen =false
if
(
scIsOpen
)
{
try
{
if
(!
StringUtils
.
isEmpty
(
sessionStruct
.
getScDeviceId
()))
{
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/SMSVerificationCodeStrategy.java
View file @
224c9c6e
...
...
@@ -27,6 +27,9 @@ import java.util.Collections;
import
java.util.UUID
;
import
java.util.concurrent.TimeUnit
;
/**
* 短信验证码
*/
@Service
@Slf4j
public
class
SMSVerificationCodeStrategy
implements
VerificationCodeStrategy
{
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/SMSVoiceVerificationCodeStrategy.java
View file @
224c9c6e
...
...
@@ -25,6 +25,9 @@ import java.util.Collections;
import
java.util.UUID
;
import
java.util.concurrent.TimeUnit
;
/**
* 语音验证码
*/
@Service
@Slf4j
public
class
SMSVoiceVerificationCodeStrategy
implements
VerificationCodeStrategy
{
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniLoginStrategy.java
View file @
224c9c6e
...
...
@@ -78,7 +78,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
assert
responseMap
!=
null
;
if
(
responseMap
.
containsKey
(
"errcode"
)
&&
Integer
.
parseInt
(
responseMap
.
get
(
"errcode"
))
!=
0
)
{
log
.
error
(
"code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
getToken
(),
responseMap
.
get
(
"errcode"
),
log
.
error
(
"
微信登陆失败,
code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
getToken
(),
responseMap
.
get
(
"errcode"
),
responseMap
.
get
(
"errmsg"
));
throw
new
SilentBizException
(
BizExceptionEnum
.
ERROR_WECHAT_LOGIN
,
responseMap
.
get
(
"errmsg"
));
}
else
{
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java
View file @
224c9c6e
...
...
@@ -89,7 +89,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
assert
responseMap
!=
null
;
if
(
responseMap
.
containsKey
(
"errcode"
)
&&
Integer
.
parseInt
(
responseMap
.
get
(
"errcode"
))
!=
0
)
{
log
.
error
(
"code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
getToken
(),
responseMap
.
get
(
"errcode"
),
log
.
error
(
"
微信小程序手机号登陆出现异常,
code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
getToken
(),
responseMap
.
get
(
"errcode"
),
responseMap
.
get
(
"errmsg"
));
throw
new
SilentBizException
(
BizExceptionEnum
.
ERROR_WECHAT_LOGIN
,
responseMap
.
get
(
"errmsg"
));
}
else
{
...
...
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