Merge branch 'master-bacground-im' into dev

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

@@ -3,29 +3,24 @@ package com.github.wxiaoqi.security.admin.rest;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.biz.*;
-import com.github.wxiaoqi.security.admin.entity.*;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.entity.AppUserPosition;
+import com.github.wxiaoqi.security.admin.entity.User;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
-import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
-import com.github.wxiaoqi.security.admin.vo.FrontUser;
-import com.github.wxiaoqi.security.admin.vo.MenuTree;
 import com.github.wxiaoqi.security.admin.vo.UserMemberVo;
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.util.process.SystemConfig;
-import io.swagger.models.auth.In;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * ${DESCRIPTION}
@@ -85,8 +80,7 @@ public class PublicController {
     public @ResponseBody
     ObjectRestResponse<AppUserDTO> userDetailById(Integer id) throws Exception {
         if (id == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE
-                    , new HashSet<String>() {{add("用户名不存在！");}});
+            return ObjectRestResponse.paramIsEmpty();
         }
         return ObjectRestResponse.succ(getAppUserInfoById(id));
     }
@@ -108,13 +102,12 @@ public class PublicController {
         return ObjectRestResponse.succ(getAppUserInfoById(appUserLogin.getId()));
     }
 
-    private AppUserDTO getAppUserInfoById(Integer userid) throws IllegalAccessException, InvocationTargetException {
+    private ObjectRestResponse<AppUserDTO> getAppUserInfoById(Integer userid) throws IllegalAccessException, InvocationTargetException {
         AppUserDTO userDTO=new AppUserDTO();
         //获取用户基础信息
         AppUserVo userVo = detailBiz.getUserInfoById(userid);
         if (userVo == null) {
-            throw new BaseException(ResultCode.NOTEXIST_CODE
-                    , new HashSet<String>() {{add("用户不存在！");}});
+           return ObjectRestResponse.createFailedResult(ResultCode.USER_NOTEXIST_CODE, ResultCode.getMsg(ResultCode.USER_NOTEXIST_CODE));
         }
         Integer id= userVo.getId();
         Integer positionId=userVo.getPositionId();
@@ -131,7 +124,7 @@ public class PublicController {
             userDTO.setPositionName(userPosition.getName());
         }
         userDTO.setId(id);
-        return userDTO;
+        return ObjectRestResponse.succ(userDTO);
     }
 
     @RequestMapping(value = "/userinfo-by-uid", method = RequestMethod.GET)