From 65674d65f5795d52f69f4f5729c5eb76cf595f47 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 03 六月 2025 14:53:44 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/pom.xml | 26 +++++++++++++-------------
ruoyi-admin/src/main/resources/application-druid.yml | 6 +++---
ruoyi-admin/src/main/resources/application.yml | 14 +++++++-------
3 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index fec7ab2..a13774e 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -8,9 +8,9 @@
<version>3.7.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
-<!-- <packaging>war</packaging>-->
+ <!-- <packaging>war</packaging>-->
<packaging>jar</packaging>
- <artifactId>ruoyi-admin</artifactId>
+ <artifactId>opo-admin</artifactId>
<description>
web鏈嶅姟鍏ュ彛
@@ -45,7 +45,7 @@
<version>3.0.3</version>
</dependency>
- <!-- Mysql椹卞姩鍖� -->
+ <!-- Mysql椹卞姩鍖� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -81,9 +81,9 @@
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.12</version>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.12</version>
</dependency>
<dependency>
@@ -116,17 +116,17 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>3.1.0</version>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.1.0</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<warName>${project.artifactId}</warName>
- </configuration>
- </plugin>
+ </configuration>
+ </plugin>
</plugins>
<finalName>${project.artifactId}</finalName>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/ruoyi-admin/src/main/resources/application-druid.yml b/ruoyi-admin/src/main/resources/application-druid.yml
index 65cde81..e7e3ad8 100644
--- a/ruoyi-admin/src/main/resources/application-druid.yml
+++ b/ruoyi-admin/src/main/resources/application-druid.yml
@@ -6,12 +6,12 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
-# # 鍖婚櫌鐜
+ # 鍖婚櫌鐜
# url: jdbc:mysql://129.88.242.37:3308/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: JQ
# password: Jqserver88
- # 寮�鍙戠幆澧�
+# # 寮�鍙戠幆澧�
url: jdbc:mysql://116.62.18.175:6002/opo?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
username: opo
password: opo@2022
@@ -62,4 +62,4 @@
merge-sql: true
wall:
config:
- multi-statement-allow: true
\ No newline at end of file
+ multi-statement-allow: true
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 5c820bf..e81d51f 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -149,12 +149,12 @@
urlPatterns: /system/*,/monitor/*,/tool/*
-##閽夐拤鐨勫瘑閽ワ紙鍏徃锛�
-agentId: 1779052814
-dingAppid: dingn8iip5ubj7clrrsv
-dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
+###閽夐拤鐨勫瘑閽ワ紙鍏徃锛�
+#agentId: 1779052814
+#dingAppid: dingn8iip5ubj7clrrsv
+#dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD
#閽夐拤鐨勫瘑閽ワ紙鐪佷汉姘戯級
-#agentId: 2975938892
-#dingAppid: dingbxgfddodocmtqqsu
-#dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
+agentId: 2975938892
+dingAppid: dingbxgfddodocmtqqsu
+dingAppSecret: sw1NDcgErqWqkaWVo4DPck9EagJ-2yihYNxmhOjXo_F9E6X_-6Cl3LAybqAPt9gi
--
Gitblit v1.9.3