bug fix

.gitignore

@@ -15,8 +15,9 @@ hs_err_pid*
 *.iml
 **/.idea/
 /.idea/
+.idea
 .idea/
-*.idea/
+idea/
 .idea_modules/
 target/
 .settings/

database/pom.xml

@@ -20,7 +20,6 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>com.jfinal</groupId>
       <artifactId>jfinal</artifactId>

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

@@ -67,6 +67,7 @@ public class DbConfig {
     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;

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

@@ -44,7 +44,7 @@ public class _Generator {
         //次要要数据库包名
         String subPackageName = dbModelPackageName+"." + config.getConfigName() + ".base";
 
-        String baseModelPackageName = StringUtils.equalsIgnoreCase(config.getConfigName(), DbConfig.getNormal().getConfigName()) ? mainPackageName : subPackageName;
+        String baseModelPackageName = StringUtils.equalsIgnoreCase(config.getConfigName(), "normal") ? mainPackageName : subPackageName;
         // base model 文件保存路径
         String baseModelOutputDir = PathKit.getWebRootPath() + "/src/main/java/" + baseModelPackageName.replace('.', '/');
 

utils/pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>com.jzdsh</groupId>
   <artifactId>utils</artifactId>
-  <version>1.0</version>
+  <version>1.1</version>
 
   <name>utils</name>
   <description>the general class library of jzdsh</description>