From 1a131904968666965cc08cf399ac6f5fdc1895aa Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 14 二月 2025 12:26:42 +0800
Subject: [PATCH] 代码提交
---
.idea/jarRepositories.xml | 25 ++++++++++++
ruoyi-admin/src/main/resources/application-druid.yml | 46 ++++++++++++----------
ruoyi-admin/src/main/resources/application.yml | 4 +-
3 files changed, 52 insertions(+), 23 deletions(-)
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a0a4d37..59e3d38 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -2,6 +2,11 @@
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
+ <option name="id" value="aliyun" />
+ <option name="name" value="aliyun" />
+ <option name="url" value="https://maven.aliyun.com/repository/public/" />
+ </remote-repository>
+ <remote-repository>
<option name="id" value="central" />
<option name="name" value="Central Repository" />
<option name="url" value="https://repo.maven.apache.org/maven2" />
@@ -10,6 +15,11 @@
<option name="id" value="releases" />
<option name="name" value="local private nexus" />
<option name="url" value="http://122.49.30.5:8981/nexus/content/repositories/releases/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="group_migu" />
+ <option name="name" value="group_migu" />
+ <option name="url" value="https://maven.aliyun.com/repository/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="central" />
@@ -62,6 +72,21 @@
<option name="url" value="https://nexus.cmread.com:9343/nexus/content/repositories/migu" />
</remote-repository>
<remote-repository>
+ <option name="id" value="jcenter" />
+ <option name="name" value="jcenter" />
+ <option name="url" value="https://maven.aliyun.com/repository/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="public" />
+ <option name="name" value="aliyun nexus" />
+ <option name="url" value="https://maven.aliyun.com/repository/public/" />
+ </remote-repository>
+ <remote-repository>
+ <option name="id" value="maven_repos" />
+ <option name="name" value="maven_repos" />
+ <option name="url" value="https://maven.aliyun.com/repository/public/" />
+ </remote-repository>
+ <remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 9efdbba..91d9bc9 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -11,36 +11,40 @@
# username: root
# password: 123456
# 鍏徃
- url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # url: jdbc:mysql://192.168.2.9:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# 涓芥按
# url: jdbc:mysql://127.0.0.1:3308/smartor-lisui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: smartor
# password: Smartor.2023
# driverClassName: com.mysql.cj.jdbc.Driver
# 鏂板崕
- # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- username: smartor
- password: Smartor.2023
- driverClassName: com.mysql.cj.jdbc.Driver
+ # url: jdbc:mysql://192.168.191.181:3308/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ # username: smartor
+ # password: Smartor.2023
+ # driverClassName: com.mysql.cj.jdbc.Driver
+
# 鍏徃浜�
- # url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
- # username: hxsoft
- # password: Hxerp2000
- # driverClassName: com.mysql.cj.jdbc.Driver
+ url: jdbc:mysql://116.62.18.175:6002/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ username: hxsoft
+ password: Hxerp2000
+ driverClassName: com.mysql.cj.jdbc.Driver
+
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(鍏徃)
- # enabled: true
- # url: jdbc:sqlserver://116.62.18.175:6001;DatabaseName=iv-ywey;encrypt=false;SelectMethod=cursor
- # username: sa
- # password: Hxerp2000
- # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ # enabled: true
+ # url: jdbc:sqlserver://116.62.18.175:6001;DatabaseName=iv-ywey;encrypt=false;SelectMethod=cursor
+ # username: sa
+ # password: Hxerp2000
+ # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴(涔変箤浜岄櫌)
- enabled: true
- url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=IntelligentVoice;encrypt=false;SelectMethod=cursor
- username: sa
- password: sfxt#2023
- driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+ # enabled: true
+ # url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=IntelligentVoice;encrypt=false;SelectMethod=cursor
+ # username: sa
+ # password: sfxt#2023
+ # driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+
# 鍒濆杩炴帴鏁�
initialSize: 5
# 鏈�灏忚繛鎺ユ睜鏁伴噺
@@ -109,8 +113,8 @@
# websocket瓒呮椂鏃堕棿
server:
- websocket:
- timeout=60000:
+websocket:
+timeout=60000:
accessKeyId: LTAI5tPfc1VJzz7VuhzcBwug
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b87670d..097c8ae 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -72,9 +72,9 @@
# redis 閰嶇疆
redis:
# # 鍦板潃锛堜附姘达級
- host: 127.0.0.1
+ # host: 127.0.0.1
# 鍦板潃锛堝叕鍙革級
- #host: 116.62.18.175
+ host: 116.62.18.175
port: 6020
# 鏁版嵁搴撶储寮�
--
Gitblit v1.9.3