no message

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/common/CommonLogic.java

@@ -86,42 +86,29 @@ public class CommonLogic {
      */
     public CurrentCompanyWechat getCurrentCompanyWechat(HttpServletRequest request) {
 
-        String appid = CommonUtils.getAPPID(request);
         String userId = CommonUtils.getUserId(request);
-        String device = request.getHeader("device");
         String token = CommonUtils.getToken(request);
 
         if (StringUtils.isBlank(token)) {
             token = request.getParameter("x-token");
         }
 
-        if (StringUtils.isBlank(device) && StringUtils.isBlank(appid)) {
-            throw new RemoteServiceException("非法请求，缺少必须的参数");
-        }
         AdminCompanyWechat adminCompanyWechat;
         User user = null;
-        if (StringUtils.isBlank(device)) {
-            adminCompanyWechat = adminCompanyWechatService.lambdaQuery()
-                    .eq(AdminCompanyWechat::getSubAppId, appid)
-                    .one();
-            if (adminCompanyWechat == null) {
-                throw new RemoteServiceException("非法请求，请联系管理员配置必要的参数:" + appid);
-            }
 
-            user = userService.getById(userId);
-        } else {
-            adminCompanyWechat = adminCompanyWechatService.lambdaQuery()
-                    .last("limit 1")
-                    .one();
-            if (StringUtils.isNotBlank(token)) {
-                Object result = redisUtil.get(Constant.RedisPrefix.TOKEN_APP_USER + token);
-                if (Objects.isNull(result)) {
-                    throw new RemoteServiceException("非法请求，登录信息不存在");
-                }
-                user = (User) result;
+        // TODO 处理逻辑修改
+        adminCompanyWechat = adminCompanyWechatService.lambdaQuery()
+                .last("limit 1")
+                .one();
+        if (StringUtils.isNotBlank(token)) {
+            Object result = redisUtil.get(Constant.RedisPrefix.TOKEN_APP_USER + token);
+            if (Objects.isNull(result)) {
+                throw new RemoteServiceException("非法请求，登录信息不存在");
             }
+            user = (User) result;
         }
 
+
         CurrentCompanyWechat currentCompanyWechat = new CurrentCompanyWechat();
         BeanUtils.copyProperties(adminCompanyWechat, currentCompanyWechat);
         if (Objects.nonNull(user)) {