Merge remote-tracking branch 'origin/dev' into dev

jeecg-module-system/pom.xml

@@ -65,10 +65,6 @@
             <properties>
                 <package.environment>dev</package.environment>
             </properties>
-            <!-- 是否默认 true表示默认-->
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
         </profile>
 
         <!-- 测试环境 -->
@@ -85,6 +81,10 @@
             <properties>
                 <package.environment>prod</package.environment>
             </properties>
+            <!-- 是否默认 true表示默认-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
         </profile>
     </profiles>
 

jeecg-module-system/src/main/resources/application-dev.yml

@@ -302,4 +302,4 @@ iam:
   postUserInfoUrl: http://47.110.134.43:15105/common-uuv/login/user/temp-code
   # 获取用户信息成功状态码
   getUserInfoSucceed: ok
-  defaultRoleCode: gcs
+  defaultRoleCode: GW_GCS

jeecg-module-system/src/main/resources/application-prod.yml

@@ -104,7 +104,7 @@ spring:
         loginPassword: alqw1w55+1234jkdf1234
         allow:
       web-stat-filter:
-        enabled: true
+        enabled: false
     dynamic:
       druid: # 全局druid参数，绝大部分值和默认保持一致。(现已支持的参数如下,不清楚含义不要乱设置)
         # 连接池的配置信息
@@ -131,14 +131,14 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://127.0.0.1:3306/hzgw_prod?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
+          url: jdbc:mysql://172.16.240.225:3306/hzgw?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&zeroDateTimeBehavior=convertToNull
           username: root
-          password: superAdmin&321
+          password: ABCD@abcd+1234
           driver-class-name: com.mysql.cj.jdbc.Driver
   #redis 配置
   redis:
-    database: 3
-    host: 127.0.0.1
+    database: 0
+    host: localhost
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -146,8 +146,8 @@ spring:
         max-wait: -1ms  #最大建立连接等待时间。如果超过此时间将接到异常。设为-1表示无限制。
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
-    password: 'redis@123'
-    port: 6773
+    password: 'ABCD@abcd+1234'
+    port: 6379
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:org/jeecg/modules/**/xml/*Mapper.xml
@@ -178,13 +178,13 @@ jeecg:
   uploadType: local
   # 前端访问地址
   domainUrl:
-    pc: http://localhost:3100
-    app: http://localhost:8051
+    pc: https://dtgwgd.mtros.cn:19908
+    app: https://dtgwgd.mtros.cn:19908
   path:
     #文件上传根目录 设置
-    upload: /opt/etc/file
+    upload: /opt/file
     #webapp文件路径
-    webapp: /opt/etc/file
+    webapp: /opt/file
   shiro:
     excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储和大鱼短信秘钥配置
@@ -200,7 +200,7 @@ jeecg:
     cluster-nodes: 81.70.47.128:9200
     check-enabled: false
   # 在线预览文件服务器地址配置
-  file-view-domain: http://47.94.207.62:18000
+  file-view-domain: https://dtgwgd.mtros.cn:19908
   # minio文件上传
   minio:
     minio_url: http://minio.jeecg.com
@@ -303,3 +303,10 @@ third-app:
       # appSecret
       client-secret: ??
       agent-id: ??
+
+# 统一身份证
+iam:
+  postUserInfoUrl: http://47.110.134.43:15105/common-uuv/login/user/temp-code
+  # 获取用户信息成功状态码
+  getUserInfoSucceed: ok
+  defaultRoleCode: GW_GCS
\ No newline at end of file

jeecg-module-system/src/main/resources/application-test.yml

@@ -308,3 +308,9 @@ third-app:
       # appSecret
       client-secret: ??
       agent-id: ??
+# 统一身份证
+iam:
+  postUserInfoUrl: http://47.110.134.43:15105/common-uuv/login/user/temp-code
+  # 获取用户信息成功状态码
+  getUserInfoSucceed: ok
+  defaultRoleCode: GW_GCS
\ No newline at end of file