|
@@ -1,5 +1,6 @@
|
|
package com.jzdsh.common.database;
|
|
package com.jzdsh.common.database;
|
|
|
|
|
|
|
|
+import com.jfinal.kit.Prop;
|
|
import com.jfinal.kit.PropKit;
|
|
import com.jfinal.kit.PropKit;
|
|
import com.jfinal.plugin.druid.DruidPlugin;
|
|
import com.jfinal.plugin.druid.DruidPlugin;
|
|
|
|
|
|
@@ -64,16 +65,10 @@ public class DbConfig {
|
|
}
|
|
}
|
|
//endregion
|
|
//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){
|
|
public DbConfig(String configName,String jdbcUrl,String userName,String password){
|
|
this.configName = configName;
|
|
this.configName = configName;
|
|
this.jdbcUrl = jdbcUrl;
|
|
this.jdbcUrl = jdbcUrl;
|