Browse Source

添加允许setting.json 配置是否适用默认配置替代数据库配置

suntg 7 years ago
parent
commit
732bfb220f

+ 16 - 0
src/main/java/com/uas/erp/schedular/entity/Setting.java

@@ -6,6 +6,7 @@ import org.springframework.util.StringUtils;
 import javax.persistence.Column;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 import javax.persistence.Id;
+import javax.persistence.Transient;
 
 
 /**
 /**
  * Created by Pro1 on 2017/7/26.
  * Created by Pro1 on 2017/7/26.
@@ -21,6 +22,13 @@ public class Setting {
     @Column(name = "value_")
     @Column(name = "value_")
     private String value;
     private String value;
 
 
+    /**
+     * 是否需要用代码配置重置数据库配置,默认:否 <br/>
+     * 可以通过配置setting.json中的选项配置修改
+     */
+    @Transient
+    private boolean resetDefault = false;
+
     public Setting() {
     public Setting() {
     }
     }
 
 
@@ -62,4 +70,12 @@ public class Setting {
     public void setValue(String value) {
     public void setValue(String value) {
         this.value = value;
         this.value = value;
     }
     }
+
+    public boolean isResetDefault() {
+        return resetDefault;
+    }
+
+    public void setResetDefault(boolean resetDefault) {
+        this.resetDefault = resetDefault;
+    }
 }
 }

+ 4 - 11
src/main/java/com/uas/erp/schedular/init/DefaultInitializer.java

@@ -22,8 +22,6 @@ public class DefaultInitializer implements CommandLineRunner {
 
 
     @Override
     @Override
     public void run(String... strings) throws Exception {
     public void run(String... strings) throws Exception {
-        // 用默认数据重置数据库配置
-        String[] resetDefaultKeys = {"api.b2b.url", "api.publicinquiry.url", "api.publicproduct.url"};
         // 默认数据
         // 默认数据
         String settingsStr = StringUtil.copyResource("init/setting.json");
         String settingsStr = StringUtil.copyResource("init/setting.json");
         if (!StringUtils.isEmpty(settingsStr)) {
         if (!StringUtils.isEmpty(settingsStr)) {
@@ -33,17 +31,12 @@ public class DefaultInitializer implements CommandLineRunner {
                 if (null == oldOne) {
                 if (null == oldOne) {
                     settingService.save(setting);
                     settingService.save(setting);
                 } else {
                 } else {
-                    if (resetDefaultKeys.length > 0) {
-                        for (String key : resetDefaultKeys) {
-                            // 需要用默认配置重置数据库配置,修改数据库配置内容
-                            if (key.equals(setting.getKey())) {
-                                oldOne.setValue(setting.getValue());
-                                settingService.save(oldOne);
-                            }
-                        }
+                    // 需要用代码配置重置数据库配置,修改数据库配置内容
+                    if (setting.isResetDefault()) {
+                        oldOne.setValue(setting.getValue());
+                        settingService.save(oldOne);
                     }
                     }
                 }
                 }
-
                 // 不修改已设置项
                 // 不修改已设置项
             }
             }
         }
         }

+ 2 - 1
src/main/resources/init/setting.json

@@ -17,7 +17,8 @@
 },{
 },{
   "key": "api.b2b.url",
   "key": "api.b2b.url",
   "description": "优软B2B平台正式接口地址",
   "description": "优软B2B平台正式接口地址",
-  "value": "http://b2b-api.usoftchina.com"
+  "value": "http://b2b-api.suntg.com",
+  "resetDefault": true
 },{
 },{
   "key": "api.finance.url",
   "key": "api.finance.url",
   "description": "金融保理平台(后台)正式接口地址",
   "description": "金融保理平台(后台)正式接口地址",