2024年11月11日 1.0.1 将前端路由页面去掉,都由主框架路径跳转,同时兼容GoldenDB数据库

main
gaoshuguang 1 year ago
parent f262e74427
commit 36724417da

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
</component>
</project>

@ -190,7 +190,12 @@
<artifactId>joda-time</artifactId> <artifactId>joda-time</artifactId>
<version>2.10.13</version> <version>2.10.13</version>
</dependency> </dependency>
<!-- goldendb驱动 -->
<dependency>
<groupId>com.zte.goldendb</groupId> <!-- 假设的groupId -->
<artifactId>gdb_mysql-connector-java</artifactId> <!-- 假设的artifactId -->
<version>5.1.46.67</version> <!-- 版本号 -->
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>

@ -1,6 +1,7 @@
package com.nmggs.query.common.config; package com.nmggs.query.common.config;
import com.nmggs.query.common.emnu.Constant;
import com.nmggs.query.common.utils.PathUtil; import com.nmggs.query.common.utils.PathUtil;
import com.nmggs.query.common.utils.PropertiesUtil; import com.nmggs.query.common.utils.PropertiesUtil;
import com.trkf.PasswordEncryption.PassWordUtils; import com.trkf.PasswordEncryption.PassWordUtils;
@ -44,31 +45,39 @@ public class MyEnvironmentPostProcessor implements EnvironmentPostProcessor {
properties.load(new FileInputStream(path)); properties.load(new FileInputStream(path));
String DBType = properties.getProperty("DBType") == null ? "1" : properties.getProperty("DBType"); String DBType = properties.getProperty("DBType") == null ? "1" : properties.getProperty("DBType");
Newproperties.load(new FileInputStream(NewPath)); Newproperties.load(new FileInputStream(NewPath));
properties.setProperty("spring.logback.logPath",PathUtil.TomcatPath+"/logs"); //获取是否是goldenDB数据库
properties.setProperty("spring.datasource.url",properties.getProperty("DBUrl")); String IsGolDen = properties.getProperty("IsGolDen") == null ? "0" : properties.getProperty("IsGolDen");
properties.setProperty("spring.datasource.username",properties.getProperty("DBUserName")); properties.setProperty("spring.logback.logPath", PathUtil.TomcatPath + "/logs");
properties.setProperty("spring.datasource.password",PassWordUtils.decrypt(properties.getProperty("DBPassWord"))); properties.setProperty("spring.datasource.url", properties.getProperty("DBUrl"));
switch (DBType) { properties.setProperty("spring.datasource.username", properties.getProperty("DBUserName"));
case "1": properties.setProperty("spring.datasource.password", PassWordUtils.decrypt(properties.getProperty("DBPassWord")));
properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("sqlClassName")); if(Constant.STR_ONE.equals(IsGolDen)){
properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("sqlvalidationQuery")); properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("GoldenDBClassName"));
properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery")); properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("GoldenvalidationQuery"));
break; properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("GoldenvalidationQuery"));
case "2": }else {
properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("OracleClassName")); switch (DBType) {
properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("OraclevalidationQuery")); case "1":
properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery")); properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("sqlClassName"));
break; properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("sqlvalidationQuery"));
case "3": properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("sqlvalidationQuery"));
properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("DMClassName")); break;
properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("DMvalidationQuery")); case "2":
properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery")); properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("OracleClassName"));
break; properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("OraclevalidationQuery"));
case "4": properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("OraclevalidationQuery"));
properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("MySQLClassName")); break;
properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("MySQLvalidationQuery")); case "3":
properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery")); properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("DMClassName"));
break; properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("DMvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("DMvalidationQuery"));
break;
case "4":
properties.setProperty("spring.datasource.driver-class-name", Newproperties.getProperty("MySQLClassName"));
properties.setProperty("spring.datasource.validationQuery", Newproperties.getProperty("MySQLvalidationQuery"));
properties.setProperty("spring.datasource.hikari.connection-test-query", Newproperties.getProperty("MySQLvalidationQuery"));
break;
}
} }
System.out.println("--------------------------FeeUnitQuery-本次载入数据库----------------------"); System.out.println("--------------------------FeeUnitQuery-本次载入数据库----------------------");
System.out.println(" server.port : " + properties.getProperty("server.port")); System.out.println(" server.port : " + properties.getProperty("server.port"));

@ -65,6 +65,8 @@ DMClassName=dm.jdbc.driver.DmDriver
DMvalidationQuery=SELECT 1 DMvalidationQuery=SELECT 1
MySQLClassName=com.mysql.cj.jdbc.Driver MySQLClassName=com.mysql.cj.jdbc.Driver
MySQLvalidationQuery=SELECT 1 MySQLvalidationQuery=SELECT 1
GoldenDBClassName=com.goldendb.jdbc.Driver
GoldenvalidationQuery=SELECT 1 FROM DUAL
mybatis-plus.configuration.map-underscore-to-camel-case=false mybatis-plus.configuration.map-underscore-to-camel-case=false
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

@ -1,2 +0,0 @@
序号 日期 版本号 说明
1 2024年08月15日 1.0.0 查询FEEUNIT_TABLE初始版本号

@ -0,0 +1,3 @@
序号 日期 版本号 说明
1 2024年08月15日 1.0.0 查询FEEUNIT_TABLE初始版本号
2 2024年11月11日 1.0.1 将前端路由页面去掉都由主框架路径跳转同时兼容GoldenDB数据库

@ -1,9 +0,0 @@
Manifest-Version: 1.0
Created-By: IntelliJ IDEA
Built-By: shuguang
Build-Jdk: version 1.8.0_121
Implementation-Title: FeeUnitQuery
Implementation-Version: 0.0.1-SNAPSHOT
Implementation-Vendor-Id: com.nmggs
Main-Class: ${start-class}

@ -65,6 +65,8 @@ DMClassName=dm.jdbc.driver.DmDriver
DMvalidationQuery=SELECT 1 DMvalidationQuery=SELECT 1
MySQLClassName=com.mysql.cj.jdbc.Driver MySQLClassName=com.mysql.cj.jdbc.Driver
MySQLvalidationQuery=SELECT 1 MySQLvalidationQuery=SELECT 1
GoldenDBClassName=com.goldendb.jdbc.Driver
GoldenvalidationQuery=SELECT 1 FROM DUAL
mybatis-plus.configuration.map-underscore-to-camel-case=false mybatis-plus.configuration.map-underscore-to-camel-case=false
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

@ -1,2 +0,0 @@
序号 日期 版本号 说明
1 2024年08月15日 1.0.0 查询FEEUNIT_TABLE初始版本号

@ -0,0 +1,3 @@
序号 日期 版本号 说明
1 2024年08月15日 1.0.0 查询FEEUNIT_TABLE初始版本号
2 2024年11月11日 1.0.1 将前端路由页面去掉都由主框架路径跳转同时兼容GoldenDB数据库

@ -65,6 +65,8 @@ DMClassName=dm.jdbc.driver.DmDriver
DMvalidationQuery=SELECT 1 DMvalidationQuery=SELECT 1
MySQLClassName=com.mysql.cj.jdbc.Driver MySQLClassName=com.mysql.cj.jdbc.Driver
MySQLvalidationQuery=SELECT 1 MySQLvalidationQuery=SELECT 1
GoldenDBClassName=com.goldendb.jdbc.Driver
GoldenvalidationQuery=SELECT 1 FROM DUAL
mybatis-plus.configuration.map-underscore-to-camel-case=false mybatis-plus.configuration.map-underscore-to-camel-case=false
spring.jackson.time-zone=GMT+8 spring.jackson.time-zone=GMT+8
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.date-format=yyyy-MM-dd HH:mm:ss

@ -1,2 +0,0 @@
序号 日期 版本号 说明
1 2024年08月15日 1.0.0 查询FEEUNIT_TABLE初始版本号

@ -0,0 +1,3 @@
序号 日期 版本号 说明
1 2024年08月15日 1.0.0 查询FEEUNIT_TABLE初始版本号
2 2024年11月11日 1.0.1 将前端路由页面去掉都由主框架路径跳转同时兼容GoldenDB数据库

@ -14,6 +14,7 @@ com\nmggs\query\common\config\CaptchaConfig.class
com\nmggs\query\test\Test01.class com\nmggs\query\test\Test01.class
com\nmggs\query\common\emnu\Constant.class com\nmggs\query\common\emnu\Constant.class
com\nmggs\query\entity\Res.class com\nmggs\query\entity\Res.class
com\nmggs\query\test\ListTest.class
com\nmggs\query\common\utils\TokenUtil.class com\nmggs\query\common\utils\TokenUtil.class
com\nmggs\query\common\config\MybatisConfig.class com\nmggs\query\common\config\MybatisConfig.class
com\nmggs\query\common\exception\PPExceptionHandler.class com\nmggs\query\common\exception\PPExceptionHandler.class
@ -23,6 +24,7 @@ com\nmggs\query\common\utils\UuidUtil.class
com\nmggs\query\common\config\CorsConfig.class com\nmggs\query\common\config\CorsConfig.class
com\nmggs\query\common\config\FilterConfig.class com\nmggs\query\common\config\FilterConfig.class
com\nmggs\query\common\utils\FileUtil.class com\nmggs\query\common\utils\FileUtil.class
com\nmggs\query\common\utils\ObjectUtils.class
com\nmggs\query\FeeUnitQueryApplication.class com\nmggs\query\FeeUnitQueryApplication.class
com\nmggs\query\common\utils\PropertiesUtil.class com\nmggs\query\common\utils\PropertiesUtil.class
com\nmggs\query\common\utils\PathUtil.class com\nmggs\query\common\utils\PathUtil.class

@ -17,8 +17,10 @@ D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\config\ErrorConfig.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\config\ErrorConfig.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\config\MybatisConfig.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\config\MybatisConfig.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\LogUtil.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\LogUtil.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\test\ListTest.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\DateTimeUtil.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\DateTimeUtil.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\UuidUtil.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\UuidUtil.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\utils\ObjectUtils.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\config\RedisSessionConfig.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\config\RedisSessionConfig.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\service\QueryTableService.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\service\QueryTableService.java
D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\exception\PPException.java D:\myproject\git\FeeUnitQuery\FeeUnitQuery\src\main\java\com\nmggs\query\common\exception\PPException.java

Loading…
Cancel
Save