Commit e592beb4 authored by lee_mingzhu's avatar lee_mingzhu Committed by minminyan

修改配置,以及一个自测的bug修复

parent a24363bf
...@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -8,6 +8,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import javax.annotation.Resource;
/** /**
* Created by 11 on 2017/2/27. * Created by 11 on 2017/2/27.
*/ */
...@@ -29,6 +31,7 @@ public class MotanConfig { ...@@ -29,6 +31,7 @@ public class MotanConfig {
config.setDefault(isDefault); config.setDefault(isDefault);
config.setName(name); config.setName(name);
config.setMaxContentLength(contentLength); config.setMaxContentLength(contentLength);
config.setMaxServerConnection(1000);
return config; return config;
} }
......
...@@ -107,7 +107,7 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{ ...@@ -107,7 +107,7 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
@Override @Override
public UserSysResult<XUserDetail> findUserDetailByUserId(Long userId) { public UserSysResult<XUserDetail> findUserDetailByUserId(Long userId) {
UserDetail userDetail = userDetailService.findByUserId(userId); UserDetail userDetail = userDetailService.findByUserId(userId);
XUserDetail xUserDetail = convertObject(JSON.toJSONString(userDetail), new TypeReference<XUser>() {}); XUserDetail xUserDetail = convertObject(JSON.toJSONString(userDetail), new TypeReference<XUserDetail>() {});
return returnValue(xUserDetail, ""); return returnValue(xUserDetail, "");
} }
...@@ -165,7 +165,7 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{ ...@@ -165,7 +165,7 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{
} }
@Override @Override
public UserSysResult<XLoginInfo> getLoginInfo(String s) { public UserSysResult<XLoginInfo> getLoginInfo(String token) {
SessionStruct sessionStruct = getSessionStruct(); SessionStruct sessionStruct = getSessionStruct();
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser())); loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser()));
...@@ -236,6 +236,15 @@ public class MotanUserServiceImpl implements UserMotanService, IBaseController{ ...@@ -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 * @param t
......
...@@ -78,7 +78,7 @@ protocol.contentLength=1048576 ...@@ -78,7 +78,7 @@ protocol.contentLength=1048576
protocol.isDefault=true protocol.isDefault=true
#motan registry center #motan registry center
registry.protocol=zookeeper registry.protocol=zookeeper
registry.address=172.16.1.63:2181,172.16.1.64:2181,172.16.1.65:2181 registry.address=127.0.0.1:2181
#motan basic #motan basic
motan.port=8082 motan.port=8082
motan.user.group=userGroup motan.user.group=userGroup
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment