diff --git a/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java b/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java index cef9639..0e9eb36 100644 --- a/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java +++ b/src/main/java/com/nmgs/MyEnvironmentPostProcessor.java @@ -40,9 +40,9 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor { String DBType = properties.getProperty("WhiteDBType") == null ? "1" : properties.getProperty("WhiteDBType"); Newproperties.load(new FileInputStream(NewPath)); properties.setProperty("spring.logback.logPath",PathUtil.TomcatPath+"/logs"); - properties.setProperty("spring.datasource.url",properties.getProperty("WhiteDBUrl")); - properties.setProperty("spring.datasource.username",properties.getProperty("WhiteDBUserName")); - properties.setProperty("spring.datasource.password",PassWordUtils.decrypt(properties.getProperty("WhiteDBPassWord"))); + properties.setProperty("spring.datasource.url",properties.getProperty("DBUrl")); + properties.setProperty("spring.datasource.username",properties.getProperty("DBUserName")); + properties.setProperty("spring.datasource.password",PassWordUtils.decrypt(properties.getProperty("DBPassWord"))); if(DBType.equals("1")){ properties.setProperty("spring.datasource.driver-class-name",Newproperties.getProperty("sqlClassName")); properties.setProperty("spring.datasource.validationQuery",Newproperties.getProperty("sqlvalidationQuery")); diff --git a/src/main/java/com/nmgs/config/MybatisPlusConfig.java b/src/main/java/com/nmgs/config/MybatisPlusConfig.java index a12f319..8ddc30f 100644 --- a/src/main/java/com/nmgs/config/MybatisPlusConfig.java +++ b/src/main/java/com/nmgs/config/MybatisPlusConfig.java @@ -12,13 +12,13 @@ public class MybatisPlusConfig { @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); - if(PropertiesUtil.getValue("WhiteDBType").equals("1")){ + if(PropertiesUtil.getValue("DBType").equals("1")){ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.SQL_SERVER2005)); - }else if(PropertiesUtil.getValue("WhiteDBType").equals("2")){ + }else if(PropertiesUtil.getValue("DBType").equals("2")){ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.ORACLE)); - }else if(PropertiesUtil.getValue("WhiteDBType").equals("3")){ + }else if(PropertiesUtil.getValue("DBType").equals("3")){ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.DM)); - }else if(PropertiesUtil.getValue("WhiteDBType").equals("4")){ + }else if(PropertiesUtil.getValue("DBType").equals("4")){ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); } return interceptor; diff --git a/src/main/java/com/nmgs/util/PubTools.java b/src/main/java/com/nmgs/util/PubTools.java index fd2967a..78679d2 100644 --- a/src/main/java/com/nmgs/util/PubTools.java +++ b/src/main/java/com/nmgs/util/PubTools.java @@ -184,7 +184,7 @@ public class PubTools { } public static String getDBType(){ - return PropertiesUtil.getValue("WhiteDBType"); + return PropertiesUtil.getValue("DBType"); } public static String GetHex(Object o)