Merge branch 'master' into 'fix_bug_first_stage'

# Conflicts:
#   jero-web/src/components/tools/UserMenu.vue
#   jero-web/src/permission.js

jero-boot/jero-boot-single-startup/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8008
+  port: 8013
   tomcat:
     max-swallow-size: -1
   error:
@@ -136,7 +136,7 @@ spring:
           #          password: 123456
           #          driver-class-name: com.mysql.cj.jdbc.Driver
           #          url: jdbc:mysql://10.10.10.44:3306/laws_weilai_test?useUnicode=true&characterEncoding=utf8&serverTimezone=Asia/Shanghai&useSSL=false
-          url: jdbc:mysql://121.36.69.172:3307/laws_weilai_zhn?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://10.132.162.58:3306/laws_weilai?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: hzwlsoft.com
           driver-class-name: com.mysql.cj.jdbc.Driver
@@ -152,7 +152,7 @@ spring:
     allow-bean-definition-overriding: true
   redis:
     database: 2
-    host: 121.36.69.172
+    host: 10.132.162.58
     lettuce:
       pool:
         max-active: 8   #最大连接数据库连接数,设 0 为没有限制
@@ -161,7 +161,7 @@ spring:
         min-idle: 0     #最小等待连接中的数量,设 0 为没有限制
       shutdown-timeout: 100ms
     password: 'hzwlsoft.com'
-    port: 4780
+    port: 6379
 #mybatis plus 设置
 mybatis-plus:
   mapper-locations: classpath*:com/jero/**/xml/*Mapper.xml
@@ -184,9 +184,9 @@ jero :
   uploadType: local
   path :
     #文件上传根目录 设置
-    upload: /data/DeploymentPackage/laws-weilai/upFiles
+    upload: /data/DeploymentPackage/upFiles
     #webapp文件路径
-    webapp: /data/DeploymentPackage/laws-weilai/webapp
+    webapp: /data/DeploymentPackage/webapp
   shiro:
     excludeUrls: /test/jeroDemo/demo3,/test/jeroDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**
   #阿里云oss存储配置
@@ -199,7 +199,7 @@ jero :
   # ElasticSearch 6设置
   elasticsearch:
     cluster-name: elasticsearch
-    cluster-nodes: 121.36.69.172:9200
+    cluster-nodes: 10.132.162.58:9200
     check-enabled: false
   # 表单设计器配置
   desform:
@@ -248,7 +248,7 @@ jero :
       data-type: yml
   #分布式锁配置
   redisson:
-    address: 127.0.0.1:4780
+    address: 10.132.162.58:6379
     password:
     type: STANDALONE
     enabled: true
@@ -301,7 +301,7 @@ OCR:
   #handleFileUrl: http://sws.trans-cosmos.com.cn/WebService.asmx/FileConversion
   handleFileUrl: http://61.136.1.103:8091/WebService.asmx/FileConversion
   # OCR回调接口地址 配置客户本地的IP及端口号
-  callBackUrl: http://139.9.235.66:8012/local-tool/ocr/ocrHandleResult
+  callBackUrl: http://10.132.130.150:8014/local-tool/ocr/ocrHandleResult
   # OCR认证用户
   userId: dayuzhou1234
   # OCR认证编码
@@ -311,7 +311,7 @@ OCR:
   # OCR文件存储路径
   ocrPath: /data/DeploymentPackage/laws_weilai/APPSOFT/LAWSOCRDEMO/OCRFILE/
   # OCR文件下载地址
-  ocrDownPath: http://139.9.235.66:9020/downfile/
+  ocrDownPath: http://139.9.235.66:8013/downfile/
   # OCR接口超时时间
   times: 20
   # OCR转换类型
@@ -359,6 +359,6 @@ Feishu:
   batchSendMessageUrl: https://open.feishu.cn/open-apis/message/v4/batch_send/
 # local-tool
 local-tool:
-  uri: http://139.9.235.66:8012
+  uri: http://10.132.130.150:8014
 opensso:
   redirectUri: http%3A%2F%2F139.9.235.66%3A8010