Просмотр исходного кода

fix:去除微信授权接口的orgId

黄渊昊 5 месяцев назад
Родитель
Сommit
3d892e1abc

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/controller/AlarmUserController.java

@@ -137,6 +137,6 @@ public class AlarmUserController {
     @Operation(summary = "获取微信用户信息")
     @GetMapping("/coldchain/alarmuser/getUserInfo")
     public CommonResult<String> getUserInfo(String code,String orgId) {
-        return CommonResult.data(alarmUserService.getUserInfo(code,orgId));
+        return CommonResult.data(alarmUserService.getUserInfo(code));
     }
 }

+ 1 - 1
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/service/AlarmUserService.java

@@ -87,5 +87,5 @@ public interface AlarmUserService extends IService<AlarmUser> {
      * 获取微信用户信息
      * @param code
      */
-    String getUserInfo(String code,String orgId);
+    String getUserInfo(String code);
 }

+ 4 - 5
snowy-plugin/snowy-plugin-coldchain/src/main/java/vip/xiaonuo/coldchain/modular/alarmuser/service/impl/AlarmUserServiceImpl.java

@@ -115,18 +115,17 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
     }
 
     @Override
-    public String getUserInfo(String code,String orgId) {
+    public String getUserInfo(String code) {
         WeChatUser userInfo = PushUtil.getUserInfo(code);
         log.info("获取用户信息……:{}", userInfo.getOpenid());
         if(ObjectUtil.isEmpty(userInfo)) {
             throw new CommonException("获取用户信息失败");
         }
-        List<AlarmUser> userList = getByOpenId(userInfo.getOpenid(),orgId);
+        List<AlarmUser> userList = getByOpenId(userInfo.getOpenid());
         AlarmUser alarmUser = BeanUtil.copyProperties(userInfo, AlarmUser.class);
         alarmUser.setOpenId(userInfo.getOpenid());
         alarmUser.setUnionId(userInfo.getUnionid());
         alarmUser.setNickName(userInfo.getNickname());
-        alarmUser.setCreateOrg(orgId);
         if (!userList.isEmpty()) {
             for (AlarmUser user : userList) {
                 alarmUser.setId(user.getId());
@@ -139,9 +138,9 @@ public class AlarmUserServiceImpl extends ServiceImpl<AlarmUserMapper, AlarmUser
         }
     }
 
-    List<AlarmUser> getByOpenId(String openId,String orgId) {
+    List<AlarmUser> getByOpenId(String openId) {
         LambdaQueryWrapper<AlarmUser> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(AlarmUser::getOpenId, openId).eq(AlarmUser::getCreateOrg, orgId)
+        queryWrapper.eq(AlarmUser::getOpenId, openId)
                 .eq(AlarmUser::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
         return list(queryWrapper);
     }

+ 3 - 1
snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java

@@ -142,7 +142,9 @@ public class GlobalConfigure implements WebMvcConfigurer {
             "/sys/org/list",
 
             /* 微信获取用户信息 */
-            "/coldchain/alarmuser/getUserInfo"
+            "/coldchain/alarmuser/getUserInfo",
+
+            "/qp/*"
     };
 
     /**

+ 2 - 2
snowy-web-app/src/main/java/vip/xiaonuo/weixin/miniapp/controller/WxPortalController.java

@@ -125,7 +125,7 @@ public class WxPortalController {
     }
 
     @GetMapping("/pc")
-    private CommonResult<String> getUserInfo(String code,String orgId) {
-        return CommonResult.data(alarmUserService.getUserInfo(code,orgId));
+    private CommonResult<String> getUserInfo(String code) {
+        return CommonResult.data(alarmUserService.getUserInfo(code));
     }
 }