消化掉第三方登录的不规范操作引起的重复登录（重复创建session）统计bug

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

@@ -20,7 +20,6 @@ import cn.quantgroup.xyqb.model.JsonResult;
 import cn.quantgroup.xyqb.model.LoginProperties;
 import cn.quantgroup.xyqb.model.UserRet;
 import cn.quantgroup.xyqb.model.session.LoginInfo;
-import cn.quantgroup.xyqb.model.session.SessionStruct;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
@@ -95,12 +94,9 @@ public class AppController implements IBaseController {
             return JsonResult.buildErrorStateResult("无效的商户", null);
         }
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, merchant.getId(), merchant.getName());
-        SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
-        AuthBean bean = new AuthBean();
-        bean.setToken(sessionStruct.getSid());
-        bean.setPhoneNo(phoneNo);
+        AuthBean bean = sessionService.createSession(user, loginProperties);
         LOGGER.info("第三方用户登录成功 [AppController] login --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
-        return new JsonResult(bean);
+        return JsonResult.buildSuccessResult("登录成功", bean);
     }
 
     /**
@@ -149,18 +145,18 @@ public class AppController implements IBaseController {
             return JsonResult.buildErrorStateResult("无效的商户", null);
         }
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, merchant.getId(), merchant.getName());
-        SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
+        AuthBean bean = sessionService.createSession(user, loginProperties);
         LoginInfo loginInfo = new LoginInfo();
         loginInfo.setUser(new UserRet(user));
-        loginInfo.setToken(sessionStruct.getSid());
+        loginInfo.setToken(bean.getToken());
         LoginInfo.LoginContext context = new LoginInfo.LoginContext();
-        context.setChannelId(sessionStruct.getValues().getLoginProperties().getChannelId());
-        context.setCreatedFrom(sessionStruct.getValues().getLoginProperties().getCreatedFrom());
+        context.setChannelId(channelId);
+        context.setCreatedFrom(registerFrom);
         context.setAppChannel(appChannel);
         loginInfo.setLoginContext(context);
         LOGGER.info("第三方用户获取信息登录成功 [AppController] loginSuper --> loginFrom:{}, phoneNo:{},appChannel:{},channelId:{}", registerFrom, phoneNo, appChannel, channelId);
 
-        return JsonResult.buildSuccessResult("", loginInfo);
+        return JsonResult.buildSuccessResult("登陆成功", loginInfo);
     }
 
     /**
@@ -196,12 +192,9 @@ public class AppController implements IBaseController {
             return JsonResult.buildErrorStateResult("登录失败", null);
         }
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, null, "");
-        SessionStruct sessionStruct = sessionService.createSessionAndPersist(user, loginProperties);
-        AuthBean bean = new AuthBean();
-        bean.setToken(sessionStruct.getSid());
-        bean.setPhoneNo(phoneNo);
+        AuthBean bean = sessionService.createSession(user, loginProperties);
         LOGGER.info("第三方用户登录成功 [AppController] login2 --> loginFrom:{}, phoneNo:{},appChannel:{}", registerFrom, phoneNo, appChannel);
-        return new JsonResult(bean);
+        return JsonResult.buildSuccessResult("登录成功", bean);
     }
 
 }