优化代码结构

mirage-service/src/main/java/com/mirage/mirageservice/controller/WxController.java

@@ -5,6 +5,7 @@ import com.mirage.core.exception.AppRuntimeException;
 import com.mirage.core.meta.AppCode;
 import com.mirage.core.meta.AuthType;
 import com.mirage.mirageservice.enums.MinProgramConfigEnum;
+import com.mirage.mirageservice.meta.AppContext;
 import com.mirage.mirageservice.meta.BindRequest;
 import com.mirage.mirageservice.service.UserService;
 import lombok.extern.slf4j.Slf4j;
@@ -80,10 +81,14 @@ public class WxController {
     public Object bind(@RequestBody BindRequest bindRequest){
         if(null == bindRequest
                 || null == bindRequest.getScanPageId()
-                || StringUtils.isBlank(bindRequest.getOpenId())
                 || StringUtils.isBlank(bindRequest.getStudentName())){
             throw new AppRuntimeException(AppCode.BAD_REQUEST);
         }
+        String openId = AppContext.getUserInfo().getOpenId();
+        if(StringUtils.isBlank(openId)){
+            throw new AppRuntimeException(AppCode.UNAUTHORIZED);
+        }
+        bindRequest.setOpenId(openId);
         return userService.bind(bindRequest);
     }
 

mirage-service/src/main/java/com/mirage/mirageservice/service/UserService.java

@@ -6,10 +6,7 @@ import com.google.gson.JsonObject;
 import com.mirage.core.exception.AppRuntimeException;
 import com.mirage.core.meta.PageResultVo;
 import com.mirage.core.meta.PageUtil;
-import com.mirage.core.utils.AppHttpClient;
-import com.mirage.core.utils.BeanConvertUtil;
-import com.mirage.core.utils.Constants;
-import com.mirage.core.utils.GsonUtil;
+import com.mirage.core.utils.*;
 import com.mirage.mirageservice.domain.*;
 import com.mirage.mirageservice.enums.MinProgramConfigEnum;
 import com.mirage.mirageservice.mapper.mysql.CsMinWechatUserMapper;
@@ -129,10 +126,10 @@ public class UserService {
                     return wechatUser;
                 }
                 if(StringUtils.isBlank(sessionValue)){
-                    currentToken = UUID.randomUUID().toString().replaceAll("-", "");;
+                    currentToken = AppUtil.generateAppId();
                 }
             }else{
-                currentToken = UUID.randomUUID().toString().replaceAll("-", "");
+                currentToken = AppUtil.generateAppId();
             }
             wechatUser.setLoginToken(currentToken);
             wechatUser.setLastLoginTime(System.currentTimeMillis());
@@ -147,7 +144,7 @@ public class UserService {
         wechatUser.setIsDeleted(0);
         wechatUser.setCreateTime(System.currentTimeMillis());
         wechatUser.setModifiedTime(System.currentTimeMillis());
-        String loginToken = UUID.randomUUID().toString().replaceAll("-", "");
+        String loginToken = AppUtil.generateAppId();
         wechatUser.setLoginToken(loginToken);
         csMinWechatUserMapper.insertSelective(wechatUser);
         this.getLoginSession(loginToken, wechatUser);