fix:调整用户增删改相关接口

project-interface/src/main/java/com/dituhui/pea/user/IUser.java

@@ -14,37 +14,38 @@ import com.dituhui.pea.enums.ThirdPartyEnum;
 
 /**
  * 用户相关接口
+ *
  * @author
  */
 @FeignClient(value = "project-user", contextId = "user")
 public interface IUser {
 
-	/**
-	 * 登录接口
-	 *
-	 * @param user
-	 * @return
-	 */
-	@RequestMapping(value = "/pea-user/login", method = RequestMethod.POST)
-	public Result<UserLoginDTO> userLogin(@RequestBody UserLoginParam user);
-
-	/**
-	 * 获取用户信息
-	 *
-	 * @param userId
-	 * @return
-	 */
-	@RequestMapping(value = "/pea-user/userInfo", method = RequestMethod.GET)
-	public Result<UserLoginDTO> getUserInfo(@RequestHeader(name="userId", required = true) String userId);
-
-	/**
-	 * 刷新appkey接口<br>
-	 * 初始化系统ak缓存，例如系统上线，新ak入库的时候
-	 *
-	 * @return
-	 */
-	@RequestMapping(value = "/pea-user/refreshAppkey", method = RequestMethod.POST)
-	public Result<Boolean> refreshAppkey();
+    /**
+     * 登录接口
+     *
+     * @param user
+     * @return
+     */
+    @RequestMapping(value = "/pea-user/login", method = RequestMethod.POST)
+    public Result<UserLoginDTO> userLogin(@RequestBody UserLoginParam user);
+
+    /**
+     * 获取用户信息
+     *
+     * @param userId
+     * @return
+     */
+    @RequestMapping(value = "/pea-user/userInfo", method = RequestMethod.GET)
+    public Result<UserLoginDTO> getUserInfo(@RequestHeader(name = "userId", required = true) String userId);
+
+    /**
+     * 刷新appkey接口<br>
+     * 初始化系统ak缓存，例如系统上线，新ak入库的时候
+     *
+     * @return
+     */
+    @RequestMapping(value = "/pea-user/refreshAppkey", method = RequestMethod.POST)
+    public Result<Boolean> refreshAppkey();
 
     /**
      * 获取当前登陆用户信息
@@ -59,6 +60,7 @@ public interface IUser {
 
     /**
      * 获取用户信息
+     *
      * @param id 用户ID
      * @return
      */
@@ -86,7 +88,7 @@ public interface IUser {
     /**
      * 获取用户信息
      *
-     * @param id 第三方标志
+     * @param id   第三方标志
      * @param type 第三方类型
      * @return
      */
@@ -96,31 +98,35 @@ public interface IUser {
 
     /**
      * 添加用户
+     *
      * @param userInfo 用户信息
      * @return
      */
     @RequestMapping(value = "/pea-user/add", method = RequestMethod.POST)
-    WebResult<UserInfo> addUser(@RequestBody UserInfo userInfo);
+    Result<UserInfo> addUser(@RequestBody UserInfo userInfo);
 
 
     /**
      * 更新用户
+     *
      * @param userInfo 用户信息
      * @return
      */
     @RequestMapping(value = "/pea-user/update", method = RequestMethod.POST)
-    WebResult<UserInfo> updateUser(@RequestBody UserInfo userInfo);
+    Result<UserInfo> updateUser(@RequestBody UserInfo userInfo);
 
     /**
      * 删除用户
+     *
      * @param userId 用户ID
      * @return
      */
     @RequestMapping(value = "/pea-user/delete", method = RequestMethod.POST)
-    WebResult<Boolean> deleteUser(@RequestParam("id") String userId);
+    Result<Boolean> deleteUser(@RequestParam("id") String userId);
 
     /**
      * 注册用户
+     *
      * @param userInfo 用户信息
      * @return
      */
@@ -129,6 +135,7 @@ public interface IUser {
 
     /**
      * 第三方用户注册
+     *
      * @param thirdUserInfo 第三方用户信息
      * @return
      */
@@ -138,6 +145,7 @@ public interface IUser {
 
     /**
      * 用户列表
+     *
      * @param search 查询条件
      * @return
      */
@@ -147,6 +155,7 @@ public interface IUser {
 
     /**
      * 禁用用户
+     *
      * @param search 查询条件
      * @return
      */

project-user/src/main/java/com/dituhui/pea/user/controller/UserController.java

@@ -84,39 +84,39 @@ public class UserController implements IUser {
     }
 
     @Override
-    public WebResult<UserInfo> addUser(UserInfo userInfo) {
+    public Result<UserInfo> addUser(UserInfo userInfo) {
         if (ObjectUtil.isNull(userInfo)) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         if (StringUtils.isBlank(userInfo.getAccount())) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         if (StringUtils.isBlank(userInfo.getPassword())) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         userInfo = userService.saveUser(userInfo);
-        return WebResult.ok(userInfo);
+        return Result.success(userInfo);
     }
 
     @Override
-    public WebResult<UserInfo> updateUser(UserInfo userInfo) {
+    public Result<UserInfo> updateUser(UserInfo userInfo) {
         if (userInfo == null) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         if (StringUtils.isBlank(userInfo.getId())) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         userInfo = userService.updateUser(userInfo);
-        return WebResult.ok(userInfo);
+        return Result.success(userInfo);
     }
 
     @Override
-    public WebResult<Boolean> deleteUser(String userId) {
+    public Result<Boolean> deleteUser(String userId) {
         if (StringUtils.isBlank(userId)) {
-            return WebResult.failed(StatusCodeEnum.COMMON_PARAM_EMPTY);
+            return Result.failed(StatusCodeEnum.COMMON_PARAM_EMPTY, null);
         }
         userService.deleteUser(userId);
-        return WebResult.ok();
+        return Result.success(true);
     }
 
     @Override