Merge remote-tracking branch 'origin/dev/one' into dev/one

common/src/main/java/com/diagbot/exception/CommonErrorCode.java

@@ -20,7 +20,8 @@ public enum CommonErrorCode implements ErrorCode {
     PARAM_IS_ERROR("00020005", "传入的参数为错误!"),
     STATUS_IS_ERROR("00020006", "参数状态错误!"),
     SERVER_IS_ERROR("00020007", "各自业务错误!"),
-    NO_PERMISSION("00020008", "无权访问!");
+    NO_PERMISSION("00020008", "无权访问!"),
+    IS_EXISTS("00020009", "已存在!");
 
     private String code;
     private String msg;

diagbotman-service/src/main/java/com/diagbot/web/ServiceFilterController.java

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ServiceFilter;
 import com.diagbot.facade.ServiceFilterFacade;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,8 +25,11 @@ public class ServiceFilterController {
     @Autowired
     ServiceFilterFacade serviceFilterFacade;
 
-    @ApiIgnore
+
     @PostMapping("/getAll")
+    @ApiOperation(value = "获取需要appkey和secret的服务信息",
+            notes = "接口未用，直接从配置项中读取服务")
+    @ApiIgnore
     public RespDTO<List<ServiceFilter>> getServiceFilter() {
         return serviceFilterFacade.getAll();
     }

diagbotman-service/src/main/java/com/diagbot/web/ServiceTokenController.java

@@ -42,6 +42,7 @@ public class ServiceTokenController {
 
 
     @PostMapping("/hasPermission")
+    @ApiOperation(value = "查询当前appkey和secret是否有权限[by:zhoutg]")
     @ApiIgnore
     public RespDTO<Boolean> hasPermission(@RequestBody ServiceTokenVo serviceTokenVo) {
         return serviceTokenFacade.hasPermission(serviceTokenVo);

user-service/src/main/java/com/diagbot/web/UserController.java

@@ -44,7 +44,7 @@ public class UserController {
     @Autowired
     private PermissionFacade permissionFacade;
 
-    @ApiOperation(value = "注册",
+    @ApiOperation(value = "注册[by:zhoutg]",
         notes = "username：用户名，必填<br>" +
                 "password：密码，必填<br> " +
                 "organization：组织机构，必填<br>" +
@@ -61,7 +61,7 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "登录",
+    @ApiOperation(value = "登录[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
                     "password：密码, 必填<br> ")
     @PostMapping("/login")
@@ -71,7 +71,7 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "重置密码",
+    @ApiOperation(value = "重置密码[by:zhoutg]",
             notes = "username：用户名,必填<br>" +
                     "password：密码, 必填<br> " +
                     "diffPassword：值为Y，表示修改前和修改后密码不相同<br>")
@@ -91,7 +91,7 @@ public class UserController {
      */
     @PostMapping(value = "/getUserAndOrg")
     @SysLogger("getUserAndOrg")
-    @ApiOperation(value = "获取用户和机构信息")
+    @ApiOperation(value = "获取用户和机构信息[by:zhoutg]")
     @ApiIgnore
     RespDTO<Map<Long,UserOrgDTO>> getUserAndOrg(@RequestBody List<Long> userIds) {
         Map<Long, UserOrgDTO> result = userFacade.getUserAndOrg(userIds);
@@ -106,12 +106,13 @@ public class UserController {
      */
     @PostMapping("/index")
     @SysLogger("index")
+    @ApiOperation(value = "用来测试分页，未用[by:zhoutg]")
     @ApiIgnore
     public RespDTO<IPage<User>> indexUser(Page page, UserSaveVO userSaveVO){
         return userFacade.index(page, userSaveVO);
     }
 
-    @ApiOperation(value = "获取资源信息",
+    @ApiOperation(value = "获取资源信息[by:zhoutg]",
             notes = "appkey：用户名,必填<br>" +
                     "secret：密码, 必填<br> ")
     @PostMapping("/getPermission")