db config fix

database/src/main/java/com/jzdsh/common/database/DbConfig.java

@@ -1,5 +1,6 @@
 package com.jzdsh.common.database;
 
+import com.jfinal.kit.Prop;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.druid.DruidPlugin;
 
@@ -64,16 +65,10 @@ public class DbConfig {
     }
     //endregion
 
-    static DbConfig config = null;
-    public static DbConfig getNormal(){
-        if(null == config) {
-            System.out.println(String.format("url:%s username:%s  password:%s",PropKit.get("db.url"), PropKit.get("db.username"), PropKit.get("db.password")));
-            new DbConfig("normal", PropKit.get("db.url"), PropKit.get("db.username"), PropKit.get("db.password"));
-        }
-        return config;
+    public DbConfig(Prop p){
+        this("normal", p.get("db.url"), p.get("db.username"), p.get("db.password"));
     }
 
-
     public DbConfig(String configName,String jdbcUrl,String userName,String password){
         this.configName = configName;
         this.jdbcUrl = jdbcUrl;

database/src/main/java/com/jzdsh/common/database/_Generator.java

@@ -1,6 +1,7 @@
 package com.jzdsh.common.database;
 
 import com.jfinal.kit.PathKit;
+import com.jfinal.kit.Prop;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.dialect.MysqlDialect;
 import com.jfinal.plugin.activerecord.generator.Generator;
@@ -30,7 +31,8 @@ public class _Generator {
      * @param dbModelPackageName db model的包名 for example ：com.chinaventure.spider.model
      */
     public static void generate(String dbModelPackageName) {
-        generate(DbConfig.getNormal(),dbModelPackageName);
+        Prop p = PropKit.use("config-dev.txt");
+        generate(new DbConfig(p),dbModelPackageName);
     }
 
     /**