Merge remote-tracking branch 'origin/master' into master-queryLog

# Conflicts:
#	src/main/resources/config/dev/xyqb.properties

src/main/java/cn/quantgroup/xyqb/aspect/logcaller/LogCallHttpAspect.java

@@ -52,7 +52,6 @@ public class LogCallHttpAspect {
         return result;
     }
 
-    @Async
     public void asyncRecordIt(ProceedingJoinPoint pjp, Object result, String remoteIP){
         Object[] args = pjp.getArgs();
         String  methodName = pjp.getSignature().getName();

src/main/java/cn/quantgroup/xyqb/controller/external/motan/MotanUserServiceImpl.java

@@ -296,7 +296,7 @@ public class MotanUserServiceImpl implements UserMotanService {
     SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
 
     LoginInfo loginInfo = new LoginInfo();
-    loginInfo.setUser(UserRet.getUserRet(user));
+    loginInfo.setUser(new UserRet(user));
     loginInfo.setToken(sessionStruct.getSid());
     LoginInfo.LoginContext context = new LoginInfo.LoginContext();
     context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());

src/main/java/cn/quantgroup/xyqb/controller/external/user/AppController.java

@@ -148,7 +148,7 @@ public class AppController implements IBaseController {
     SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
 
     LoginInfo loginInfo = new LoginInfo();
-    loginInfo.setUser(UserRet.getUserRet(user));
+    loginInfo.setUser(new UserRet(user));
     loginInfo.setToken(sessionStruct.getSid());
     LoginInfo.LoginContext context = new LoginInfo.LoginContext();
     context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());

src/main/java/cn/quantgroup/xyqb/controller/internal/login/AuthInfoController.java

@@ -54,7 +54,7 @@ public class AuthInfoController implements IBaseController {
     if(null != sessionStruct) {
       log.info("从用户中心获取到了用户登录信息:phone:[{}]", sessionStruct.getValues().getUser().getPhoneNo());
       LoginInfo loginInfo = new LoginInfo();
-      loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser()));
+      loginInfo.setUser(new UserRet(sessionStruct.getValues().getUser()));
       loginInfo.setToken(sessionStruct.getSid());
       LoginInfo.LoginContext context = new LoginInfo.LoginContext();
       context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
@@ -82,7 +82,7 @@ public class AuthInfoController implements IBaseController {
       String phoneNo = ((Map<String, String>) result.getData()).get("phoneNo");
       User user = userService.findByPhoneWithCache(phoneNo);
       LoginInfo loginInfo = new LoginInfo();
-      loginInfo.setUser(UserRet.getUserRet(user));
+      loginInfo.setUser(new UserRet(user));
       loginInfo.setToken(token);
       LoginInfo.LoginContext context = new LoginInfo.LoginContext();
       context.setChannelId(null);

src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java

@@ -95,7 +95,7 @@ public class UserController implements IBaseController {
   public JsonResult loginFast(
       @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
       @RequestParam(required = false, defaultValue = "1") Long createdFrom, String key,@RequestParam(required = false)Long btRegisterChannelId ,HttpServletRequest request) {
-    Map<String, JsonResult> validMap = getHeaderParam(request);
+        Map<String, JsonResult> validMap = getHeaderParam(request);
     if (null != validMap.get("fail")) {
       return validMap.get("fail");
     }
@@ -129,6 +129,9 @@ public class UserController implements IBaseController {
     if (null == registerFrom) {
       registerFrom = 1L;
     }
+    if (channelId == 222L) {
+      registerFrom=222L;
+    } 
     LOGGER.info("用户快速注册成功, registerFrom:{}, phoneNo:{}", registerFrom, phoneNo);
 
     return userService.registerAndReturn(phoneNo, password, registerFrom,btRegisterChannelId);

src/main/java/cn/quantgroup/xyqb/model/UserRet.java

@@ -35,18 +35,17 @@ public class UserRet implements Serializable {
   //上一次修改时间
   private Long updatedAt;
 
-  public static UserRet getUserRet(User user) {
+  public  UserRet(User user) {
     Long createTimeStamp = user.getCreatedAt().getTime();
     Long updateTimeStamp = user.getUpdatedAt().getTime();
-    UserRet userRet = new UserRet();
-    userRet.setId(user.getId());
-    userRet.setPhoneNo(user.getPhoneNo());
-    userRet.setEnable(user.getEnable());
-    userRet.setPassword(StringUtils.defaultIfEmpty(user.getPassword(), ""));
-    userRet.setRegisteredFrom(user.getRegisteredFrom());
-    userRet.setUuid(user.getUuid());
-    userRet.setCreatedAt(createTimeStamp);
-    userRet.setUpdatedAt(updateTimeStamp);
-    return userRet;
+    this.setId(user.getId());
+    this.setPhoneNo(user.getPhoneNo());
+    this.setEnable(user.getEnable());
+    this.setPassword(StringUtils.defaultIfEmpty(user.getPassword(), ""));
+    this.setRegisteredFrom(user.getRegisteredFrom());
+    this.setUuid(user.getUuid());
+    this.setCreatedAt(createTimeStamp);
+    this.setUpdatedAt(updateTimeStamp);
+
   }
 }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -81,6 +81,7 @@ public class UserServiceImpl implements IUserService {
   private final static Random random = new Random();
 
   @Override
+  @Cacheable(value = "usercache", key = "'xyqbuser' + #phone", unless = "#result == null", cacheManager = "cacheManager")
   public User findByPhoneInDb(String phone) {
     return userRepository.findByPhoneNo(phone);
   }

src/main/resources/config/dev/xyqb.properties

@@ -3,7 +3,7 @@ configserver.disable=1
 configserver.system=xyqb-user
 
 #xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.22:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
-xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.26:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
+xyqb.data.mysql.jdbc-url=jdbc:mysql://192.168.4.23:3306/xyqb_user?useUnicode=true&characterEncoding=UTF8
 
 xyqb.data.mysql.password=qatest
 
@@ -71,6 +71,7 @@ xyqb.auth.url=http://192.168.192.206:9001
 usersys.url=http://localhost:9001
 
 xyqb-user.ui=http://192.168.100.36:7043
+xyqb-user.ui-s=https://192.168.100.36:7043
 wechat.appid=wxcdf6077af8127559
 wechat.secret=16eaec16084d0d9c52d4114f359cc72c
 
@@ -89,10 +90,4 @@ motan.application=xyqbUserMotan
 #xyqb-user-域名
 xyqb.user.domain=passport.xyqb.com
 xyqb.user.query.url=http://192.168.11.40:8081
-xyqb.domain = http://192.168.4.153:7003
-
+xyqb.domain = http://192.168.4.153:7003
\ No newline at end of file
-xyqb.paycenter.url=http://192.168.4.26:7006
-xyqb.paycenter.id=3
-
-#运营系统认证地址
-xyqb.yunying.url=http://192.168.4.50:7047
\ No newline at end of file

src/main/resources/config/release01/xyqb.properties

@@ -36,6 +36,7 @@ jr58.notify.userinfo=http://dk.58.com/customer/quantgroup_user_info
 model.quantgroup.url=http://model.quantgroup.cn
 xyqb.auth.url=http://auth.xyqb.com
 xyqb-user.ui=http://passport.xyqb.com
+xyqb-user.ui-s=https://passport.xyqb.com
 #motan protocol
 protocol.name=motan
 protocol.contentLength=1048576