From 84a38ed58fa4da6d3ece263530f2ba99862c033c Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 18 Jun 2024 19:32:45 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BA=93=E3=80=81?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../depository/TextLibraryController.java | 6 +++ .../impl/TextLibraryServiceImpl.java | 12 ++++- .../depository/TextLibraryMapper.xml | 46 +++++++++++++++++-- 3 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java index d3b81c71..9e2f0bf5 100644 --- a/src/main/java/com/zcloud/controller/depository/TextLibraryController.java +++ b/src/main/java/com/zcloud/controller/depository/TextLibraryController.java @@ -108,6 +108,7 @@ public class TextLibraryController extends BaseController { } if (StringUtils.isEmpty(pd.getString("CORPINFO_ID")))pd.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID()); + if ("3".equals(pd.getString("ASSOCIATION"))) { pd.put("TYPE_ONE", "43ed4012090d4614bb35da60d06c8264"); pd.put("plan",pd.getString("CATEGORY_ID")); @@ -124,6 +125,11 @@ public class TextLibraryController extends BaseController { } pd.put("STATUS","1"); + // 标准规范库特殊处理 + if ("~".equals(pd.getString("CORPINFO_ID"))) { + pd.put("CORPINFO_ID", null); + pd.put("STATUS", null); + } page.setPd(pd); List varList = textlibraryService.list(page); diff --git a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java index 424b9a73..2459a739 100644 --- a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java @@ -54,6 +54,10 @@ public class TextLibraryServiceImpl implements TextLibraryService { @Value("${heBeiQinAnFile}") private String heBeiQinAnFile; + @Value("${biaoZhunShuJuKu}") + private String biaoZhunShuJuKu; + + /** * 新增 * @@ -107,8 +111,12 @@ public class TextLibraryServiceImpl implements TextLibraryService { } // 如果是迁移数据就用河北秦安的路径 for (PageData entity : list) { - if(!"1".equals(entity.getString("MIGRATION_FLAG"))){ - entity.put("PATH",heBeiQinAnFile + entity.getString("PATH")); + String url = entity.getString("PATH"); + if (!"1".equals(entity.getString("MIGRATION_FLAG"))) { + entity.put("PATH", heBeiQinAnFile + url); + } + if ("2".equals(entity.getString("MIGRATION_FLAG"))) { + entity.put("PATH", biaoZhunShuJuKu + url); } } return list; diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml index 90e65317..17b893e5 100644 --- a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml +++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml @@ -32,7 +32,14 @@ f.STATUS, f.BUS_TEXT_LIBRARY_ID, f.MIGRATION_FLAG, - f.CORPINFO_ID + f.CORPINFO_ID, + f.CODE_NAME, + f.PUBLISHES, + f.TEXT_NAME, + f.PUBLICATION_DATE, + f.IMPLEMENTATION_DATE, + f.TYPE_TWO, + f.TYPE_TWO_NAME @@ -54,8 +61,15 @@ ASSOCIATION, STATUS, BUS_TEXT_LIBRARY_ID, + MIGRATION_FLAG, CORPINFO_ID, - MIGRATION_FLAG + CODE_NAME, + PUBLISHES, + TEXT_NAME, + PUBLICATION_DATE, + IMPLEMENTATION_DATE, + TYPE_TWO, + TYPE_TWO_NAME @@ -77,8 +91,15 @@ #{ASSOCIATION}, #{STATUS}, #{BUS_TEXT_LIBRARY_ID}, + #{MIGRATION_FLAG}, #{CORPINFO_ID}, - #{MIGRATION_FLAG} + #{CODE_NAME}, + #{PUBLISHES}, + #{TEXT_NAME}, + #{PUBLICATION_DATE}, + #{IMPLEMENTATION_DATE}, + #{TYPE_TWO}, + #{TYPE_TWO_NAME} @@ -124,6 +145,13 @@ STATUS = #{STATUS}, CORPINFO_ID = #{CORPINFO_ID}, MIGRATION_FLAG = #{MIGRATION_FLAG}, + CODE_NAME = #{CODE_NAME}, + PUBLISHES = #{PUBLISHES}, + TEXT_NAME = #{TEXT_NAME}, + PUBLICATION_DATE = #{PUBLICATION_DATE}, + IMPLEMENTATION_DATE = #{IMPLEMENTATION_DATE}, + TYPE_TWO = #{TYPE_TWO}, + TYPE_TWO_NAME = #{TYPE_TWO_NAME}, BUS_TEXT_LIBRARY_ID = BUS_TEXT_LIBRARY_ID where BUS_TEXT_LIBRARY_ID = #{BUS_TEXT_LIBRARY_ID} @@ -152,6 +180,9 @@ and f.REMARKS LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%') + + and (f.TYPE_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORD}),'%') or f.TYPE_TWO_NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORD}),'%')) + and exists(select 1 from bus_library_labels b where b.BUS_TEXT_LIBRARY_ID = f.BUS_TEXT_LIBRARY_ID and b.BUS_LABEL_FACTORY_ID in @@ -184,6 +215,15 @@ and (f.MIGRATION_FLAG = '0' or f.MIGRATION_FLAG is null) + + and f.TYPE = #{pd.TYPE} + + + and f.TYPE_TWO like CONCAT('%' #{pd.TYPE_TWO}, '%') + + + and f.TEXT_NAME like CONCAT('%' #{pd.TEXT_NAME}, '%') + order by f.ISTOPTIME desc,f.CREATED_TIME desc From 22b0f9233d26bb81bcd5d55210b0a32a9a022249 Mon Sep 17 00:00:00 2001 From: liujun Date: Tue, 18 Jun 2024 19:35:20 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=BA=93=E3=80=81?= =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-master.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index fb62718f..2eacb8de 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -100,6 +100,7 @@ http.file.url=http://192.168.192.201:8991/file/ #河北秦安文件服务器前缀 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile +biaoZhunShuJuKu=https://file.zcloudchina.com/ liteflow.rule-source=flow.xml liteflow.print-execution-log=false From 6d9a283accb86c067960b7a1ea604e88930ec042 Mon Sep 17 00:00:00 2001 From: liujun Date: Thu, 20 Jun 2024 16:14:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/xgf/impl/XgfUserServiceImpl.java | 47 +++++++------------ 1 file changed, 17 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java index 4fd0fa17..f2408266 100644 --- a/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java +++ b/src/main/java/com/zcloud/service/xgf/impl/XgfUserServiceImpl.java @@ -992,37 +992,24 @@ public class XgfUserServiceImpl implements XgfUserService { @Override public void repulse(PageData flows, XgfFlowDto info) throws Exception { - // add by liu jun 相关方可指定打回至指定节点 -1 为默认打回至相关方端 - if ("-1".equals(info.getBACK_STEP())){ - PageData condition = new PageData(); - condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); - PageData entity = xgfUserMapper.findById(condition); - entity.put("STATUS", "0"); - entity.put("VALID_FLAG", "0"); - entity.put("CHECK_STATUS", "-2"); - PageData key = new PageData(); - key.putAll(entity); - key.put("USER_ID", condition.get("XGF_USER_ID")); - key.put("STATUS", "1"); - key.put("OPINION", flows.get("OPINION")); - Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); - if (result == null || !"succeed".equals(result.get("result"))) { - throw new RuntimeException("请求失败"); - } - xgfUserMapper.edit(entity); - this.clearInfo(flows); - xgfFlowsMapper.edit(flows); - } else { - // 1、判断不能自己打回到自己 - PageData condition = new PageData(); - condition.put("FLOWS_ID",flows.getString("FLOWS_ID")); - PageData flowEntity = xgfFlowsMapper.findById(condition); - if (flowEntity != null && flowEntity.size() > 0 && flowEntity.getString("FLOWS_STEP").equals(info.getBACK_STEP())){ - throw new RuntimeException("不能自己打回到自己"); - } - flowEntity.put("FLOWS_STEP", info.getBACK_STEP()); - xgfFlowsMapper.edit(flowEntity); + PageData condition = new PageData(); + condition.put("XGF_USER_ID", flows.getString("FLOWS_ID")); + PageData entity = xgfUserMapper.findById(condition); + entity.put("STATUS", "0"); + entity.put("VALID_FLAG", "0"); + entity.put("CHECK_STATUS", "-2"); + PageData key = new PageData(); + key.putAll(entity); + key.put("USER_ID", condition.get("XGF_USER_ID")); + key.put("STATUS", "1"); + key.put("OPINION", flows.get("OPINION")); + Map result = HttpClientService.doPost(prevention_xgf_url + "openApi/user/approve", key); + if (result == null || !"succeed".equals(result.get("result"))) { + throw new RuntimeException("请求失败"); } + xgfUserMapper.edit(entity); + this.clearInfo(flows); + xgfFlowsMapper.edit(flows); } @Override From 8e387202629cac05ee488e3cd637e9dab5b311db Mon Sep 17 00:00:00 2001 From: water_xu Date: Tue, 25 Jun 2024 17:18:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?bug-15522=20=E9=9A=90=E6=82=A3=E5=A4=84?= =?UTF-8?q?=E7=BD=9A=E7=AE=A1=E7=90=86=20=E4=B8=8D=E6=98=BE=E7=A4=BAai?= =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E7=9A=84=E9=9A=90=E6=82=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dsno2/keyProjects/OutSourcedMapper.xml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml index 5e2d3e6d..7a9f668a 100644 --- a/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml +++ b/src/main/resources/mybatis/dsno2/keyProjects/OutSourcedMapper.xml @@ -304,7 +304,7 @@ vua.NAME OUTSOURCED_CREATOR_NAME, ifnull(vac.CORP_NAME,'秦港股份有限公司') CORP_NAME, p.`NAME` as UNITS_PIC_NAME, - ifnull(h.HIDDEN_COUNT,0) HIDDEN_COUNT + ifnull(h.HIDDEN_COUNT,0) + ifnull(hai.AI_COUNT ,0) HIDDEN_COUNT from f left join bus_units b using (UNITS_ID) @@ -335,9 +335,24 @@ ) t group by t.OUTSOURCED_ID,t.CREATOR ) uncheck on uncheck.OUTSOURCED_ID = f.OUTSOURCED_ID and uncheck.CREATOR = #{pd.UserId} - left join ( SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR - FROM - ( SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* FROM `qa-gwj-prevention`.bus_keyproject_hidden h LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0') t GROUP BY t.OUTSOURCED_ID,t.CREATOR ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( + SELECT t.OUTSOURCED_ID, COUNT( t.HIDDEN_ID ) HIDDEN_COUNT, t.SOURCE SOURCE, t.CREATOR CREATOR + FROM + ( + SELECT IFNULL( k.OUTSOURCED_ID, h.FOREIGN_ID ) OUTSOURCED_ID, h.* + FROM `qa-gwj-prevention`.bus_keyproject_hidden h + LEFT JOIN `qa-gwj-prevention`.bus_keyprojectcheck k ON h.FOREIGN_ID = k.KEYPROJECTCHECK_ID and h.ISDELETE = '0' + ) t + GROUP BY t.OUTSOURCED_ID,t.CREATOR + ) h on h.OUTSOURCED_ID = f.OUTSOURCED_ID + left join ( + select vm.OUTSOURCED_ID ,COUNT(1) AI_COUNT + from `qa-gwj-regulatory`.bus_videomanager vm + left join `qa-gwj-regulatory`.bus_aiwarning ai on ai.VIDEOMANAGER_ID = vm.VIDEOMANAGER_ID and vm.ISDELETE = '0' + left join `qa-gwj-regulatory`.bus_aiwarning_hiddens ah on ai.AIWARNING_ID = ah.AIWARNING_ID + left join `qa-gwj-prevention`.bus_keyproject_hidden h on ah.HIDDEN_ID = h.HIDDEN_ID + where h.ISDELETE = '0' and h.SOURCE = '1' + ) hai on hai.OUTSOURCED_ID = f.OUTSOURCED_ID where f.ISDELETE = '0' and From 6b90c0f662cff9ae91ff14d43d1b46a28984f494 Mon Sep 17 00:00:00 2001 From: songwenxuan <1924103812@qq.com> Date: Wed, 26 Jun 2024 14:00:18 +0800 Subject: [PATCH 5/5] =?UTF-8?q?626=E7=9B=B8=E5=85=B3=E6=96=B9=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zcloud/aspect/DockingAspect.java | 29 +++++++++++++- src/main/java/com/zcloud/dto/TenCorpDto.java | 8 ++++ .../mq/impl/DockSendMessageServiceImpl.java | 29 +++++++++++++- .../resources/application-local.properties | 38 +++++++++++++++---- src/main/resources/application.properties | 4 +- 5 files changed, 94 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/zcloud/aspect/DockingAspect.java b/src/main/java/com/zcloud/aspect/DockingAspect.java index 171a8ee9..5c520a6e 100644 --- a/src/main/java/com/zcloud/aspect/DockingAspect.java +++ b/src/main/java/com/zcloud/aspect/DockingAspect.java @@ -32,6 +32,13 @@ import java.util.Map; public class DockingAspect { @Autowired private DockSendMessageService sendMessageService; + @Value("${mq.csy.data.topic}") + private String csyDataDocking; + + @Value("${mq.cmt.data.topic}") + private String cmtDataDocking; + @Value("${mq.czks.data.topic}") + private String czksDataDocking; @Value("${baseimgpath}") public String baseimgpath; @Pointcut("@annotation(com.zcloud.aspect.DockAnnotation)") @@ -104,9 +111,27 @@ public class DockingAspect { tenCorpDto.setProducer_name("qa-prevention-czks"); // 有dockData if (Tools.notEmpty(proceed.get("dockData"))) { - sendData.put("dockData", proceed.get("dockData")); + String dockData = proceed.get("dockData"); + PageData dockDataMap = JSON.parseObject(dockData, PageData.class); + sendData.put("dockData",dockData); + // 操作企业 + if ("f8da1790b1034058ae2efefd69af3284".contains(dockDataMap.getString("operatingCorpId")) + || "016d19225e9d4ece863cce8a256a3e72".contains(dockDataMap.getString("operatingCorpId")) + || "1".equals(dockDataMap.getString("sendAllCorp")) + ){ + tenCorpDto.setTopic(czksDataDocking); + sendMessageService.sendMessage(tenCorpDto); + } + // todo先不给其他两家发送消息，上线前打开 + if ("8854edee3aa94be496cee676b6d4845a".equals(dockDataMap.getString("operatingCorpId")) || "1".equals(dockDataMap.getString("sendAllCorp"))){ + tenCorpDto.setTopic(csyDataDocking); + sendMessageService.sendMessage(tenCorpDto); + } + if ("6aa255d41602497fa0f934a822820df4".equals(dockDataMap.getString("operatingCorpId")) || "1".equals(dockDataMap.getString("sendAllCorp"))){ + tenCorpDto.setTopic(cmtDataDocking); + sendMessageService.sendMessage(tenCorpDto); + } proceed.remove("dockData"); - sendMessageService.sendMessage(tenCorpDto); } else { System.out.println("------------------------无dockData不发消息------------------------"); } diff --git a/src/main/java/com/zcloud/dto/TenCorpDto.java b/src/main/java/com/zcloud/dto/TenCorpDto.java index 011721d9..f9398c74 100644 --- a/src/main/java/com/zcloud/dto/TenCorpDto.java +++ b/src/main/java/com/zcloud/dto/TenCorpDto.java @@ -2,6 +2,7 @@ package com.zcloud.dto; import com.alibaba.fastjson.JSON; import com.zcloud.entity.PageData; +import com.zcloud.util.Warden; import lombok.Data; @Data @@ -23,6 +24,10 @@ public class TenCorpDto { // 消息体 private PageData data; + private String messageLogId; + + private String CREATE_TIME; + public TenCorpDto() { this.id = Warden.get32UUID(); } @@ -40,6 +45,9 @@ public class TenCorpDto { info.put("MARK_NAME", this.mark_name); info.put("MESSAGE", this.message); info.put("TOPIC",this.topic); + info.put("DATA", JSON.toJSONString(this.data)); + info.put("CREATE_TIME", this.CREATE_TIME); + info.put("MESSAGE_LOG_ID", this.messageLogId); return info; } } diff --git a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java index ca474cd1..d4c56f41 100644 --- a/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java +++ b/src/main/java/com/zcloud/service/mq/impl/DockSendMessageServiceImpl.java @@ -26,6 +26,13 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { private String gwjDataTopic; @Value("${mq.gwj.file.topic}") private String gwjFileTopic; + @Value("${mq.csy.data.topic}") + private String csyDataDocking; + + @Value("${mq.cmt.data.topic}") + private String cmtDataDocking; + @Value("${mq.czks.data.topic}") + private String czksDataDocking; @Resource private RocketMQTemplate rocketMQTemplate; @@ -40,14 +47,32 @@ public class DockSendMessageServiceImpl implements DockSendMessageService { @Override public void sendMessage(TenCorpDto tenCorpDto) throws Exception { + PageData productionPD = new PageData(); + productionPD.put("PRODUCTION_ID", Warden.get32UUID()); + productionPD.put("MESSAGE_LOG_ID", tenCorpDto.getMessageLogId() == null ? "" : tenCorpDto.getMessageLogId()); + productionPD.put("PRODUCTION_TYPE", "gwj-DockSendMessageServiceImpl.sendMessage(TenCorpDto tenCorpDto)"); + productionPD.put("PRODUCTION_TIME", DateUtil.getTime()); + productionPD.put("CREATE_TIME", tenCorpDto.getCREATE_TIME() == null ? "" : tenCorpDto.getCREATE_TIME()); + productionPD.put("MARK", tenCorpDto.getMark() == null ? "" : tenCorpDto.getMark()); + productionPD.put("DATA", tenCorpDto.getData() == null ? "" : tenCorpDto.getData().toString()); try { PageData log = tenCorpDto.getPd(); log.put("MESSAGE_LOG_ID", Warden.get32UUID()); log.put("CREATE_TIME", DateUtil.getTime()); mqMessageLogMapper.save(log); System.out.println("生产者:" + tenCorpDto.toString()); - SendResult sendResult = rocketMQTemplate.syncSend(this.gwjDataTopic, tenCorpDto.toString()); - if (!sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { + SendResult sendResult = null; + // 曹煤炭 后期是 三家 + if (tenCorpDto.getTopic().equals(czksDataDocking)) { + sendResult = rocketMQTemplate.syncSend(this.czksDataDocking, tenCorpDto.toString()); + } + if (tenCorpDto.getTopic().equals(cmtDataDocking)) { + sendResult = rocketMQTemplate.syncSend(this.cmtDataDocking, tenCorpDto.toString()); + } + if (tenCorpDto.getTopic().equals(csyDataDocking)) { + sendResult = rocketMQTemplate.syncSend(this.csyDataDocking, tenCorpDto.toString()); + } + if (sendResult != null && !sendResult.getSendStatus().equals(SendStatus.SEND_OK)) { throw new RuntimeException("产品入栈失败"); } } catch (Exception e) { diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 023e9b32..04090df3 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -2,12 +2,12 @@ datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no1.username=root -datasource.no1.password=Mysql@zcloud88888 +datasource.no1.username=dev +datasource.no1.password=Zykj@dev123456 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8 -datasource.no2.username=root -datasource.no2.password=Mysql@zcloud88888 +datasource.no2.username=dev +datasource.no2.password=Zykj@dev123456 #druid??? @@ -63,18 +63,18 @@ spring.main.banner-mode=off preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/ qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/ #????? -smb.host=192.168.192.201 +smb.host=39.101.130.96 smb.port=22 smb.user=root -smb.password=SJSKAQHBGLXT@20220311 -smb.basePath=/mnt/qask/file/ +smb.password=Zcloud@zcloud88888 +smb.basePath=/mnt/wwag/file/ #Mq\u914D\u7F6E rocketmq.consumer.group2=edu-admin-edit rocketmq.consumer.group1=edu-admin-add #rocketmq.name-server=10.0.140.141:9876 #rocketmq.name-server=192.168.0.70:9876 -rocketmq.name-server=192.168.151.57:9876 +rocketmq.name-server=192.168.0.2:9876 rocketmq.producer.group=libmiddle rocketmq.producer.send-message-timeout=3000 rocketmq.producer.compress-message-body-threshold=4096 @@ -95,6 +95,28 @@ corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ http.file.url=https://qgqy.qhdsafety.com/file/ +mq.csy.data.topic=csy_docking +mq.csy.data.group=scheduled_tasks_csy_docking +mq.csy.file.topic=csy_dockingPicture +mq.csy.file.group=scheduled_tasks_csy_dockingPicture + +mq.cmt.data.topic=cmt_docking +mq.cmt.data.group=scheduled_tasks_cmt_docking +mq.cmt.file.topic=cmt_dockingPicture +mq.cmt.file.group=scheduled_tasks_cmt_dockingPicture + +mq.czks.data.topic=czks_docking +mq.czks.data.group=scheduled_tasks_czks_docking +mq.czks.file.topic=czks_dockingPicture +mq.czks.file.group=scheduled_tasks_czks_dockingPicture + +mq.gwj.data.topic=czks_docking +mq.gwj.file.topic=czks_dockingPicture +baseimgpath =http://192.168.192.201:8991/file/ + +heBeiQinAnFile=https://file.zcloudchina.com/YTHFile +biaoZhunShuJuKu=https://file.zcloudchina.com/ +dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/ #�û���ʶ # ���ݿ�ʯ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd259ac5..ea7feb10 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -2,11 +2,11 @@ spring.application.name=qa-prevention-gwj server.port=8091 #?? -#spring.profiles.active=local +spring.profiles.active=local #����31ʱʹ�� #spring.profiles.active=dev #?? -spring.profiles.active=master +#spring.profiles.active=master