فهرست منبع

添加配置参数

LIVE_YE 11 ماه پیش
والد
کامیت
cb75165a5a

+ 1 - 1
ruoyi-admin/src/main/resources/application-druid.yml

@@ -15,7 +15,7 @@ ruoyi:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 当前环境
-    active: druid
+    isYml: druid
 # 开发环境配置
 server:
     # 服务器的HTTP端口,默认为8080

+ 1 - 1
ruoyi-admin/src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ ruoyi:
     # 验证码类型 math 数组计算 char 字符验证
     captchaType: math
     # 当前环境
-    active: prod
+    isYml: prod
 
 # 开发环境配置
 server:

+ 6 - 6
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java

@@ -30,8 +30,8 @@ public class RuoYiConfig
     /** 验证码类型 */
     private static String captchaType;
 
-    /** 当前环境 */
-    private static String active;
+    /** 上传路径 */
+    private static String isYml;
 
     public String getName()
     {
@@ -91,12 +91,12 @@ public class RuoYiConfig
         RuoYiConfig.captchaType = captchaType;
     }
 
-    public static String getActive() {
-        return active;
+    public static String getIsYml() {
+        return isYml;
     }
 
-    public static void setActive(String active) {
-        RuoYiConfig.active = active;
+    public void setIsYml(String isYml) {
+        RuoYiConfig.isYml = isYml;
     }
 
     /**

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -198,7 +198,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             loanApplication.setUserId(user.getUserId());
         }
         List<LoanApplication> loanApplications = new ArrayList<>();
-        if("druid".equals(RuoYiConfig.getActive())){
+        if("druid".equals(RuoYiConfig.getIsYml())){
             loanApplications = loanApplicationMapper.conferenceList(loanApplication);
         }else{
             loanApplications = loanApplicationMapper.conferenceProdList(loanApplication);