Merge remote-tracking branch 'origin/master'

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压缩) 

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:
                 # 从数据源开关/默认关闭

admin/src/main/resources/application.yml

@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 8011
+  port: 8082
   servlet:
     # 应用的访问路径
     context-path: /