guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

工匠学院 - 工匠学院图片前缀配置更新

xuyifeng-0724-人员中台对接-dev
water_xu 2024-07-10 16:31:30 +08:00
parent e7a80afd1d
commit 13ab1247b6
9 changed files with 45 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenSupervise.java
View File

@ -12,6 +12,7 @@ import com.zcloud.service.xgf.XgfUserService;
import com.zcloud.util.DateUtil; import com.zcloud.util.DateUtil;
import com.zcloud.flow.xgf.util.XgfFlowDto; import com.zcloud.flow.xgf.util.XgfFlowDto;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
@ -34,6 +35,8 @@ public class GuFenSupervise extends NodeComponent {
private XgfUserDetailsMapper xgfUserDetailsMapper; private XgfUserDetailsMapper xgfUserDetailsMapper;
@Resource @Resource
private GJSendMessageUtil gjSendMessageUtil; private GJSendMessageUtil gjSendMessageUtil;
@Value("${gongJiangXueYuanGetImgUrl}")
private String imgBaseUrl;
@Override @Override
public boolean isAccess() { public boolean isAccess() {
@ -104,7 +107,7 @@ public class GuFenSupervise extends NodeComponent {
.phoneNumber(entity.getString("USERNAME")) .phoneNumber(entity.getString("USERNAME"))
.idCard(entityInfo.getString("CARD_ID")) .idCard(entityInfo.getString("CARD_ID"))
.orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME"))
.avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO"))
.build(); .build();
List<UserDTO> list = new ArrayList<UserDTO>(); List<UserDTO> list = new ArrayList<UserDTO>();
list.add(userDTO); list.add(userDTO);

5
src/main/java/com/zcloud/flow/xgf/GuFen/GuFenWeiTuoSupervise.java
View File

@ -14,6 +14,7 @@ import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import com.zcloud.flow.xgf.util.XgfFlowDto; import com.zcloud.flow.xgf.util.XgfFlowDto;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
@ -39,6 +40,8 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
private XgfUserDetailsMapper xgfUserDetailsMapper; private XgfUserDetailsMapper xgfUserDetailsMapper;
@Resource @Resource
private GJSendMessageUtil gjSendMessageUtil; private GJSendMessageUtil gjSendMessageUtil;
@Value("${gongJiangXueYuanGetImgUrl}")
private String imgBaseUrl;
@Override @Override
public boolean isAccess() { public boolean isAccess() {
@ -108,7 +111,7 @@ public class GuFenWeiTuoSupervise extends NodeComponent {
.phoneNumber(entity.getString("USERNAME")) .phoneNumber(entity.getString("USERNAME"))
.idCard(entityInfo.getString("CARD_ID")) .idCard(entityInfo.getString("CARD_ID"))
.orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME"))
.avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO"))
.build(); .build();
List<UserDTO> list = new ArrayList<UserDTO>(); List<UserDTO> list = new ArrayList<UserDTO>();
list.add(userDTO); list.add(userDTO);

5
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanSupervise.java
View File

@ -13,6 +13,7 @@ import com.zcloud.mapper.datasource.xgf.XgfUserMapper;
import com.zcloud.service.xgf.XgfUserService; import com.zcloud.service.xgf.XgfUserService;
import com.zcloud.util.DateUtil; import com.zcloud.util.DateUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
@ -34,6 +35,8 @@ public class JiTuanSupervise extends NodeComponent {
private XgfUserDetailsMapper xgfUserDetailsMapper; private XgfUserDetailsMapper xgfUserDetailsMapper;
@Resource @Resource
private GJSendMessageUtil gjSendMessageUtil; private GJSendMessageUtil gjSendMessageUtil;
@Value("${gongJiangXueYuanGetImgUrl}")
private String imgBaseUrl;
@Override @Override
public boolean isAccess() { public boolean isAccess() {
@ -107,7 +110,7 @@ public class JiTuanSupervise extends NodeComponent {
.phoneNumber(entity.getString("USERNAME")) .phoneNumber(entity.getString("USERNAME"))
.idCard(entityInfo.getString("CARD_ID")) .idCard(entityInfo.getString("CARD_ID"))
.orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME"))
.avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO"))
.build(); .build();
List<UserDTO> list = new ArrayList<UserDTO>(); List<UserDTO> list = new ArrayList<UserDTO>();
list.add(userDTO); list.add(userDTO);

5
src/main/java/com/zcloud/flow/xgf/JiTuan/JiTuanWeiTuoSupervise.java
View File

@ -14,6 +14,7 @@ import com.zcloud.service.xgf.XgfUserService;
import com.zcloud.util.DateUtil; import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
@ -38,6 +39,8 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
private XgfUserDetailsMapper xgfUserDetailsMapper; private XgfUserDetailsMapper xgfUserDetailsMapper;
@Resource @Resource
private GJSendMessageUtil gjSendMessageUtil; private GJSendMessageUtil gjSendMessageUtil;
@Value("${gongJiangXueYuanGetImgUrl}")
private String imgBaseUrl;
@Override @Override
public boolean isAccess() { public boolean isAccess() {
@ -107,7 +110,7 @@ public class JiTuanWeiTuoSupervise extends NodeComponent {
.phoneNumber(entity.getString("USERNAME")) .phoneNumber(entity.getString("USERNAME"))
.idCard(entityInfo.getString("CARD_ID")) .idCard(entityInfo.getString("CARD_ID"))
.orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME"))
.avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO"))
.build(); .build();
List<UserDTO> list = new ArrayList<UserDTO>(); List<UserDTO> list = new ArrayList<UserDTO>();
list.add(userDTO); list.add(userDTO);

5
src/main/java/com/zcloud/flow/xgf/YiBan/YiBanSupervise.java
View File

@ -14,6 +14,7 @@ import com.zcloud.service.xgf.XgfUserService;
import com.zcloud.util.DateUtil; import com.zcloud.util.DateUtil;
import com.zcloud.util.Jurisdiction; import com.zcloud.util.Jurisdiction;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
@ -39,6 +40,8 @@ public class YiBanSupervise extends NodeComponent {
@Resource @Resource
private CorpInfoMapper corpInfoMapper; private CorpInfoMapper corpInfoMapper;
@Value("${gongJiangXueYuanGetImgUrl}")
private String imgBaseUrl;
@Override @Override
public boolean isAccess() { public boolean isAccess() {
@ -139,7 +142,7 @@ public class YiBanSupervise extends NodeComponent {
.phoneNumber(entity.getString("USERNAME")) .phoneNumber(entity.getString("USERNAME"))
.idCard(entityInfo.getString("CARD_ID")) .idCard(entityInfo.getString("CARD_ID"))
.orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME")) .orgTree("集团外公司（含外协单位）/"+ entity.getString("BELONG_TO_CORP_NAME"))
.avatarUrl("https://wwag.qhdsafety.com/file/" + entityInfo.getString("PHOTO")) .avatarUrl(imgBaseUrl + entityInfo.getString("PHOTO"))
.build(); .build();
List<UserDTO> list = new ArrayList<UserDTO>(); List<UserDTO> list = new ArrayList<UserDTO>();
list.add(userDTO); list.add(userDTO);

17
src/main/resources/application-dev.properties
View File

@ -55,7 +55,7 @@ spring.main.banner-mode=off
#web.front-path=h:/ #web.front-path=h:/
#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path} #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 #qa-regulatory-gwj.api.url=http://192.168.0.79:8008
preventionxgf.api.url=http://39.100.115.58:8082/qa-prevention-xgf/ 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/ corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
#用户标识 #\u7528\u6237\u6807\u8BC6
# 沧州矿石 # \u6CA7\u5DDE\u77FF\u77F3
czks-useridentity=CZKS czks-useridentity=CZKS
czks-baseimgpath=https://wwag.qhdsafety.com/file/ czks-baseimgpath=https://wwag.qhdsafety.com/file/
czks-backendaddr=http://192.168.0.79:8091/ czks-backendaddr=http://192.168.0.79:8091/
# 港务局 # \u6E2F\u52A1\u5C40
gwj-useridentity=GWJ gwj-useridentity=GWJ
gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ 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.data.topic=czks_docking
mq.gwj.file.topic=czks_dockingPicture 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 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 heBeiQinAnFile=https://file.zcloudchina.com/YTHFile
biaoZhunShuJuKu=https://file.zcloudchina.com/
liteflow.rule-source=flow.xml liteflow.rule-source=flow.xml
liteflow.print-execution-log=false liteflow.print-execution-log=false
@ -137,3 +138,7 @@ gongJiangXueYuanSendPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbwmqh
gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0 gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0
gongJiangXueYuanTestUrl=http://fy04.bjttsx.com gongJiangXueYuanTestUrl=http://fy04.bjttsx.com
gongJiangXueYuanProdUrl=https://gjxy.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/

16
src/main/resources/application-local.properties
View File

@ -118,20 +118,14 @@ mq.czks.data.group=scheduled_tasks_czks_docking
mq.czks.file.topic=czks_dockingPicture mq.czks.file.topic=czks_dockingPicture
mq.czks.file.group=scheduled_tasks_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/ biaoZhunShuJuKu=https://file.zcloudchina.com/
dw.url=http://192.168.192.201:8888/qa-dingWei-gwj/
#<EFBFBD>û<EFBFBD><EFBFBD><EFBFBD>ʶ #\uFFFD\u00FB\uFFFD\uFFFD\uFFFD\u02B6
# <EFBFBD><EFBFBD><EFBFBD>ݿ<EFBFBD>ʯ # \uFFFD\uFFFD\uFFFD\u077F\uFFFD\u02AF
czks-useridentity=CZKS czks-useridentity=CZKS
czks-baseimgpath=https://wwag.qhdsafety.com/file/ czks-baseimgpath=https://wwag.qhdsafety.com/file/
czks-backendaddr=http://192.168.0.79:8091/ czks-backendaddr=http://192.168.0.79:8091/
# <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> # \uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
gwj-useridentity=GWJ gwj-useridentity=GWJ
gwj-baseimgpath=https://qgqy.qhdsafety.com/file/ gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/ gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
@ -142,3 +136,7 @@ gongJiangXueYuanSendPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbwmqh
gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0 gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0
gongJiangXueYuanTestUrl=http://fy04.bjttsx.com gongJiangXueYuanTestUrl=http://fy04.bjttsx.com
gongJiangXueYuanProdUrl=https://gjxy.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/

4
src/main/resources/application-master.properties
View File

@ -109,4 +109,8 @@ gongJiangXueYuanSendPublicKey=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzbwmqh
gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0 gongJiangXueYuanSendPrivateKey=58e5e358b220335e7b1c6cc3576ceecc28b4a95d96cbbe0
gongJiangXueYuanTestUrl=http://fy04.bjttsx.com gongJiangXueYuanTestUrl=http://fy04.bjttsx.com
gongJiangXueYuanProdUrl=https://gjxy.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/

4
src/main/resources/application.properties
View File

@ -3,8 +3,8 @@ server.port=8091
#?? #??
#spring.profiles.active=local #spring.profiles.active=local
#<EFBFBD><EFBFBD><EFBFBD><EFBFBD>31ʱʹ<EFBFBD><EFBFBD> #\uFFFD\uFFFD\uFFFD\uFFFD31\u02B1\u02B9\uFFFD\uFFFD
#spring.profiles.active=dev spring.profiles.active=dev
#?? #??
#spring.profiles.active=master #spring.profiles.active=master