From fa88ae7f6d53f3de49eae6cdfbb4715fa480dee0 Mon Sep 17 00:00:00 2001 From: 2510220824 <2510220824@qq.com> Date: Wed, 20 Oct 2021 15:58:14 +0800 Subject: [PATCH 1/4] =?UTF-8?q?update=EF=BC=9A=E7=A6=8F=E7=94=B0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_mq/service/CreateMQService.java | 4 ++-- .../service/SendDoneMQService.java | 6 ++--- .../business_mq/service/SendMQService.java | 6 ++--- .../service/impl/WebServiceOAServiceImpl.java | 10 ++++---- src/main/resources/application.yml | 23 ++++++++++--------- 5 files changed, 25 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java index f5df0403..9d5599f4 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java @@ -28,7 +28,7 @@ public class CreateMQService { if(oaFlag){ //发送消息队列 - this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR", "sendDone-key_MQ_GSAR", object); + this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR_RELEASE", "sendDone-key_MQ_GSAR_RELEASE", object); } } @@ -41,7 +41,7 @@ public class CreateMQService { if(oaFlag) { //发送消息队列 - this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR", "send-key_MQ_GSAR", object); + this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR_RELEASE", "send-key_MQ_GSAR_RELEASE", object); } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java index aa16152b..59cabdfc 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java @@ -50,9 +50,9 @@ public class SendDoneMQService { private LawsUserInfoService lawsUserInfoService; @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createMQDone_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "sendDone-key_MQ_GSAR")) + value = @Queue(value = "createMQDone_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "sendDone-key_MQ_GSAR_RELEASE")) public void createMQDone(NotifyTodoSendContext object, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java index 46eaff1b..1333bc26 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java @@ -56,9 +56,9 @@ public class SendMQService { private LawsUserInfoService lawsUserInfoService; @RabbitListener(bindings = @QueueBinding( - value = @Queue(value = "createMQ_SQ_GSAR", durable = "true"), - exchange = @Exchange(value = "send-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"), - key = "send-key_MQ_GSAR")) + value = @Queue(value = "createMQ_SQ_GSAR_RELEASE", durable = "true"), + exchange = @Exchange(value = "send-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"), + key = "send-key_MQ_GSAR_RELEASE")) public void createMQ(BusProcessNew object, Message message, Channel channel) throws Exception{ try{ try{ diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java index e92bd717..97a3c95d 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java @@ -48,7 +48,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { private String errMes = "异常信息:"; private String api_key = "OA"; - private String api_secret = "TEST_oa201611241710"; + private String api_secret = "oa201611241710"; @Value("${webUrl}") private String webUrl; @@ -113,7 +113,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("FOTON"); head.setCOUNT("1"); - head.setPASSWORD("TEST_oa201611241710"); + head.setPASSWORD("oa201611241710"); head.setSRVLEVEL("1"); List list = new ArrayList<>(); list.add(notifyTodoSendContext); @@ -123,7 +123,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { Map mapCtr = new TreeMap<>(); mapCtr.put("Authorization",credentials); log.info("处理完文件数据，开始请求发送已办接口数据：【"+sdf.format(new Date())+"】"); - result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1021_SendNotifyTodo_PS",json.toString(),mapCtr); + result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1021_SendNotifyTodo_PS",json.toString(),mapCtr); log.info("请求发送已办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); // JSONObject jsonObject = JSONObject.parseObject(result); if(!result.contains("操作成功")){ @@ -156,7 +156,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setCONSUMER("FOTON"); head.setCOUNT("1"); - head.setPASSWORD("TEST_oa201611241710"); + head.setPASSWORD("oa201611241710"); head.setSRVLEVEL("1"); List list = new ArrayList<>(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); @@ -191,7 +191,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService { Map mapCtr = new TreeMap<>(); mapCtr.put("Authorization",credentials); log.info("处理完文件数据，开始请求发送待办接口数据：【"+sdf.format(new Date())+"】"); - result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1019_SendTodo_PS",json.toString(),mapCtr); + result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1019_SendTodo_PS",json.toString(),mapCtr); log.info("请求发送待办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】"); // JSONObject jsonObject = JSONObject.parseObject(result); if(!result.contains("操作成功")){ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e0d2bdf9..7c860204 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,7 +1,7 @@ wkfow: auth: fk-auth server: - port: 17211 + port: 4203 tomcat: uri-encoding: UTF-8 servlet: @@ -15,7 +15,9 @@ logging: eureka: client: serviceUrl: - defaultZone: http://62.234.136.153:8761/eureka/ + defaultZone: http://10.100.5.117:4201/eureka/ + instance: + prefer-ip-address: true spring: application: name: bat-wkflow @@ -31,9 +33,9 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://39.100.23.127:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8 - username: root - password: root + url: jdbc:mysql://10.100.5.111:3306/foton_bat_wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8 + username: tempuser + password: Fting&8g35g#geg2 activiti: database-schema-update: true # 自动部署验证设置:true-开启（默认）、false-关闭 @@ -49,7 +51,7 @@ spring: listener: direct: # 默认加载 发版 需改为 true - auto-startup: false + auto-startup: true simple: concurrency: 5 max-concurrency: 10 @@ -63,7 +65,7 @@ spring: #最大重试9次 max-attempts: 6 # 消费者默认加载 发版 需改为 true - auto-startup: false + auto-startup: true # ============================================================================= # 邮箱配置-1 @@ -100,11 +102,10 @@ ribbon: # 配置 是否 启用 OA oa: - flag: false + flag: true # 配置前端服务全路径地址 如下 /#/ -webUrl: http://62.234.136.153:8038/#/ +webUrl: https://slrs.foton.com.cn/#/ -# OA 接受任务定时器是否启用 -isNotScheduled: false +isNotScheduled: true From 291fffd144169f145dff5c671ea581572e8d7bed Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Tue, 16 Nov 2021 14:03:37 +0800 Subject: [PATCH 2/4] feat: There is no way the --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7c860204..56ff708e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -105,7 +105,7 @@ oa: flag: true # 配置前端服务全路径地址 如下 /#/ -webUrl: https://slrs.foton.com.cn/#/ +webUrl: https://srms.foton.com.cn/#/ isNotScheduled: true From 7d5e6b6fa420f0ac01557b9a00d25565abb535b1 Mon Sep 17 00:00:00 2001 From: Superman_Main <396572590@qq.com> Date: Sun, 21 Nov 2021 09:22:01 +0800 Subject: [PATCH 3/4] feat: There is no way the --- src/main/resources/application.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 56ff708e..a75a413b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -44,10 +44,10 @@ spring: active: dev # 相关服务配置同业务系统 rabbitmq: - host: 62.234.136.153 + host: 10.100.5.119 port: 5672 - username: guest - password: guest + username: admin + password: foton@admin listener: direct: # 默认加载 发版 需改为 true From 70878668c87bf3cc0c2bfea19db3e2801ea4a583 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Tue, 14 Dec 2021 21:46:24 +0800 Subject: [PATCH 4/4] feat: There is no way the --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f14ce98b..843c8366 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -115,6 +115,6 @@ buss: path: /data/slrs/file/ down: file: -# path: https://srms.foton.com.cn/file/ - path: http://foton.natapp1.cc/file/ + path: https://srms.foton.com.cn/file/ +# path: http://foton.natapp1.cc/file/