清单 流程回退

adc-da-activiti/src/main/java/com/adc/da/common/ActDefineStartMap.java

@@ -27,9 +27,9 @@ public class ActDefineStartMap {
         map.put("10","itemlistvalidationprocessKey");
 
         //张超然
-        map.put("11","StandardApplyMeetProcess");
+        map.put("20","StandardApplyMeetProcess");
-        map.put("12","StandardMeetProcess");
+        map.put("21","StandardMeetProcess");
-        map.put("13","StandardAfterMeetProcess");
+        map.put("22","StandardAfterMeetProcess");
 
         //李奥
         map.put("14","ParticipateRevisionFiling");

adc-da-main/src/main/resources/application-dev.properties

@@ -3,9 +3,10 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://10.100.5.111:3306/foton_slrs?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
-spring.datasource.username = tempuser
+#spring.datasource.url = jdbc:mysql://10.96.10.54/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
-spring.datasource.password = Fting&8g35g#geg2
+spring.datasource.username = root
+spring.datasource.password = root
 
 
 
@@ -15,10 +16,10 @@ spring.application.name=FotonLAWSSystem
 application.code=20200101
 application.center=1
 #==============================================
-#Eureka
+#Eruept
 eureka.client.allow-redirects=true
 eureka.client.register-with-eureka=true
-eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
+eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
 
 #==============================================
 # 邮箱配置1
@@ -34,18 +35,22 @@ spring.mail.properties.smtp.starttls.required=false
 spring.mail.properties.mail.smtp.ssl.enable=false
 spring.mail.port=587
 
-#==============================================
+# ==============================================
-# MQ配置
+# rabbitMQ
-#==============================================
+# ==============================================
-spring.rabbitmq.host=10.100.5.119
+#spring.rabbitmq.host=10.2.186.93
+#spring.rabbitmq.port=5672
+#spring.rabbitmq.username=ca
+#spring.rabbitmq.password=cs986432
+spring.rabbitmq.host=62.234.118.181
 spring.rabbitmq.port=5672
 spring.rabbitmq.username=admin
-spring.rabbitmq.password=foton@admin
+spring.rabbitmq.password=admin
 spring.rabbitmq.listener.simple.acknowledge-mode= manual
 # 生产者 默认关闭 发版 需改为 true
-spring.rabbitmq.listener.direct.auto-startup=true
+spring.rabbitmq.listener.direct.auto-startup=false
 # 消费者 默认关闭 发版 需改为 true
-spring.rabbitmq.listener.simple.auto-startup=true
+spring.rabbitmq.listener.simple.auto-startup=false
 #消费失败消息干掉
 spring.rabbitmq.listener.simple.default-requeue-rejected= true
 #5秒
@@ -53,22 +58,21 @@ spring.rabbitmq.listener.simple.retry.initial-interval= 5000
 spring.rabbitmq.listener.simple.retry.enabled= true
 #最大重试5次
 spring.rabbitmq.listener.simple.retry.max-attempts= 5
-# ==============================================
 # 文档存储路径指向
 # ==============================================
-file.path=/data/slrs/file
+file.path=/usr/laws/file/
 
 # 云端OCR识别集成配置参数
 #OCR请求识别URL地址
 OCR.handleFileUrl = http://61.136.1.103:8091/WebService.asmx/FileConversion
 # OCR回调接口地址 配置客户本地的IP及端口号
-OCR.callBackUrl = https://slrs.foton.com.cn/api/ocr/OCRRestful/OcrHandleResult
+OCR.callBackUrl = http://62.234.136.153:8033/api/ocr/OCRRestful/OcrHandleResult
 OCR.userId =dayuzhou1234
 OCR.authCode =123456
 OCR.publicKey =EC4KKA6ZDTCPAOCRBC5M
 # OCR文件存储路径
-OCR.ocrPath=/data/slrs/ocrResultFile
+OCR.ocrPath=/opt/foton-slrs/front/dist/file/
 # OCR文件请求下载或在线预览时URL
-OCR.ocrDownPath=/data/slrs/ocrResultFile
+OCR.ocrDownPath=http://62.234.136.153:8038/file/
 OCR.times=20
 OCR.convertType=BOTH

adc-da-main/src/main/resources/application.properties

@@ -9,12 +9,12 @@ spring.profiles.active=dev
 server.compression.enabled=true
 server.compression.mime-types=application/json,application/xml,text/html,text/plain,text/css,application/x-javascript
 # 端口号设置
-server.port=4202
+server.port=9999
 #主服务session超时
 server.servlet.session.timeout =600
 
 #tomcat /resource/local/version-manager 创建tomcat指定临时目录
-server.tomcat.basedir=/data/slrs/temp
+server.tomcat.basedir=/resource/local/version-manager
 
 # http-only
 server.session.cookie.http-only=true
@@ -30,14 +30,20 @@ logging.level.org.springframework=info
 
 # 请求前缀
 restPath=/api
+#server.servlet.context-path=/api
 
 #是否将自己注册到Eureka Server上，默认为true
 eureka.client.register-with-eureka=true
 ##是否从Eureka Server上获取注册信息，默认为true
 eureka.client.fetch-registry=true
-eureka.instance.prefer-ip-address=true
 
-eureka.client.service-url.defaultZone=http://10.100.5.117:4201/eureka/
+
+#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
+#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
+#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
+
+eureka.client.service-url.defaultZone=http://62.234.136.153:8761/eureka/
+#eureka.client.service-url.defaultZone=http://10.96.10.171:8761/eureka/
 
 # 请求连接的超时时间 默认的时间为 1 秒
 ribbon.ConnectTimeout=500000
@@ -131,9 +137,9 @@ verifyCodeMode=1
 # 文件上传管控及配置
 # =============================================================================
 # file模块上传文件的服务器地址
-file.path=/data/slrs/file
+file.path=D:/uploadfile/bus
-# 文件下载地址参数(弃用)
+# 文件下载地址参数
-file.downloadUrl=
+file.downloadUrl=http://39.98.140.126:10001/uploadPath
 #上传文件白名单-以,分隔
 upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt
 
@@ -141,13 +147,14 @@ upload.file.white.lists = doc,docx,xls,xlsx,pdf,PDF,png,jpg,pptx,ppt
 # elasticsearch 配置
 # =============================================================================
 elasticsearch.clustername=elasticsearch
-elasticsearch.ip=10.100.5.122
+elasticsearch.ip=172.17.0.1
 elasticsearch.port=9300
 elasticsearch.poolSize=5
 elas.flag=true
 
 #  文档转换TCP通讯地址
 convert.host=127.0.0.1
+#convert.host=0.0.0.0
 
 # =============================================================================
 # scheduled 配置