From 37f41ecb54550a344cba0c6f6ad3a3d2f4a1fa3b Mon Sep 17 00:00:00 2001 From: liwenxuan <1298531568@qq.com> Date: Wed, 26 Feb 2025 15:55:16 +0800 Subject: [PATCH] 2 --- logs/error.log | 0 logs/info.log | 18 -------- logs/test.log | 18 -------- logs/warn.log | 0 pom.xml | 6 +++ src/main/resources/application-dev.yml | 54 ++++-------------------- src/main/resources/application-prod.yml | 55 +++++-------------------- 7 files changed, 25 insertions(+), 126 deletions(-) delete mode 100644 logs/error.log delete mode 100644 logs/info.log delete mode 100644 logs/test.log delete mode 100644 logs/warn.log diff --git a/logs/error.log b/logs/error.log deleted file mode 100644 index e69de29..0000000 diff --git a/logs/info.log b/logs/info.log deleted file mode 100644 index b4628ce..0000000 --- a/logs/info.log +++ /dev/null @@ -1,18 +0,0 @@ -15:04:03.042 [restartedMain] INFO com.hxjt.dataupload.DataUploadApplication - Starting DataUploadApplication using Java 1.8.0_202 on DESKTOP-1O1AVPV with PID 14468 (F:\ideapro\data-upload\target\classes started by liwenxuan in F:\ideapro\data-upload) -15:04:03.048 [restartedMain] INFO com.hxjt.dataupload.DataUploadApplication - The following 1 profile is active: "dev" -15:04:04.041 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8113"] -15:04:04.041 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] -15:04:04.041 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.69] -15:04:04.106 [restartedMain] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext -15:04:04.781 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,hrnew} inited -15:04:05.015 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-2,tidbintranetappplatform} inited -15:04:05.215 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-3,systemempower} inited -15:04:05.477 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-4,tidbintranetcustomerform} inited -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [tidbintranetcustomerform] success -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [hrnew] success -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [systemempower] success -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [tidbintranetappplatform] success -15:04:05.479 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [4] datasource,primary datasource named [tidbintranetappplatform] -15:04:05.877 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8113"] -15:04:05.898 [restartedMain] INFO com.hxjt.dataupload.DataUploadApplication - Started DataUploadApplication in 3.253 seconds (JVM running for 4.271) -15:04:58.239 [http-nio-8113-exec-1] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet' diff --git a/logs/test.log b/logs/test.log deleted file mode 100644 index b4628ce..0000000 --- a/logs/test.log +++ /dev/null @@ -1,18 +0,0 @@ -15:04:03.042 [restartedMain] INFO com.hxjt.dataupload.DataUploadApplication - Starting DataUploadApplication using Java 1.8.0_202 on DESKTOP-1O1AVPV with PID 14468 (F:\ideapro\data-upload\target\classes started by liwenxuan in F:\ideapro\data-upload) -15:04:03.048 [restartedMain] INFO com.hxjt.dataupload.DataUploadApplication - The following 1 profile is active: "dev" -15:04:04.041 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Initializing ProtocolHandler ["http-nio-8113"] -15:04:04.041 [restartedMain] INFO org.apache.catalina.core.StandardService - Starting service [Tomcat] -15:04:04.041 [restartedMain] INFO org.apache.catalina.core.StandardEngine - Starting Servlet engine: [Apache Tomcat/9.0.69] -15:04:04.106 [restartedMain] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring embedded WebApplicationContext -15:04:04.781 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-1,hrnew} inited -15:04:05.015 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-2,tidbintranetappplatform} inited -15:04:05.215 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-3,systemempower} inited -15:04:05.477 [restartedMain] INFO com.alibaba.druid.pool.DruidDataSource - {dataSource-4,tidbintranetcustomerform} inited -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [tidbintranetcustomerform] success -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [hrnew] success -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [systemempower] success -15:04:05.478 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource - load a datasource named [tidbintranetappplatform] success -15:04:05.479 [restartedMain] INFO com.baomidou.dynamic.datasource.DynamicRoutingDataSource - dynamic-datasource initial loaded [4] datasource,primary datasource named [tidbintranetappplatform] -15:04:05.877 [restartedMain] INFO org.apache.coyote.http11.Http11NioProtocol - Starting ProtocolHandler ["http-nio-8113"] -15:04:05.898 [restartedMain] INFO com.hxjt.dataupload.DataUploadApplication - Started DataUploadApplication in 3.253 seconds (JVM running for 4.271) -15:04:58.239 [http-nio-8113-exec-1] INFO org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] - Initializing Spring DispatcherServlet 'dispatcherServlet' diff --git a/logs/warn.log b/logs/warn.log deleted file mode 100644 index e69de29..0000000 diff --git a/pom.xml b/pom.xml index 7e6d17c..7832f13 100644 --- a/pom.xml +++ b/pom.xml @@ -82,6 +82,12 @@ mysql-connector-java 8.0.24 + + + com.microsoft.sqlserver + mssql-jdbc + 9.4.1.jre8 + org.apache.commons commons-lang3 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index f6a967d..592724d 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -13,33 +13,16 @@ spring: autoconfigure: #去除durid配置 exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - #MySQL druid多数据源配置（纯粹多库） + #druid多数据源配置（纯粹多库） datasource: dynamic: datasource: - hrnew: - driver-class-name: com.mysql.cj.jdbc.Driver - password: 9z_Bu28r1*DZ3K6@+a - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://172.20.5.33:4000/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: root - tidbintranetappplatform: - driver-class-name: com.mysql.cj.jdbc.Driver - password: 9z_Bu28r1*DZ3K6@+a - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://172.20.5.33:4000/app_platform?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: root - systemempower: - driver-class-name: com.mysql.cj.jdbc.Driver - password: 9z_Bu28r1*DZ3K6@+a - url: jdbc:mysql://172.20.5.33:4000/system_empower?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: root - tidbintranetcustomerform: - driver-class-name: com.mysql.cj.jdbc.Driver - password: 9z_Bu28r1*DZ3K6@+a - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://172.20.5.33:4000/customer_form?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: root + syncplant: + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + password: Syncp1@nt + #url: jdbc:sqlserver://172.20.2.206:1433;databaseName=SyncPlant;encrypt=true;trustServerCertificate=true + url: jdbc:sqlserver://172.20.2.206:1433;databaseName=SyncPlant + username: sa #数据源基础配置 druid: # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 @@ -62,27 +45,8 @@ spring: test-while-idle: true # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 time-between-eviction-runs-millis: 60000 - validation-query: 'SELECT 1 FROM DUAL ' + validation-query: 'SELECT 1' #指定默认数据源(必须配置) - primary: tidbintranetappplatform + primary: syncplant #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. strict: false - redis: - database: 5 - #host: 127.0.0.1 - host: 172.20.5.57 - lettuce: - pool: - max-active: 10 - max-idle: 10 - max-wait: -1ms - min-idle: 0 - port: 6379 - password: Redis+brngJ3U19@8_Z2^7a - timeout: 10000 - -redisPool: - port: 6379 - host: 127.0.0.1 - dbs: 5,14,15 - password: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index b945a1d..592724d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,4 +1,4 @@ -#外网配置 +#本地和内网配置 mybatis: configuration: #开启控制台打印sql @@ -13,33 +13,16 @@ spring: autoconfigure: #去除durid配置 exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - #MySQL druid多数据源配置（纯粹多库） + #druid多数据源配置（纯粹多库） datasource: dynamic: datasource: - hrnew: - driver-class-name: com.mysql.cj.jdbc.Driver - password: kPMP6NafMsdccxDX - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://127.0.0.1:3306/hr_new?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: hr_new - tidbintranetappplatform: - driver-class-name: com.mysql.cj.jdbc.Driver - password: GJ8m6tXrSDL2SfA2 - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://127.0.0.1:3306/app_platform?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: app_platform - systemempower: - driver-class-name: com.mysql.cj.jdbc.Driver - password: NTYni4L2mfxk5zZZ - url: jdbc:mysql://127.0.0.1:3306/system_empower?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: system_empower - tidbintranetcustomerform: - driver-class-name: com.mysql.cj.jdbc.Driver - password: Mjh4msNtADGjiMaC - #url: jdbc:mysql://127.0.0.1:3306/hengxingaoke_tes?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - url: jdbc:mysql://127.0.0.1:3306/customer_form?allowPublicKeyRetrieval=true&uuseUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai&tinyInt1isBit=false - username: customer_form + syncplant: + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + password: Syncp1@nt + #url: jdbc:sqlserver://172.20.2.206:1433;databaseName=SyncPlant;encrypt=true;trustServerCertificate=true + url: jdbc:sqlserver://172.20.2.206:1433;databaseName=SyncPlant + username: sa #数据源基础配置 druid: # 通过connectProperties属性来打开mergeSql功能；慢SQL记录 @@ -62,26 +45,8 @@ spring: test-while-idle: true # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 time-between-eviction-runs-millis: 60000 - validation-query: 'SELECT 1 FROM DUAL ' + validation-query: 'SELECT 1' #指定默认数据源(必须配置) - primary: tidbintranetappplatform + primary: syncplant #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. strict: false - redis: - database: 5 - host: 127.0.0.1 - lettuce: - pool: - max-active: 10 - max-idle: 10 - max-wait: -1ms - min-idle: 0 - port: 6379 - #password: Redis+brngJ3U19@8_Z2^7a - timeout: 10000 - -redisPool: - port: 6379 - host: 127.0.0.1 - dbs: 5,14,15 - password: