diff --git a/pom.xml b/pom.xml index 9ee875e..1a0b207 100644 --- a/pom.xml +++ b/pom.xml @@ -88,6 +88,15 @@ 19.18.0.0 runtime + + + com.microsoft.sqlserver + mssql-jdbc + 6.1.0.jre8 + runtime + + + cn.easyproject orai18n diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml index 6c8b862..952bb89 100644 --- a/src/main/resources/application-pro.yml +++ b/src/main/resources/application-pro.yml @@ -9,11 +9,6 @@ spring: username: root password: Glxp@6066 driver-class-name: com.mysql.cj.jdbc.Driver - njsql: - url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true - username: root - password: Glxp@6066 - driver-class-name: com.mysql.cj.jdbc.Driver ptxhSql: url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root diff --git a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml index 5eacba3..220f91d 100644 --- a/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml +++ b/src/main/resources/mybatis/mapper/other/dtxyy/DeviceBusinessProjectMapper.xml @@ -3,7 +3,7 @@