From 1245ae7874fd97c70ec6048f4d90ee70831d17ba Mon Sep 17 00:00:00 2001
From: PengOu <595466820@qq.com>
Date: 星期二, 30 一月 2024 10:59:25 +0800
Subject: [PATCH] Fix 推流列表-> 添加通道 报错: 错误: 字段 "gbStreamId" 不存在 ,改为:gb_stream_id 自测试通过

---
 src/main/resources/all-application.yml |   39 +++++++++++++++++++++++++--------------
 1 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/all-application.yml b/src/main/resources/all-application.yml
index 8af091d..afadb39 100644
--- a/src/main/resources/all-application.yml
+++ b/src/main/resources/all-application.yml
@@ -47,18 +47,29 @@
         #    username: root
         #    password: SYceshizu1234
         # mysql閰嶇疆
-        type: com.zaxxer.hikari.HikariDataSource
-        driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
-        username: root
-        password: root123
-        hikari:
-            connection-timeout: 20000             # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
-            initialSize: 50                       # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
-            maximum-pool-size: 200                # 杩炴帴姹犳渶澶ц繛鎺ユ暟
-            minimum-idle: 10                       # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
-            idle-timeout: 300000                  # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
-            max-lifetime: 1200000                 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
+        dynamic:
+            primary: master
+            datasource:
+                master:
+                    type: com.zaxxer.hikari.HikariDataSource
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://127.0.0.1:3306/wvp2?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true
+                    username: root
+                    password: root123
+                    hikari:
+                        connection-timeout: 20000             # 鏄鎴风绛夊緟杩炴帴姹犺繛鎺ョ殑鏈�澶ф绉掓暟
+                        initialSize: 50                       # 杩炴帴姹犲垵濮嬪寲杩炴帴鏁�
+                        maximum-pool-size: 200                # 杩炴帴姹犳渶澶ц繛鎺ユ暟
+                        minimum-idle: 10                       # 杩炴帴姹犳渶灏忕┖闂茶繛鎺ユ暟
+                        idle-timeout: 300000                  # 鍏佽杩炴帴鍦ㄨ繛鎺ユ睜涓┖闂茬殑鏈�闀挎椂闂达紙浠ユ绉掍负鍗曚綅锛�
+                        max-lifetime: 1200000                 # 鏄睜涓繛鎺ュ叧闂悗鐨勬渶闀跨敓鍛藉懆鏈燂紙浠ユ绉掍负鍗曚綅)
+                share:
+                    type: com.zaxxer.hikari.HikariDataSource
+                    driver-class-name: com.mysql.cj.jdbc.Driver
+                    url: jdbc:mysql://127.0.0.1:3306/wvp269_1?useUnicode=true&characterEncoding=UTF8&rewriteBatchedStatements=true&serverTimezone=PRC&useSSL=false&allowMultiQueries=true&allowPublicKeyRetrieval=true
+                    username: root
+                    password: 12345678
+
 
 
 # 淇敼鍒嗛〉鎻掍欢涓� postgresql锛� 鏁版嵁搴撶被鍨嬩负mysql涓嶉渶瑕�
@@ -167,9 +178,9 @@
     # 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
     record-assist-port: 0
 
-# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
+# [鍙�塢 鏃ュ織閰嶇疆, 濡傛灉涓嶉渶瑕佸湪jar澶栦慨鏀规棩蹇楀唴瀹归偅涔堝彲浠ヤ笉閰嶇疆姝ら」
 logging:
-    config: classpath:logback-spring-local.xml
+    config: classpath:logback-spring.xml
 
 # [鏍规嵁涓氬姟闇�姹傞厤缃甝
 user-settings:

--
Gitblit v1.8.0