Merge branch 'master' into feature-management-2021-9-16

fiveep-common/fiveep-common-core/src/main/java/com/bizmatics/common/core/bean/ApiResult.java

@@ -23,7 +23,7 @@ public class ApiResult<T> implements Serializable {
 
     private static final long serialVersionUID = 5247512550376272642L;
 
-    private static final String SUCCESS_CODE = "0";
+    private static final String SUCCESS_CODE = "200";
 
     @ApiModelProperty(value = "状态", required = true)
     private ResultStatus status;

fiveep-controller/src/main/resources/smart-doc.json

@@ -7,5 +7,9 @@
   "packageFilters": "com.bizmatics.controller.web",
   "requestExample":"false",
   "responseExample":"true",
-  "projectName": "test"
+  "projectName": "伍继电力",
+  "appKey": "20210816876780111989309440",
+  "appToken":"c6fb2fb34b2f4e658bd78de54c4d67e4",
+  "secret": "8Hu.QnM2JN.$AcH5kvFr-7@.3qcaf6an",
+  "openUrl": "http://124.71.174.104:7700/api"
 }

fiveep-service/src/main/java/com/bizmatics/service/system/impl/SysLoginService.java

@@ -76,7 +76,7 @@ public class SysLoginService
             if (e instanceof BadCredentialsException)
             {
                 AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));
-                throw new BusinessException("添加异常");
+                throw new BusinessException("密码不正确");
             }
             else
             {