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
2021-10-20 15:58:14 +08:00
parent 6ffffcb80b
commit fa88ae7f6d
5 changed files with 25 additions and 24 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
@@ -28,7 +28,7 @@ public class CreateMQService {
if(oaFlag){ 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) { 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; private LawsUserInfoService lawsUserInfoService;
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
value = @Queue(value = "createMQDone_SQ_GSAR", durable = "true"), value = @Queue(value = "createMQDone_SQ_GSAR_RELEASE", durable = "true"),
exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"), exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
key = "sendDone-key_MQ_GSAR")) key = "sendDone-key_MQ_GSAR_RELEASE"))
public void createMQDone(NotifyTodoSendContext object, Message message, Channel channel) throws Exception{ public void createMQDone(NotifyTodoSendContext object, Message message, Channel channel) throws Exception{
try{ try{
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; private LawsUserInfoService lawsUserInfoService;
@RabbitListener(bindings = @QueueBinding( @RabbitListener(bindings = @QueueBinding(
value = @Queue(value = "createMQ_SQ_GSAR", durable = "true"), value = @Queue(value = "createMQ_SQ_GSAR_RELEASE", durable = "true"),
exchange = @Exchange(value = "send-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"), exchange = @Exchange(value = "send-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
key = "send-key_MQ_GSAR")) key = "send-key_MQ_GSAR_RELEASE"))
public void createMQ(BusProcessNew object, Message message, Channel channel) throws Exception{ public void createMQ(BusProcessNew object, Message message, Channel channel) throws Exception{
try{ try{
try{ try{
src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+5 -5
View File
@@ -48,7 +48,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
private String errMes = "异常信息:"; private String errMes = "异常信息:";
private String api_key = "OA"; private String api_key = "OA";
private String api_secret = "TEST_oa201611241710"; private String api_secret = "oa201611241710";
@Value("${webUrl}") @Value("${webUrl}")
private String webUrl; private String webUrl;
@@ -113,7 +113,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("FOTON"); head.setCONSUMER("FOTON");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("TEST_oa201611241710"); head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>(); List<Object> list = new ArrayList<>();
list.add(notifyTodoSendContext); list.add(notifyTodoSendContext);
@@ -123,7 +123,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
Map<String,String> mapCtr = new TreeMap<>(); Map<String,String> mapCtr = new TreeMap<>();
mapCtr.put("Authorization",credentials); mapCtr.put("Authorization",credentials);
log.info("处理完文件数据，开始请求发送已办接口数据：【"+sdf.format(new Date())+"】"); 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())+"】"); log.info("请求发送已办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
// JSONObject jsonObject = JSONObject.parseObject(result); // JSONObject jsonObject = JSONObject.parseObject(result);
if(!result.contains("操作成功")){ if(!result.contains("操作成功")){
@@ -156,7 +156,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
head.setBIZTRANSACTIONID("SYC_161320210206133219"); head.setBIZTRANSACTIONID("SYC_161320210206133219");
head.setCONSUMER("FOTON"); head.setCONSUMER("FOTON");
head.setCOUNT("1"); head.setCOUNT("1");
head.setPASSWORD("TEST_oa201611241710"); head.setPASSWORD("oa201611241710");
head.setSRVLEVEL("1"); head.setSRVLEVEL("1");
List<Object> list = new ArrayList<>(); List<Object> list = new ArrayList<>();
NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext(); NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
@@ -191,7 +191,7 @@ public class WebServiceOAServiceImpl implements WebServiceOAService {
Map<String,String> mapCtr = new TreeMap<>(); Map<String,String> mapCtr = new TreeMap<>();
mapCtr.put("Authorization",credentials); mapCtr.put("Authorization",credentials);
log.info("处理完文件数据，开始请求发送待办接口数据：【"+sdf.format(new Date())+"】"); 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())+"】"); log.info("请求发送待办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
// JSONObject jsonObject = JSONObject.parseObject(result); // JSONObject jsonObject = JSONObject.parseObject(result);
if(!result.contains("操作成功")){ if(!result.contains("操作成功")){
src/main/resources/application.yml
+12 -11
View File
@@ -1,7 +1,7 @@
wkfow: wkfow:
auth: fk-auth auth: fk-auth
server: server:
port: 17211 port: 4203
tomcat: tomcat:
uri-encoding: UTF-8 uri-encoding: UTF-8
servlet: servlet:
@@ -15,7 +15,9 @@ logging:
eureka: eureka:
client: client:
serviceUrl: serviceUrl:
defaultZone: http://62.234.136.153:8761/eureka/ defaultZone: http://10.100.5.117:4201/eureka/
instance:
prefer-ip-address: true
spring: spring:
application: application:
name: bat-wkflow name: bat-wkflow
@@ -31,9 +33,9 @@ spring:
datasource: datasource:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver 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 url: jdbc:mysql://10.100.5.111:3306/foton_bat_wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
username: root username: tempuser
password: root password: Fting&8g35g#geg2
activiti: activiti:
database-schema-update: true database-schema-update: true
# 自动部署验证设置:true-开启（默认）、false-关闭 # 自动部署验证设置:true-开启（默认）、false-关闭
@@ -49,7 +51,7 @@ spring:
listener: listener:
direct: direct:
# 默认加载 发版 需改为 true # 默认加载 发版 需改为 true
auto-startup: false auto-startup: true
simple: simple:
concurrency: 5 concurrency: 5
max-concurrency: 10 max-concurrency: 10
@@ -63,7 +65,7 @@ spring:
#最大重试9次 #最大重试9次
max-attempts: 6 max-attempts: 6
# 消费者默认加载 发版 需改为 true # 消费者默认加载 发版 需改为 true
auto-startup: false auto-startup: true
# ============================================================================= # =============================================================================
# 邮箱配置-1 # 邮箱配置-1
@@ -100,11 +102,10 @@ ribbon:
# 配置 是否 启用 OA # 配置 是否 启用 OA
oa: oa:
flag: false flag: true
# 配置前端服务全路径地址 如下 /#/ # 配置前端服务全路径地址 如下 /#/
webUrl: http://62.234.136.153:8038/#/ webUrl: https://slrs.foton.com.cn/#/
# OA 接受任务定时器是否启用 isNotScheduled: true
isNotScheduled: false