解决冲突

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

 package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.*;
-import com.github.wxiaoqi.security.admin.bo.UserBo;
-import com.github.wxiaoqi.security.admin.dto.AccountBindDTO;
 import com.github.wxiaoqi.security.admin.entity.*;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.admin.vo.AppUserGroups;
@@ -234,7 +232,7 @@ public class AppUserController extends CommonBaseController{
             appUserLogin.setOpenid(userVo.getOpenid());
             appUserLogin.setId(userid);
             appUserLogin.setUsername(userVo.getUsername());
-            appUserLoginBiz.updateAppuserLogin(appUserLogin);
+            appUserLoginBiz.bindOpenid(appUserLogin);
             //支付宝绑定
             if (StringUtils.isNotEmpty(userVo.getAliCode()) && userVo.getAliCode().trim().length()>0){
                 appUserAlipayBiz.getUserInfo(userVo.getAliCode(),request);
@@ -348,28 +346,5 @@ public class AppUserController extends CommonBaseController{
         return appUserLoginBiz.test();
     }
 
-    @PostMapping("/bind")
-    private ObjectRestResponse accountBinding(@RequestBody AccountBindDTO accountBindDTO,HttpServletRequest request){
-        try {
-            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-            return appUserLoginBiz.bindAccount(accountBindDTO, Integer.valueOf(infoFromToken.getId()), request);
-        }catch (Exception ex){
-            throw new BaseException(ex);
-        }
-    }
-
-    @GetMapping("/users")
-    List<Integer> findAppUserIds(@RequestParam(value = "phone", required = false) String phone,
-                                 @RequestParam(value = "leaderPhone", required = false) String leaderPhone,
-                                 @RequestParam(value = "name", required = false) String name) {
 
-        return appUserLoginBiz.findAppuser(phone, leaderPhone, name);
-
-    }
-
-    @PostMapping("/users/info")
-    List<UserBo> findUserDetailByUserBo(@RequestBody(required = false) List<UserBo> userBos) {
-
-        return appUserLoginBiz.findUserDetailInfo(userBos);
-    }
 }