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
b1101470
Commit
b1101470
authored
Aug 22, 2023
by
唐峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
微信登录接口和接口定义不一致,修正
parent
6ff67d4d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
7 deletions
+14
-7
WechatMiniLoginParam.java
.../quantgroup/xyqb/model/v2/login/WechatMiniLoginParam.java
+6
-1
WechatMiniPhoneLoginParam.java
...tgroup/xyqb/model/v2/login/WechatMiniPhoneLoginParam.java
+3
-1
WechatMiniLoginStrategy.java
...n/quantgroup/xyqb/service/v2/WechatMiniLoginStrategy.java
+2
-2
WechatMiniPhoneLoginStrategy.java
...ntgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java
+3
-3
No files found.
src/main/java/cn/quantgroup/xyqb/model/v2/login/WechatMiniLoginParam.java
View file @
b1101470
...
@@ -3,6 +3,8 @@ package cn.quantgroup.xyqb.model.v2.login;
...
@@ -3,6 +3,8 @@ package cn.quantgroup.xyqb.model.v2.login;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
javax.validation.constraints.NotNull
;
@EqualsAndHashCode
(
callSuper
=
true
)
@EqualsAndHashCode
(
callSuper
=
true
)
@Data
@Data
public
class
WechatMiniLoginParam
extends
BaseLoginParam
{
public
class
WechatMiniLoginParam
extends
BaseLoginParam
{
...
@@ -13,6 +15,9 @@ public class WechatMiniLoginParam extends BaseLoginParam{
...
@@ -13,6 +15,9 @@ public class WechatMiniLoginParam extends BaseLoginParam{
/**
/**
* 微信login的code
* 微信login的code
* 接口定义的是token,修正
*/
*/
private
String
code
;
//private String code;
@NotNull
private
String
token
;
}
}
src/main/java/cn/quantgroup/xyqb/model/v2/login/WechatMiniPhoneLoginParam.java
View file @
b1101470
...
@@ -11,7 +11,9 @@ public class WechatMiniPhoneLoginParam extends WechatMiniLoginParam {
...
@@ -11,7 +11,9 @@ public class WechatMiniPhoneLoginParam extends WechatMiniLoginParam {
/**
/**
* 手机号获取凭证
* 手机号获取凭证
*/
*/
//@NotNull
//private String phoneCode;
@NotNull
@NotNull
private
String
phone
Code
;
private
String
phone
Token
;
}
}
src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniLoginStrategy.java
View file @
b1101470
...
@@ -64,7 +64,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
...
@@ -64,7 +64,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
//1、微信登录逻辑
//1、微信登录逻辑
WechatConfigBean
wechatConfigBean
=
wechatConfiguration
.
getByAppIdAndTenantId
(
loginParam
.
getAppId
(),
sessionStruct
.
getTenantId
());
WechatConfigBean
wechatConfigBean
=
wechatConfiguration
.
getByAppIdAndTenantId
(
loginParam
.
getAppId
(),
sessionStruct
.
getTenantId
());
String
response
=
wechatRemoteService
.
login
(
wechatConfigBean
.
getAppId
(),
wechatConfigBean
.
getAppSecret
(),
((
WechatMiniLoginParam
)
param
).
get
Code
());
String
response
=
wechatRemoteService
.
login
(
wechatConfigBean
.
getAppId
(),
wechatConfigBean
.
getAppSecret
(),
((
WechatMiniLoginParam
)
param
).
get
Token
());
Type
resultType
=
new
TypeToken
<
Map
<
String
,
String
>>()
{
Type
resultType
=
new
TypeToken
<
Map
<
String
,
String
>>()
{
}.
getType
();
}.
getType
();
...
@@ -76,7 +76,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
...
@@ -76,7 +76,7 @@ public class WechatMiniLoginStrategy implements LoginStrategy {
assert
responseMap
!=
null
;
assert
responseMap
!=
null
;
if
(
responseMap
.
containsKey
(
"errcode"
)
&&
Integer
.
parseInt
(
responseMap
.
get
(
"errcode"
))
!=
0
)
{
if
(
responseMap
.
containsKey
(
"errcode"
)
&&
Integer
.
parseInt
(
responseMap
.
get
(
"errcode"
))
!=
0
)
{
log
.
error
(
"code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
get
Code
(),
responseMap
.
get
(
"errcode"
),
log
.
error
(
"code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
get
Token
(),
responseMap
.
get
(
"errcode"
),
responseMap
.
get
(
"errmsg"
));
responseMap
.
get
(
"errmsg"
));
throw
new
BizException
(
BizExceptionEnum
.
ERROR_WECHAT_LOGIN
,
responseMap
.
get
(
"errmsg"
));
throw
new
BizException
(
BizExceptionEnum
.
ERROR_WECHAT_LOGIN
,
responseMap
.
get
(
"errmsg"
));
}
else
{
}
else
{
...
...
src/main/java/cn/quantgroup/xyqb/service/v2/WechatMiniPhoneLoginStrategy.java
View file @
b1101470
...
@@ -76,7 +76,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
...
@@ -76,7 +76,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
//1、微信登录逻辑
//1、微信登录逻辑
WechatConfigBean
wechatConfigBean
=
wechatConfiguration
.
getByAppIdAndTenantId
(
loginParam
.
getAppId
(),
sessionStruct
.
getTenantId
());
WechatConfigBean
wechatConfigBean
=
wechatConfiguration
.
getByAppIdAndTenantId
(
loginParam
.
getAppId
(),
sessionStruct
.
getTenantId
());
String
response
=
wechatRemoteService
.
login
(
wechatConfigBean
.
getAppId
(),
wechatConfigBean
.
getAppSecret
(),
((
WechatMiniLoginParam
)
param
).
get
Code
());
String
response
=
wechatRemoteService
.
login
(
wechatConfigBean
.
getAppId
(),
wechatConfigBean
.
getAppSecret
(),
((
WechatMiniLoginParam
)
param
).
get
Token
());
Type
resultType
=
new
TypeToken
<
Map
<
String
,
String
>>()
{
Type
resultType
=
new
TypeToken
<
Map
<
String
,
String
>>()
{
}.
getType
();
}.
getType
();
...
@@ -88,7 +88,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
...
@@ -88,7 +88,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
assert
responseMap
!=
null
;
assert
responseMap
!=
null
;
if
(
responseMap
.
containsKey
(
"errcode"
)
&&
Integer
.
parseInt
(
responseMap
.
get
(
"errcode"
))
!=
0
)
{
if
(
responseMap
.
containsKey
(
"errcode"
)
&&
Integer
.
parseInt
(
responseMap
.
get
(
"errcode"
))
!=
0
)
{
log
.
error
(
"code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
get
Code
(),
responseMap
.
get
(
"errcode"
),
log
.
error
(
"code:{},errcode:{},errmsg:{}"
,
((
WechatMiniLoginParam
)
param
).
get
Token
(),
responseMap
.
get
(
"errcode"
),
responseMap
.
get
(
"errmsg"
));
responseMap
.
get
(
"errmsg"
));
throw
new
BizException
(
BizExceptionEnum
.
ERROR_WECHAT_LOGIN
,
responseMap
.
get
(
"errmsg"
));
throw
new
BizException
(
BizExceptionEnum
.
ERROR_WECHAT_LOGIN
,
responseMap
.
get
(
"errmsg"
));
}
else
{
}
else
{
...
@@ -103,7 +103,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
...
@@ -103,7 +103,7 @@ public class WechatMiniPhoneLoginStrategy implements LoginStrategy {
Map
<
String
,
String
>
phoneParam
=
new
HashMap
<>();
Map
<
String
,
String
>
phoneParam
=
new
HashMap
<>();
boolean
register
=
false
;
boolean
register
=
false
;
User
user
;
User
user
;
phoneParam
.
put
(
"code"
,
loginParam
.
getPhone
Code
());
phoneParam
.
put
(
"code"
,
loginParam
.
getPhone
Token
());
AccessTokenResponse
accessTokenResponse
=
JSON
.
parseObject
(
redisTemplate
.
opsForValue
().
get
(
Constants
.
WECHAT_ACCESS_TOKEN_REDIS
+
sessionStruct
.
getTenantId
()
+
":"
+
loginParam
.
getAppId
()),
AccessTokenResponse
.
class
);
AccessTokenResponse
accessTokenResponse
=
JSON
.
parseObject
(
redisTemplate
.
opsForValue
().
get
(
Constants
.
WECHAT_ACCESS_TOKEN_REDIS
+
sessionStruct
.
getTenantId
()
+
":"
+
loginParam
.
getAppId
()),
AccessTokenResponse
.
class
);
if
(
Objects
.
isNull
(
accessTokenResponse
))
{
if
(
Objects
.
isNull
(
accessTokenResponse
))
{
throw
new
BizException
(
BizExceptionEnum
.
EXPIRE_WECHAT_TOKEN
);
throw
new
BizException
(
BizExceptionEnum
.
EXPIRE_WECHAT_TOKEN
);
...
...
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