配置公共属性

admin/src/main/java/com/huimv/farm/damsubsidy/controller/SysUserController.java

@@ -139,8 +139,9 @@ public class SysUserController {
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
             accessToken.setLoginIp(remoteHost);
+            return new Result(ResultCode.SUCCESS, accessToken);
         }
-        if (result.getCode() == 10001) {
+        if (result.getCode() != 10000) {
             return result;
         }
         return new Result(ResultCode.SUCCESS, accessToken);

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -77,8 +77,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 if (sysUser.getAccoutType() == 1) {
                     this.updateById(sysUser.setLastIp(remoteHost));
                     return new Result(ResultCode.SUCCESS, sysUser);
+                } if (sysUser.getAccoutType() == 0){
+                    return new Result(10002, "该账号未审核！", false);
+                }if (sysUser.getAccoutType() == 2){
+                    return new Result(10002, "该账号已停用！", false);
+                }
+                if (sysUser.getAccoutType() == 3){
+                    return new Result(10002, "该账号已注销！", false);
                 } else {
-                    return new Result(10002, "未审核或者账号异常！", false);
+                    return new Result(10002, "该账号审核未通过！", false);
                 }
             }
         }

admin/src/main/resources/application-formal.yml

@@ -14,11 +14,15 @@ spring:
       max-file-size: 10MB
 
   datasource:
-      url: jdbc:mysql://192.168.0.2:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
-#    url: jdbc:mysql://36.133.251.176:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.0.2:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: dam_subsidy
-    password: ENC(6mAfId3WdkKkw+7YQzjQ6YSHCnR0bcGM)
+    password: Xnef*<bpo9+2
     driver-class-name: com.mysql.cj.jdbc.Driver
+#      url: jdbc:mysql://192.168.0.2:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+##    url: jdbc:mysql://36.133.251.176:3306/dam_subsidy?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+#    username: dam_subsidy
+#    password: ENC(6mAfId3WdkKkw+7YQzjQ6YSHCnR0bcGM)
+#    driver-class-name: com.mysql.cj.jdbc.Driver
 #      filters: config
 #      connect-properties:
 #        config.decrypt: true

admin/src/main/resources/application.properties

@@ -1,5 +1,5 @@
-spring.profiles.active=dev
-#spring.profiles.active=formal
+#spring.profiles.active=dev
+spring.profiles.active=formal
 #spring.profiles.active=root
 
 #spring.profiles.active=prod