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
17db9b60
Commit
17db9b60
authored
Apr 04, 2018
by
技术部-任文超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化log
parent
bd3cfec0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
WeChatController.java
...group/xyqb/controller/external/user/WeChatController.java
+1
-1
UserController.java
...ntgroup/xyqb/controller/internal/user/UserController.java
+4
-3
TestUserLogin.java
src/test/java/login/TestUserLogin.java
+1
-1
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java
View file @
17db9b60
...
@@ -210,7 +210,7 @@ public class WeChatController implements IBaseController {
...
@@ -210,7 +210,7 @@ public class WeChatController implements IBaseController {
private
void
receiveCodeWithDefault
(
String
code
,
String
systemKey
,
String
schema
,
Long
registerFrom
,
String
redirect
,
HttpServletResponse
response
){
private
void
receiveCodeWithDefault
(
String
code
,
String
systemKey
,
String
schema
,
Long
registerFrom
,
String
redirect
,
HttpServletResponse
response
){
// 微信跳转请求入参监控
// 微信跳转请求入参监控
HttpServletRequest
request
=
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
HttpServletRequest
request
=
((
ServletRequestAttributes
)
RequestContextHolder
.
getRequestAttributes
()).
getRequest
();
LOGGER
.
info
(
"[WeChatController][receiveCodeWithDefault]微信授权及跳转:code:{},systemKey:{},schema:{},registerFrom:{},redirect:{},request:{},response:{}"
,
code
,
systemKey
,
schema
,
registerFrom
,
redirect
,
request
,
response
);
LOGGER
.
info
(
"[WeChatController][receiveCodeWithDefault]微信授权及跳转:code:{},systemKey:{},schema:{},registerFrom:{},redirect:{},request:{},response:{}"
,
code
,
systemKey
,
schema
,
registerFrom
,
redirect
,
JSON
.
toJSONString
(
request
),
JSON
.
toJSONString
(
response
)
);
/*
/*
* 预处理(容错)
* 预处理(容错)
*/
*/
...
...
src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
View file @
17db9b60
...
@@ -28,6 +28,7 @@ import cn.quantgroup.xyqb.util.IPUtil;
...
@@ -28,6 +28,7 @@ import cn.quantgroup.xyqb.util.IPUtil;
import
cn.quantgroup.xyqb.util.MqUtils
;
import
cn.quantgroup.xyqb.util.MqUtils
;
import
cn.quantgroup.xyqb.util.PasswordUtil
;
import
cn.quantgroup.xyqb.util.PasswordUtil
;
import
cn.quantgroup.xyqb.util.ValidationUtil
;
import
cn.quantgroup.xyqb.util.ValidationUtil
;
import
com.alibaba.fastjson.JSON
;
import
com.alibaba.fastjson.JSONObject
;
import
com.alibaba.fastjson.JSONObject
;
import
org.apache.commons.codec.binary.Base64
;
import
org.apache.commons.codec.binary.Base64
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -484,7 +485,7 @@ public class UserController implements IBaseController {
...
@@ -484,7 +485,7 @@ public class UserController implements IBaseController {
if
(!
ready
){
if
(!
ready
){
return
true
;
return
true
;
}
else
if
(
Objects
.
isNull
(
user
)
||
Objects
.
isNull
(
user
.
getId
())
||
StringUtils
.
isBlank
(
request
.
getParameter
(
Constants
.
OPEN_ID
))){
}
else
if
(
Objects
.
isNull
(
user
)
||
Objects
.
isNull
(
user
.
getId
())
||
StringUtils
.
isBlank
(
request
.
getParameter
(
Constants
.
OPEN_ID
))){
LOGGER
.
warn
(
"微信关联失败,user:{}, request:{}"
,
user
,
request
);
LOGGER
.
warn
(
"微信关联失败,user:{}, request:{}"
,
user
,
JSON
.
toJSONString
(
request
)
);
return
false
;
return
false
;
}
}
Long
userId
=
user
.
getId
();
Long
userId
=
user
.
getId
();
...
@@ -493,7 +494,7 @@ public class UserController implements IBaseController {
...
@@ -493,7 +494,7 @@ public class UserController implements IBaseController {
int
rows
=
wechatService
.
relateUser
(
userId
,
phoneNo
,
request
.
getParameter
(
Constants
.
OPEN_ID
));
int
rows
=
wechatService
.
relateUser
(
userId
,
phoneNo
,
request
.
getParameter
(
Constants
.
OPEN_ID
));
return
rows
>
0
;
return
rows
>
0
;
}
catch
(
Exception
e
){
}
catch
(
Exception
e
){
LOGGER
.
error
(
"微信关联失败,user:{}, request:{}"
,
user
,
request
,
e
);
LOGGER
.
error
(
"微信关联失败,user:{}, request:{}"
,
user
,
JSON
.
toJSONString
(
request
)
,
e
);
}
}
return
false
;
return
false
;
}
}
...
@@ -507,7 +508,7 @@ public class UserController implements IBaseController {
...
@@ -507,7 +508,7 @@ public class UserController implements IBaseController {
@RequestMapping
(
"/associate_wechat"
)
@RequestMapping
(
"/associate_wechat"
)
public
JsonResult
associateWithWechat
(
String
openId
,
HttpServletRequest
request
)
{
public
JsonResult
associateWithWechat
(
String
openId
,
HttpServletRequest
request
)
{
User
user
=
getCurrentUserFromRedis
();
User
user
=
getCurrentUserFromRedis
();
LOGGER
.
error
(
"[UserController][associateWithWechat][非法请求]微信关联,user:{},openId:{},request:{}"
,
user
,
openId
,
request
);
LOGGER
.
error
(
"[UserController][associateWithWechat][非法请求]微信关联,user:{},openId:{},request:{}"
,
user
,
openId
,
JSON
.
toJSONString
(
request
)
);
return
JsonResult
.
buildSuccessResult
(
"[非法请求]微信关联"
,
null
,
1L
);
return
JsonResult
.
buildSuccessResult
(
"[非法请求]微信关联"
,
null
,
1L
);
/*if(Objects.isNull(user) || Objects.isNull(user.getId())){
/*if(Objects.isNull(user) || Objects.isNull(user.getId())){
LOGGER.warn("微信关联失败,用户未登录:user:[{}],openId:[{}]",user,openId);
LOGGER.warn("微信关联失败,用户未登录:user:[{}],openId:[{}]",user,openId);
...
...
src/test/java/login/TestUserLogin.java
View file @
17db9b60
...
@@ -77,7 +77,7 @@ public class TestUserLogin {
...
@@ -77,7 +77,7 @@ public class TestUserLogin {
String
userId
=
""
;
String
userId
=
""
;
request
.
addHeader
(
"x-original-client-ip"
,
"172.16.0.1"
);
request
.
addHeader
(
"x-original-client-ip"
,
"172.16.0.1"
);
request
.
addHeader
(
"authorization"
,
"Basic MTg1MTMzNDE4MDg6MTIzNDU2"
);
request
.
addHeader
(
"authorization"
,
"Basic MTg1MTMzNDE4MDg6MTIzNDU2"
);
JsonResult
jsonResult
=
userController
.
login
(
channelId
,
appChannel
,
createFrom
,
userId
,
"xyqb"
,
request
,
"xyqb"
,
"aaa"
);
JsonResult
jsonResult
=
userController
.
login
(
channelId
,
appChannel
,
createFrom
,
userId
,
"xyqb"
,
"xyqb"
,
request
);
AuthBean
authBean
=
(
AuthBean
)
jsonResult
.
getData
();
AuthBean
authBean
=
(
AuthBean
)
jsonResult
.
getData
();
String
token
=
authBean
.
getToken
();
String
token
=
authBean
.
getToken
();
System
.
out
.
println
(
"user token:"
+
token
);
System
.
out
.
println
(
"user token:"
+
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