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/DiagLantoneProductController.java

@@ -63,7 +63,7 @@ public class DiagLantoneProductController {
         return RespDTO.onSuc(lantoneProductFacade.updateProduct(lantoneProduct));
     }
 
-    @ApiOperation(value = "删除产品",
+    @ApiOperation(value = "删除产品[by:wangyu]",
             notes = "id：根据产品id删除产品，必填<br>")
     @PostMapping("/deleteProduct")
     @SysLogger("deleteProduct")

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

@@ -25,7 +25,7 @@ public class EnumsController {
     @Autowired
     private EnumsDataFacade enumsDataFacade;
 
-    @ApiOperation(value = "产品中心枚举数据获取",
+    @ApiOperation(value = "产品中心枚举数据获取[by:gaodm]",
             notes = "产品中心枚举数据获取")
     @PostMapping("/getDiagbotManEnumsData")
     @SysLogger("getDiagbotManEnumsData")

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

@@ -12,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +32,7 @@ public class MoreServiceController {
     @Autowired
     private ProductOrderFacade productOrderFacade;
 
-    @ApiOperation(value = "根据用户id查询已开通信息", notes = "根据用户id查询已开通信息")
+    @ApiOperation(value = "根据用户id查询已开通信息[by:wangyu]", notes = "根据用户id查询已开通信息")
     @PostMapping("/showProductInfo")
     @SysLogger("showProductInfo")
     public RespDTO<LantoneProduct> showProductInfo(Page page){
@@ -41,7 +40,7 @@ public class MoreServiceController {
         return RespDTO.onSuc(diagLantoneProducts);
     }
 
-    @ApiOperation(value = "生成订单", notes = "根据用户所选择的产品生成订单")
+    @ApiOperation(value = "生成订单[by:wangyu]", notes = "根据用户所选择的产品生成订单")
     @PostMapping("/addOrder")
     @SysLogger("addOrder")
     @Transactional

log-service/src/main/java/com/diagbot/web/SysLogController.java

@@ -42,7 +42,7 @@ public class SysLogController {
      * @param sysLogVo 新增日志输入参数
      * @return 新增日志是否成功
      */
-    @ApiOperation(value = "添加日志", notes = "添加日志")
+    @ApiOperation(value = "添加日志(示例)[by:gaodm]", notes = "添加日志")
     @PostMapping("/add")
     @SysLogger("postLog")
     public RespDTO add(@RequestBody SysLogVo sysLogVo){
@@ -61,7 +61,7 @@ public class SysLogController {
      * @param id 日志信息ID
      * @return 删除是否成功
      */
-    @ApiOperation(value = "删除日志", notes = "删除日志")
+    @ApiOperation(value = "删除日志(示例)[by:gaodm]", notes = "删除日志")
     @DeleteMapping("/delete/{id}")
     @SysLogger("deleteLog")
     public RespDTO delete(@PathVariable(value = "id") Integer id){
@@ -73,7 +73,7 @@ public class SysLogController {
      * @param sysLog 修改日志输入参数
      * @return 修改是否成功
      */
-    @ApiOperation(value = "修改日志", notes = "修改日志")
+    @ApiOperation(value = "修改日志(示例)[by:gaodm]", notes = "修改日志")
     @PostMapping("/update")
     @SysLogger("updateLog")
     public RespDTO update(@RequestBody SysLog sysLog){
@@ -84,7 +84,7 @@ public class SysLogController {
      * 获取日志列表
      * @return 日志列信息
      */
-    @ApiOperation(value = "获取日志列表", notes = "获取日志列表")
+    @ApiOperation(value = "获取日志列表(示例)[by:gaodm]", notes = "获取日志列表")
     @GetMapping("/list")
     @SysLogger("listLog")
     public RespDTO list(){
@@ -96,7 +96,7 @@ public class SysLogController {
      * 获取日志翻页信息
      * @return 日志翻页信息
      */
-    @ApiOperation(value = "获取日志翻页信息", notes = "获取日志翻页信息")
+    @ApiOperation(value = "获取日志翻页信息(示例)[by:gaodm]", notes = "获取日志翻页信息")
     @GetMapping("/page")
     @SysLogger("pageLog")
     public RespDTO page() {

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

@@ -25,7 +25,7 @@ public class EnumsController {
     @Autowired
     private EnumsDataFacade enumsDataFacade;
 
-    @ApiOperation(value = "用户枚举数据获取",
+    @ApiOperation(value = "用户枚举数据获取[by:gaodm]",
             notes = "用户枚举数据获取")
     @PostMapping("/getUserEnumsData")
     @SysLogger("getUserEnumsData")

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

@@ -3,6 +3,7 @@ package com.diagbot.web;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.service.SmsVerService;
 import com.diagbot.util.DateUtil;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -23,6 +24,8 @@ public class TestController {
     @Autowired
     private SmsVerService smsVerService;
 
+    @ApiOperation(value = "测试发送短信[by:gaodm]",
+            notes = "测试发送短信")
     @PostMapping("/sms_send")
     RespDTO testSmsSend() {
         System.out.println("The time is now " + DateUtil.nowString());

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

@@ -121,7 +121,7 @@ public class UserController {
     }
 
 
-    @ApiOperation(value = "根据用户名获取用户", notes = "根据用户名获取用户")
+    @ApiOperation(value = "根据用户名获取用户(示例)[by:gaodm]", notes = "根据用户名获取用户")
     @PostMapping("/getByUsername")
     @SysLogger("getByUsername")
     @ApiIgnore
@@ -132,7 +132,7 @@ public class UserController {
         return RespDTO.onSuc(user);
     }
 
-    @ApiOperation(value = "根据用户id获取用户信息", notes = "根据用户id获取用户信息")
+    @ApiOperation(value = "根据用户id获取用户信息(示例)[by:gaodm]", notes = "根据用户id获取用户信息")
     @PostMapping("/getUserInfoByID")
     @SysLogger("getUserInfoByID")
     @ApiIgnore
@@ -166,7 +166,7 @@ public class UserController {
      * @param user 用户信息
      * @return 增加是否成功
      */
-    @ApiOperation(value = "增加用户", notes = "username和password为必选项")
+    @ApiOperation(value = "增加用户(示例)[by:gaodm]", notes = "username和password为必选项")
     @PostMapping("/addUser")
     @SysLogger("addUser")
     @Transactional
@@ -183,7 +183,7 @@ public class UserController {
      * @param user 用户信息
      * @return 修改是否成功
      */
-    @ApiOperation(value = "修改用户", notes = "username和password为必选项")
+    @ApiOperation(value = "修改用户(示例)[by:gaodm]", notes = "username和password为必选项")
     @PostMapping("/updateUser")
     @SysLogger("updateUser")
     @Transactional
@@ -199,7 +199,7 @@ public class UserController {
      * @param id 用户ID
      * @return 用户信息
      */
-    @ApiOperation(value = "查询用户", notes = "查询用户")
+    @ApiOperation(value = "查询用户(示例)[by:gaodm]", notes = "查询用户")
     @GetMapping("/getUser")
     @SysLogger("getUser")
     @Transactional
@@ -213,7 +213,7 @@ public class UserController {
      * @param id 用户ID
      * @return 删除是否成功
      */
-    @ApiOperation(value = "删除用户", notes = "删除用户")
+    @ApiOperation(value = "删除用户(示例)[by:gaodm]", notes = "删除用户")
     @PostMapping("/delUser")
     @SysLogger("delUser")
     @Transactional

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

@@ -46,7 +46,7 @@ public class VerController {
      * @param imgVerVerVO 验证图片验证码所需参数
      * @return 是否验证成功
      */
-    @ApiOperation(value = "验证图片验证码",
+    @ApiOperation(value = "验证图片验证码[by:zhoutg]",
             notes = "imgId：图片id<br>" +
                     "code：图片验证码<br>")
     @PostMapping("/verifyImgVerification")
@@ -60,7 +60,7 @@ public class VerController {
      * @param smsVerCreatVO 获取短信验证码输入参数
      * @return 获取短信验证码是否成功
      */
-    @ApiOperation(value = "注册获取短信验证码",
+    @ApiOperation(value = "注册获取短信验证码[by:zhoutg]",
             notes = "mobile：手机号，必填<br>" +
                     "imgId：图片id<br>" +
                     "code：图片验证码<br>")
@@ -76,7 +76,7 @@ public class VerController {
      * @param smsVerVerVO 短信验证码验证输入信息
      * @return 用户信息是否注册到数据库
      */
-    @ApiOperation(value = "验证短信验证码",
+    @ApiOperation(value = "验证短信验证码[by:zhoutg]",
             notes = "mobile：手机号，必填<br>" +
                     "smsCode：短信验证码，必填<br>")
     @PostMapping("/verifySmsVerification")
@@ -91,7 +91,7 @@ public class VerController {
      * @param smsVerCreatVO 获取短信验证码输入参数
      * @return 获取短信验证码是否成功
      */
-    @ApiOperation(value = "忘记密码获取短信验证码",
+    @ApiOperation(value = "忘记密码获取短信验证码[by:zhoutg]",
             notes = "mobile：手机号，必填<br>" +
                     "imgId：图片id<br>" +
                     "code：图片验证码<br>")