From cde16e4d86afb08896a8eeaea8f22cf6f5a94aa5 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 04 十二月 2023 10:25:33 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-admin/src/main/resources/application-druid.yml |   38 ++++++++++++++++++++++++++++++++++++--
 1 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 5f4187d..5f45c63 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,6 +6,9 @@
     druid:
       # 涓诲簱鏁版嵁婧�
       master:
+#        url: jdbc:mysql://127.0.0.1:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        #        username: root
+        #        password: 123456
         url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: hxsoft
         password: Hxerp2000
@@ -55,5 +58,36 @@
         wall:
           config:
             multi-statement-allow: true
-  appid : wxf50c5c72265188eb
-  appSecret : 7ab0a81392a96b157efa1df00f9cd939
\ No newline at end of file
+
+magic-api:
+  web: /magic/web
+  resource:
+    type: database   # 閰嶇疆瀛樺偍鍦ㄦ暟鎹簱涓�
+    tableName: magic_config  # 鏁版嵁搴撲腑鐨勮〃鍚�
+    prefix: /api
+    readonly: false
+  sql-column-case: camel
+  show-sql: true #閰嶇疆鎵撳嵃SQL
+  page-config:
+    size: size
+    page: page
+    default-page: 1
+    default-size: 10
+
+  #寰俊鍏紬鍙风殑瀵嗛挜
+appid: wx1c5243d2337753f4
+appSecret: 84a2186a0d175e88345267c716516cd3
+
+#閽夐拤鐨勫瘑閽�
+dingAppid: dingn8iip5ubj7clrrsv
+dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+
+# websocket瓒呮椂鏃堕棿
+server:
+  websocket:
+    timeout=60000:
+
+
+accessKeyId: LTAI4G5zjJRkun2eRdzU8GhR
+accessKeySecret: 6EIRr9uZeRobvHBRqskyGwjTLKpHYv
+signName: 鏉窞鍒╂箹绉戞妧
\ No newline at end of file

--
Gitblit v1.9.3