diff --git a/.gitignore b/.gitignore index 549e00a..6869b1c 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ build/ ### VS Code ### .vscode/ +/logs/*.log diff --git a/config/application-local.properties b/config/application-local.properties index 4ff70ba..078a4f8 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -2,12 +2,17 @@ server.port=9276 server.servlet.context-path=/tunnel # mysql -spring.datasource.url=jdbc:mysql://101.35.234.160:32306/beidou?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\ - =convertToNull&useUnicode=true +spring.datasource.url=jdbc:mysql://101.35.234.160:32306/beidou?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior=convertToNull&useUnicode=true spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.username=cmhi spring.datasource.password=cmHi10086! +# SQL Server +#spring.datasource.url=jdbc:sqlserver://localhost:1433;database=BeiDouDataBase;integratedSecurity=true;encrypt=true;trustServerCertificate=true +#spring.datasource.driver-class-name=com.microsoft.sqlserver.jdbc.SQLServerDriver +#spring.datasource.username=sa +#spring.datasource.password=sa123456 + #spring.datasource.type=org.apache.commons.dbcp2.BasicDataSource spring.datasource.dbcp2.max-total=128 spring.datasource.dbcp2.max-wait-millis=10000 diff --git a/pom.xml b/pom.xml index 26601e0..5ba4735 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,11 @@ mapper-spring-boot-starter 4.2.3 + + com.microsoft.sqlserver + mssql-jdbc + 12.4.0.jre11 + diff --git a/src/main/resources/mssql-jdbc_auth-12.4.0.x64.dll b/src/main/resources/mssql-jdbc_auth-12.4.0.x64.dll new file mode 100644 index 0000000..2282824 Binary files /dev/null and b/src/main/resources/mssql-jdbc_auth-12.4.0.x64.dll differ