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
debec3a1
Commit
debec3a1
authored
May 08, 2017
by
Java-刘 彧阳
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增重置密码接口,供内容部运营人员使用
parent
cc838690
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
WeChatController.java
...group/xyqb/controller/external/user/WeChatController.java
+5
-3
xyqb.properties
src/main/resources/config/dev/xyqb.properties
+4
-1
xyqb.properties
src/main/resources/config/release01/xyqb.properties
+2
-0
xyqb.properties
src/main/resources/config/test/xyqb.properties
+4
-1
No files found.
src/main/java/cn/quantgroup/xyqb/controller/external/user/WeChatController.java
View file @
debec3a1
...
@@ -61,6 +61,8 @@ public class WeChatController implements IBaseController {
...
@@ -61,6 +61,8 @@ public class WeChatController implements IBaseController {
@Value
(
"${xyqb-user.ui}"
)
@Value
(
"${xyqb-user.ui}"
)
private
String
userUIAddr
;
private
String
userUIAddr
;
@Value
(
"${xyqb.user.domain}"
)
private
String
userDomainStr
;
/**
/**
* 开发者资质认证,有必要吗?
* 开发者资质认证,有必要吗?
...
@@ -377,10 +379,10 @@ public class WeChatController implements IBaseController {
...
@@ -377,10 +379,10 @@ public class WeChatController implements IBaseController {
}
}
private
String
createUserSession
(
User
user
,
Merchant
merchant
,
String
redirect
,
String
schema
,
Long
registerFrom
)
{
private
String
createUserSession
(
User
user
,
Merchant
merchant
,
String
redirect
,
String
schema
,
Long
registerFrom
)
{
//
TODO 临时紧急上线修改的.下次上线的时候修复一下,不能这样写.
//
String url = "http://passport.xyqb.com";
String
url
=
"http://
passport.xyqb.com"
;
String
url
=
"http://
"
+
userDomainStr
;
if
(
"https:"
.
equals
(
schema
))
{
if
(
"https:"
.
equals
(
schema
))
{
url
=
"https://
passport.xyqb.com"
;
url
=
"https://
"
+
userDomainStr
;
}
}
if
(
StringUtils
.
isEmpty
(
redirect
)
||
"redirect"
.
equals
(
redirect
))
{
if
(
StringUtils
.
isEmpty
(
redirect
)
||
"redirect"
.
equals
(
redirect
))
{
LOGGER
.
info
(
"微信登录:redirect为null,走正常流程."
);
LOGGER
.
info
(
"微信登录:redirect为null,走正常流程."
);
...
...
src/main/resources/config/dev/xyqb.properties
View file @
debec3a1
...
@@ -60,4 +60,7 @@ registry.address=192.168.4.164:2181
...
@@ -60,4 +60,7 @@ registry.address=192.168.4.164:2181
motan.port
=
8082
motan.port
=
8082
motan.user.group
=
userGroup
motan.user.group
=
userGroup
motan.user.module
=
user-motan-rpc
motan.user.module
=
user-motan-rpc
motan.application
=
xyqbUserMotan
motan.application
=
xyqbUserMotan
\ No newline at end of file
#xyqb-user-域名
xyqb.user.domain
=
passport.xyqb.com
\ No newline at end of file
src/main/resources/config/release01/xyqb.properties
View file @
debec3a1
...
@@ -48,3 +48,5 @@ motan.user.group=userGroup
...
@@ -48,3 +48,5 @@ motan.user.group=userGroup
motan.user.module
=
user-motan-rpc
motan.user.module
=
user-motan-rpc
motan.application
=
xyqbUserMotan
motan.application
=
xyqbUserMotan
#xyqb-user-域名
xyqb.user.domain
=
passport.xyqb.com
\ No newline at end of file
src/main/resources/config/test/xyqb.properties
View file @
debec3a1
...
@@ -48,4 +48,7 @@ xyqb.auth.url=http://192.168.192.206:9001
...
@@ -48,4 +48,7 @@ xyqb.auth.url=http://192.168.192.206:9001
usersys.url
=
http://localhost:9001
usersys.url
=
http://localhost:9001
xyqb-user.ui
=
http://192.168.12.40:8080
xyqb-user.ui
=
http://192.168.12.40:8080
wechat.appid
=
wxcdf6077af8127559
wechat.appid
=
wxcdf6077af8127559
wechat.secret
=
16eaec16084d0d9c52d4114f359cc72c
wechat.secret
=
16eaec16084d0d9c52d4114f359cc72c
\ No newline at end of file
#xyqb-user-域名
xyqb.user.domain
=
passport.xyqb.com
\ No newline at end of file
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