From dc734bbbea6dafd56b032e01ebba6ec183df31ac Mon Sep 17 00:00:00 2001
From: yangjun <yangjun_java1002@sina.com>
Date: Thu, 2 Nov 2023 02:38:21 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20admin/pom.xml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/pom.xml b/admin/pom.xml
index 547a9e8..b197005 100644
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -8,7 +8,7 @@
         <version>4.7.7</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <artifactId>admin</artifactId>
 
     <description>
@@ -115,7 +115,7 @@
                 <version>3.0.0</version>   
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
-                    <warName>ROOT</warName>
+                    <warName>${project.artifactId}</warName>
                 </configuration>   
             </plugin>   
             <!-- YUI Compressor (CSS/JS压缩) 

From 0926982c81481c87c2cc71caec30347b30e650f2 Mon Sep 17 00:00:00 2001
From: yangjun <yangjun_java1002@sina.com>
Date: Thu, 2 Nov 2023 02:41:28 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20admin/src/main/resourc?=
 =?UTF-8?q?es/application.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/admin/src/main/resources/application.yml b/admin/src/main/resources/application.yml
index 50084ab..4934d8f 100644
--- a/admin/src/main/resources/application.yml
+++ b/admin/src/main/resources/application.yml
@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 8011
+  port: 8082
   servlet:
     # 应用的访问路径
     context-path: /

From 6d1b5cb915f1631975e8f3ca57d63ca1ea4ed650 Mon Sep 17 00:00:00 2001
From: yangjun <yangjun_java1002@sina.com>
Date: Thu, 2 Nov 2023 02:41:49 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20admin/src/main/resourc?=
 =?UTF-8?q?es/application-druid.yml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/main/resources/application-druid.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/admin/src/main/resources/application-druid.yml b/admin/src/main/resources/application-druid.yml
index da07933..0dddb27 100644
--- a/admin/src/main/resources/application-druid.yml
+++ b/admin/src/main/resources/application-druid.yml
@@ -6,9 +6,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.0.199:3306/z_ry_flowable?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://103.229.214.97:6033/lggroup?serverTimezone=Asia/Shanghai&useSSL=false&allowPublicKeyRetrieval=true
                 username: root
-                password: iCaasARP@2020
+                password: kKM#0QC0AzyYnn5&
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭