Merge remote-tracking branch 'origin/MVP1.5' into MVP1.5

180ab072 · huyuchen · 1aeea340 · f8f9ef51 · 180ab072
Commit 180ab072 authored Feb 07, 2023 by huyuchen
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

application-test.yml ...yifu-archives-biz/src/main/resources/application-test.yml +0 -1

No files found.
--- a/yifu-archives/yifu-archives-biz/src/main/resources/application-test.yml
+++ b/yifu-archives/yifu-archives-biz/src/main/resources/application-test.yml
@@ -9,7 +9,6 @@ spring:
    host: 192.168.1.65
    port: 22379
    password: '@yf_2017'
-    connect-timeout: 0
  datasource:
    type: com.zaxxer.hikari.HikariDataSource
    driver-class-name: com.mysql.cj.jdbc.Driver