From 0990d6a1dcb89d6b254ea0b8978553356b729f5e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 28 十月 2024 23:36:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application-pro.yml |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index e784d0e..2c51c37 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-##########################  涓婃捣鍢夊畾   ##########################
+##########################  骞夸笢娼槼   ##########################
 server:
   port: 8090
   jetty:
@@ -9,16 +9,16 @@
   datasource:
     #涓绘暟鎹簮
     primary:
-      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
-      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
       username: root
-      password: root
+      password: Abc123..
+      driver-class-name: com.mysql.jdbc.Driver
     #娆℃暟鎹簮
     secondary:
-      url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
-      driver-class-name: com.mysql.jdbc.Driver
+      url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
       username: root
-      password: root
+      password: Abc123..
+      driver-class-name: com.mysql.jdbc.Driver
   jpa:
     #涓籮pa閰嶇疆
     primary:
@@ -51,6 +51,7 @@
       timeout: 6000
 igds:
   default:
-    companyId: 5303
+    companyId: 5317
+
   file-path: D:/IGDS-API/FILE/
   img-path: D:/IGDS/FILE/
\ No newline at end of file

--
Gitblit v1.9.3