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
e592beb4
Commit
e592beb4
authored
Mar 06, 2017
by
lee_mingzhu
Committed by
minminyan
Apr 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改配置,以及一个自测的bug修复
parent
a24363bf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
3 deletions
+15
-3
MotanConfig.java
...ain/java/cn/quantgroup/xyqb/config/motan/MotanConfig.java
+3
-0
MotanUserServiceImpl.java
.../xyqb/controller/external/motan/MotanUserServiceImpl.java
+11
-2
xyqb.properties
src/main/resources/config/dev/xyqb.properties
+1
-1
No files found.
src/main/java/cn/quantgroup/xyqb/config/motan/MotanConfig.java
View file @
e592beb4
...
...
@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Value;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
javax.annotation.Resource
;
/**
* Created by 11 on 2017/2/27.
*/
...
...
@@ -29,6 +31,7 @@ public class MotanConfig {
config
.
setDefault
(
isDefault
);
config
.
setName
(
name
);
config
.
setMaxContentLength
(
contentLength
);
config
.
setMaxServerConnection
(
1000
);
return
config
;
}
...
...
src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java
View file @
e592beb4
...
...
@@ -107,7 +107,7 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
@Override
public
UserSysResult
<
XUserDetail
>
findUserDetailByUserId
(
Long
userId
)
{
UserDetail
userDetail
=
userDetailService
.
findByUserId
(
userId
);
XUserDetail
xUserDetail
=
convertObject
(
JSON
.
toJSONString
(
userDetail
),
new
TypeReference
<
XUser
>()
{});
XUserDetail
xUserDetail
=
convertObject
(
JSON
.
toJSONString
(
userDetail
),
new
TypeReference
<
XUser
Detail
>()
{});
return
returnValue
(
xUserDetail
,
""
);
}
...
...
@@ -165,7 +165,7 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
}
@Override
public
UserSysResult
<
XLoginInfo
>
getLoginInfo
(
String
s
)
{
public
UserSysResult
<
XLoginInfo
>
getLoginInfo
(
String
token
)
{
SessionStruct
sessionStruct
=
getSessionStruct
();
LoginInfo
loginInfo
=
new
LoginInfo
();
loginInfo
.
setUser
(
UserRet
.
getUserRet
(
sessionStruct
.
getValues
().
getUser
()));
...
...
@@ -236,6 +236,15 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
}
@Override
public
void
updateUserQQ
(
String
qq
,
Long
userId
)
{
if
(
StringUtils
.
isEmpty
(
qq
)
||
userId
==
0L
){
LOGGER
.
error
(
"QQ或用户id非法,不允许修改:qq{}, userid:{}"
,
qq
,
userId
);
return
;
}
userDetailService
.
updateUserQQ
(
userId
,
qq
);
}
/**
* 封装返回结果.
* @param t
...
...
src/main/resources/config/dev/xyqb.properties
View file @
e592beb4
...
...
@@ -78,7 +78,7 @@ protocol.contentLength=1048576
protocol.isDefault
=
true
#motan registry center
registry.protocol
=
zookeeper
registry.address
=
1
72.16.1.63:2181,172.16.1.64:2181,172.16.1.65
:2181
registry.address
=
1
27.0.0.1
:2181
#motan basic
motan.port
=
8082
motan.user.group
=
userGroup
...
...
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