From 13ab1247b6837d2fd90a43546f4208eeb22c6272 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 10 Jul 2024 16:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8C=A0=E5=AD=A6=E9=99=A2=20-=20?= =?UTF-8?q?=E5=B7=A5=E5=8C=A0=E5=AD=A6=E9=99=A2=E5=9B=BE=E7=89=87=E5=89=8D?= =?UTF-8?q?=E7=BC=80=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/flow/xgf/GuFen/GuFenSupervise.java | 5 ++++- .../flow/xgf/GuFen/GuFenWeiTuoSupervise.java | 5 ++++- .../flow/xgf/JiTuan/JiTuanSupervise.java | 5 ++++- .../flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java | 5 ++++- .../zcloud/flow/xgf/YiBan/YiBanSupervise.java | 5 ++++- src/main/resources/application-dev.properties | 17 +++++++++++------ .../resources/application-local.properties | 18 ++++++++---------- .../resources/application-master.properties | 4 ++++ src/main/resources/application.properties | 4 ++-- 9 files changed, 45 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java index 173a43f4..243958aa 100644 --- a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java @@ -12,6 +12,7 @@ import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.DateUtil; import com.zcloud.flow.xgf.util.XgfFlowDto; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.ArrayList; @@ -34,6 +35,8 @@ public class GuFenSupervise extends NodeComponent { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource private GJSendMessageUtil gjSendMessageUtil; + @Value("${gongJiangXueYuanGetImgUrl}") + private String imgBaseUrl; @Override public boolean isAccess() { @@ -104,7 +107,7 @@ public class GuFenSupervise extends NodeComponent { .phoneNumber(entity.getString("USERNAME")) .idCard(entityInfo.getString("CARD_ID")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) - .avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) + .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO")) .build(); List list = new ArrayList(); list.add(userDTO); diff --git a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java index bf1d03a6..18c62222 100644 --- a/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java @@ -14,6 +14,7 @@ import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import com.zcloud.flow.xgf.util.XgfFlowDto; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.ArrayList; @@ -39,6 +40,8 @@ public class GuFenWeiTuoSupervise extends NodeComponent { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource private GJSendMessageUtil gjSendMessageUtil; + @Value("${gongJiangXueYuanGetImgUrl}") + private String imgBaseUrl; @Override public boolean isAccess() { @@ -108,7 +111,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent { .phoneNumber(entity.getString("USERNAME")) .idCard(entityInfo.getString("CARD_ID")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) - .avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) + .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO")) .build(); List list = new ArrayList(); list.add(userDTO); diff --git a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java index ba06fa62..a6de4cf4 100644 --- a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java @@ -13,6 +13,7 @@ import com.zcloud.mapper.datasource.xgf.XgfUserMapper; import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.DateUtil; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.ArrayList; @@ -34,6 +35,8 @@ public class JiTuanSupervise extends NodeComponent { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource private GJSendMessageUtil gjSendMessageUtil; + @Value("${gongJiangXueYuanGetImgUrl}") + private String imgBaseUrl; @Override public boolean isAccess() { @@ -107,7 +110,7 @@ public class JiTuanSupervise extends NodeComponent { .phoneNumber(entity.getString("USERNAME")) .idCard(entityInfo.getString("CARD_ID")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) - .avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) + .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO")) .build(); List list = new ArrayList(); list.add(userDTO); diff --git a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java index 3ad186aa..759c5727 100644 --- a/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java @@ -14,6 +14,7 @@ import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.ArrayList; @@ -38,6 +39,8 @@ public class JiTuanWeiTuoSupervise extends NodeComponent { private XgfUserDetailsMapper xgfUserDetailsMapper; @Resource private GJSendMessageUtil gjSendMessageUtil; + @Value("${gongJiangXueYuanGetImgUrl}") + private String imgBaseUrl; @Override public boolean isAccess() { @@ -107,7 +110,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent { .phoneNumber(entity.getString("USERNAME")) .idCard(entityInfo.getString("CARD_ID")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) - .avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) + .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO")) .build(); List list = new ArrayList(); list.add(userDTO); diff --git a/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java b/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java index 8dd14f76..7b7b7c70 100644 --- a/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java +++ b/src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java @@ -14,6 +14,7 @@ import com.zcloud.service.xgf.XgfUserService; import com.zcloud.util.DateUtil; import com.zcloud.util.Jurisdiction; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import javax.annotation.Resource; import java.util.ArrayList; @@ -39,6 +40,8 @@ public class YiBanSupervise extends NodeComponent { @Resource private CorpInfoMapper corpInfoMapper; + @Value("${gongJiangXueYuanGetImgUrl}") + private String imgBaseUrl; @Override public boolean isAccess() { @@ -139,7 +142,7 @@ public class YiBanSupervise extends NodeComponent { .phoneNumber(entity.getString("USERNAME")) .idCard(entityInfo.getString("CARD_ID")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) - .avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) + .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO")) .build(); List list = new ArrayList(); list.add(userDTO); diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1903a2b0..1a83d27f 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -55,7 +55,7 @@ spring.main.banner-mode=off #web.front-path=h:/ #spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} -#preventionxgf.api.url=http://192.168.0.79:8088 +#preventionxgf.api.url=http://127.0.0.1:8088/ # #qa-regulatory-gwj.api.url=http://192.168.0.79:8008 preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ @@ -91,12 +91,12 @@ corp.default.pic-path=https://qgqy.qhdsafety.com/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/ -#用户标识 -# 沧州矿石 +#\u7528\u6237\u6807\u8BC6 +# \u6CA7\u5DDE\u77FF\u77F3 czks-useridentity=CZKS czks-baseimgpath=https://wwag.qhdsafety.com/file/ czks-backendaddr=http://192.168.0.79:8091/ -# 港务局 +# \u6E2F\u52A1\u5C40 gwj-useridentity=GWJ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ @@ -125,10 +125,11 @@ mq.czks.file.group=scheduled_tasks_czks_dockingPicture mq.gwj.data.topic=czks_docking mq.gwj.file.topic=czks_dockingPicture -#港务局文件服务器前缀 +#\u6E2F\u52A1\u5C40\u6587\u4EF6\u670D\u52A1\u5668\u524D\u7F00 cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd -#河北秦安文件服务器前缀 +#\u6CB3\u5317\u79E6\u5B89\u6587\u4EF6\u670D\u52A1\u5668\u524D\u7F00 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile +biaoZhunShuJuKu=https://file.zcloudchina.com/ liteflow.rule-source=flow.xml liteflow.print-execution-log=false @@ -137,3 +138,7 @@ gongJiangXueYuanSendPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbwmqh gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0 gongJiangXueYuanTestUrl=http://fy04.bjttsx.com gongJiangXueYuanProdUrl=https://gjxy.bjttsx.com +# \u7ED9\u5DE5\u5320\u5B66\u9662\u63A8\u9001\u4EBA\u5458\u6570\u636E\u65F6\u7684\u56FE\u7247\u9644\u4EF6\u524D\u7F00 \uFF08\u6B63\u5F0F\u516C\u7F51\uFF09 +#gongJiangXueYuanGetImgUrl=https://skqhdg.porthebei.com:9004/file/ +# \u7ED9\u5DE5\u5320\u5B66\u9662\u63A8\u9001\u4EBA\u5458\u6570\u636E\u65F6\u7684\u56FE\u7247\u9644\u4EF6\u524D\u7F00 \uFF08\u6D4B\u8BD5\u516C\u7F51\uFF09 +gongJiangXueYuanGetImgUrl=https://wwag.qhdsafety.com/file/ diff --git a/src/main/resources/application-local.properties b/src/main/resources/application-local.properties index 61f5cbde..ee07fca5 100644 --- a/src/main/resources/application-local.properties +++ b/src/main/resources/application-local.properties @@ -118,20 +118,14 @@ 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/ -#�û���ʶ -# ���ݿ�ʯ +#\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\u02B6 +# \uFFFD\uFFFD\uFFFD\u077F\uFFFD\u02AF czks-useridentity=CZKS czks-baseimgpath=https://wwag.qhdsafety.com/file/ czks-backendaddr=http://192.168.0.79:8091/ -# ����� +# \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD gwj-useridentity=GWJ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ @@ -141,4 +135,8 @@ cfd.prevention.api.url=http://192.168.0.31:7021/qa-regulatory-cfd gongJiangXueYuanSendPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbwmqhb5xVejFQFoa8NF2FGtb2nMtpalZ2Zcy78tL/5Y5Od78EKb9dALuv4b+F/PexynKrQDlnRhAouuqF8S1LuC0njbWSaFMofCeyeoltSQTEcjwzEAOPH9CnzGOZQ19tB2vEamVoLefWC4H0V+e5hWv7DDCm3bLNaHhMnR1/o0ASZqzIHYDEzVZNGrxR8WIhxUh7fORk75nEUyz2S6WKq1MlOkm8ZssMsFW+KacRTnexn8Q2p8/7/3zRCScLoH3pHA+J35nuP+doigUmPJzwHfPsr1QeYdadtuwZdfCZVQ7U4R4vB83NsSElAgTW+xHzy7Y1EcgZgYfSedetb03QIDAQAB gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0 gongJiangXueYuanTestUrl=http://fy04.bjttsx.com -gongJiangXueYuanProdUrl=https://gjxy.bjttsx.com \ No newline at end of file +gongJiangXueYuanProdUrl=https://gjxy.bjttsx.com +# \u7ED9\u5DE5\u5320\u5B66\u9662\u63A8\u9001\u4EBA\u5458\u6570\u636E\u65F6\u7684\u56FE\u7247\u9644\u4EF6\u524D\u7F00 \uFF08\u6B63\u5F0F\u516C\u7F51\uFF09 +#gongJiangXueYuanGetImgUrl=https://skqhdg.porthebei.com:9004/file/ +# \u7ED9\u5DE5\u5320\u5B66\u9662\u63A8\u9001\u4EBA\u5458\u6570\u636E\u65F6\u7684\u56FE\u7247\u9644\u4EF6\u524D\u7F00 \uFF08\u6D4B\u8BD5\u516C\u7F51\uFF09 +gongJiangXueYuanGetImgUrl=https://wwag.qhdsafety.com/file/ \ No newline at end of file diff --git a/src/main/resources/application-master.properties b/src/main/resources/application-master.properties index cc61c2d5..adfae806 100644 --- a/src/main/resources/application-master.properties +++ b/src/main/resources/application-master.properties @@ -109,4 +109,8 @@ gongJiangXueYuanSendPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbwmqh gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0 gongJiangXueYuanTestUrl=http://fy04.bjttsx.com gongJiangXueYuanProdUrl=https://gjxy.bjttsx.com +# \u7ED9\u5DE5\u5320\u5B66\u9662\u63A8\u9001\u4EBA\u5458\u6570\u636E\u65F6\u7684\u56FE\u7247\u9644\u4EF6\u524D\u7F00 \uFF08\u6B63\u5F0F\u516C\u7F51\uFF09 +gongJiangXueYuanGetImgUrl=https://skqhdg.porthebei.com:9004/file/ +# \u7ED9\u5DE5\u5320\u5B66\u9662\u63A8\u9001\u4EBA\u5458\u6570\u636E\u65F6\u7684\u56FE\u7247\u9644\u4EF6\u524D\u7F00 \uFF08\u6D4B\u8BD5\u516C\u7F51\uFF09 +#gongJiangXueYuanGetImgUrl=https://wwag.qhdsafety.com/file/ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index dd478c65..a765838a 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -3,8 +3,8 @@ server.port=8091 #?? #spring.profiles.active=local -#����31ʱʹ�� -#spring.profiles.active=dev +#\uFFFD\uFFFD\uFFFD\uFFFD31\u02B1\u02B9\uFFFD\uFFFD +spring.profiles.active=dev #?? #spring.profiles.active=master