FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update：福田生产环境配置

Browse Source
This commit is contained in:
2510220824
2022-01-14 15:28:24 +08:00
committed by zhaokaiyao@91isoft.com
parent fbb82976ad
commit f726ac195d
5 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java
+2 -2
View File
@@ -42,7 +42,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);
}
}
@@ -55,7 +55,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);
}
}
src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java
+3 -3
View File
@@ -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{
src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java
+3 -3
View File
@@ -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{
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+5 -5
View File
@@ -49,7 +49,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;
@@ -296,7 +296,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("SRMS");
head.setCOUNT("1");
head.setPASSWORD("TEST_oa201611241710");
head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>();
list.add(notifyTodoSendContext);
@@ -306,7 +306,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
Map<String,String> 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("操作成功")){
@@ -339,7 +339,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("SRMS");
head.setCOUNT("1");
head.setPASSWORD("TEST_oa201611241710");
head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
@@ -374,7 +374,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
Map<String,String> 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("操作成功")){
src/main/resources/application.yml
+12 -23
View File
@@ -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,12 +33,9 @@ spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://123.56.177.15:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
username: root
password: RsLDRj3dXtSwYjBI
# url: jdbc:mysql://127.0.0.1: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-关闭
@@ -52,7 +51,7 @@ spring:
listener:
direct:
# 默认加载 发版 需改为 true
auto-startup: false
auto-startup: true
simple:
concurrency: 5
max-concurrency: 10
@@ -66,7 +65,7 @@ spring:
#最大重试9次
max-attempts: 6
# 消费者默认加载 发版 需改为 true
auto-startup: false
auto-startup: true
# =============================================================================
# 邮箱配置-1
@@ -103,20 +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
buss:
edit:
file:
path: /data/slrs/file/
down:
file:
# path: https://srms.foton.com.cn/file/
path: http://foton.natapp1.cc/file/
isNotScheduled: true