From d3bcb1f05ca4407de1679bea7cbf1a58159edcfd Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 09:54:42 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/CodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index d07bf811bf..4d6ba89fbf 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -388,7 +388,7 @@ public class CodeServiceImpl implements CodeService { throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); } //将之前上传信息删除 - codeCustomerService.deleteCode(formDTO.getCustomerId(), codeCustomerDTO.getClientType()); + codeCustomerService.deleteCode(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.RELEASE_SUCCESS); From 12759b3f0e0b373837f76c7924b765dd332fdb5b Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 10:18:53 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/UploadListResultDTO.java | 4 ++++ .../src/main/resources/mapper/PaCustomerDao.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java index 82d88b084a..7151394b94 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/UploadListResultDTO.java @@ -27,6 +27,10 @@ public class UploadListResultDTO implements Serializable { * 客户名 */ private String customerName; + /** + * 小程序名 + */ + private String miniName; /** * 居民端resi 工作端work */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml index b14f2a4764..40d5efbc3a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/PaCustomerDao.xml @@ -83,11 +83,15 @@ SELECT - i.ID actId, - i.TITLE title, - i.COVER_PIC coverPic, - DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, - DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, - i.ACT_ADDRESS actAddress, - 'finished' actCurrentState - FROM act_info i - LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0' - WHERE i.DEL_FLAG = '0' - AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL - AND i.CUSTOMER_ID = #{customerId} - AND i.ACT_STATUS = 'finished' - GROUP BY i.ID - ORDER BY i.CREATED_TIME DESC - LIMIT #{pageNo}, #{pageSize} + a.actId, + a.title, + a.coverPic, + a.actStartTime, + a.actEndTime, + a.actAddress, + a.actCurrentState + FROM( + SELECT + i.ID actId, + i.CUSTOMER_ID, + i.TITLE title, + i.COVER_PIC coverPic, + DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, + DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, + i.ACT_ADDRESS actAddress, + 'finished' actCurrentState, + i.CREATED_TIME + FROM act_info i + LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0' + WHERE i.DEL_FLAG = '0' + AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL + AND i.ACT_STATUS = 'finished' + GROUP BY i.ID + ) a + WHERE a.CUSTOMER_ID = #{customerId} + ORDER BY a.CREATED_TIME DESC + LIMIT #{pageNo}, #{pageSize} SELECT - i.ID actId, - i.TITLE title, - i.COVER_PIC coverPic, - DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, - DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, - i.ACT_ADDRESS actAddress, - 'finished' actCurrentState - FROM act_info i - LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0' - WHERE i.DEL_FLAG = '0' - AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL - AND i.CUSTOMER_ID = #{customerId} - AND i.ACT_STATUS = 'finished' - GROUP BY i.ID - ORDER BY i.CREATED_TIME DESC - LIMIT 0, #{num} + a.actId, + a.title, + a.coverPic, + a.actStartTime, + a.actEndTime, + a.actAddress, + a.actCurrentState + FROM( + SELECT + i.ID actId, + i.CUSTOMER_ID, + i.TITLE title, + i.COVER_PIC coverPic, + DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i') actStartTime, + DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i') actEndTime, + i.ACT_ADDRESS actAddress, + 'finished' actCurrentState, + i.CREATED_TIME + FROM act_info i + LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0' + WHERE i.DEL_FLAG = '0' + AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL + AND i.ACT_STATUS = 'finished' + GROUP BY i.ID + ) a + WHERE a.CUSTOMER_ID = #{customerId} + ORDER BY a.CREATED_TIME DESC + LIMIT 0, #{num} From 2f8c454cb7b9148ef2b1f69267902e06baf0057b Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Aug 2020 15:27:24 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E9=83=A8=E7=BD=B2heart?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index 40f1e509f5..ba3776d6fe 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.49 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.50 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index a2185d6b09..5b2fef6ae2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.49 + 0.0.50 com.epmet epmet-heart From 0ec274261ccd5aaf8cba62c26a125cfaeaba49f9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 16:15:31 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/CodeAuditResultDTO.java | 16 +++- .../com/epmet/dto/form/CodeCommonFormDTO.java | 1 + .../com/epmet/dto/result/DomainResultDTO.java | 21 ++++++ .../com/epmet/dto/result/ReasonResultDTO.java | 8 ++ .../com/epmet/controller/CodeController.java | 12 +++ .../epmet/entity/CodeAuditResultEntity.java | 10 +++ .../java/com/epmet/service/CodeService.java | 18 +++++ .../epmet/service/impl/CodeServiceImpl.java | 73 ++++++++++++++++--- .../wxapi/result/WxMaModifyDomainResult.java | 33 +++++++++ .../result/WxMaSetWebviewDomainResult.java | 27 +++++++ .../epmet/wxapi/service/WxMaCodeService.java | 6 +- .../service/impl/WxMaCodeServiceImpl.java | 28 ++++--- 12 files changed, 228 insertions(+), 25 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java index a79140593e..910ded04de 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeAuditResultDTO.java @@ -68,9 +68,23 @@ public class CodeAuditResultDTO implements Serializable { */ private String screenShot; + /** + * 素材地址 + */ private String screenShotUrl; - /** + /** + * 反馈内容 + */ + private String feedbackInfo; + + /** + * 反馈素材 + */ + private String feedbackStuff; + + + /** * 乐观锁 */ private Integer revision; diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java index 9f7f31bcac..391a0d217b 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CodeCommonFormDTO.java @@ -20,6 +20,7 @@ public class CodeCommonFormDTO implements Serializable { * 代码ID */ private String codeId; + private String clientType; private String grayPercentage; private String path; private Integer page = 1; diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java new file mode 100644 index 0000000000..207dc326e6 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/DomainResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/13 16:02 + */ +@Data +public class DomainResultDTO implements Serializable { + private static final long serialVersionUID = -2534293858061449973L; + private List requestDomain; + private List wsRequestDomain; + private List uploadDomain; + private List downloadDomain; + private List webViewDomain; +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java index e2d9d1c2ad..4eae30d0bd 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/ReasonResultDTO.java @@ -23,6 +23,14 @@ public class ReasonResultDTO implements Serializable { * 失败的小程序截图url */ private List screenshotUrl; + /** + * 反馈内容，至多 200 字 + */ + private String feedbackInfo; + /** + * 反馈素材 + */ + private String feedbackStuff; /** * 提交审核时间 */ diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java index b03a808edf..01014d7564 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java @@ -208,6 +208,18 @@ public class CodeController { return new Result<>(); } + @PostMapping("setdomains") + public Result setDomains(@RequestBody CodeCommonFormDTO formDTO) { + codeService.setDomains(formDTO); + return new Result<>(); + } + + @PostMapping("getdomain") + public Result getDomains(@RequestBody CodeCommonFormDTO formDTO) { + DomainResultDTO result = codeService.getDomains(formDTO); + return new Result().ok(result); + } + @PostMapping("customers") public Result getCustomerList(@RequestBody UploadListFormDTO formDTO) { PageData pageData = codeService.getCustomerList(formDTO); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java index 8ad218032f..164b8a97bb 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeAuditResultEntity.java @@ -70,5 +70,15 @@ public class CodeAuditResultEntity extends BaseEpmetEntity { private String screenShotUrl; + /** + * 反馈内容 + */ + private String feedbackInfo; + + /** + * 反馈素材 + */ + private String feedbackStuff; + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java index ae2240010c..38e409d79b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java @@ -154,6 +154,24 @@ public interface CodeService { */ void setDomain(String customerId); + /** + * 设置服务器域名和业务域名 + * @author zhaoqifeng + * @date 2020/8/6 15:34 + * @param formDTO + * @return int + */ + void setDomains(CodeCommonFormDTO formDTO); + + /** + * 获取服务器域名和业务域名 + * @author zhaoqifeng + * @date 2020/8/6 15:34 + * @param formDTO + * @return DomainResultDTO + */ + DomainResultDTO getDomains(CodeCommonFormDTO formDTO); + /** * 已初始化客户列表 * @author zhaoqifeng diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 4d6ba89fbf..216330a6e3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -269,12 +269,14 @@ public class CodeServiceImpl implements CodeService { } //调用微信API上提交审核 WxMaCodeSubmitAuditRequest request = new WxMaCodeSubmitAuditRequest(); - request.setVersionDesc(formDTO.getVersionDesc()); + if(StringUtils.isBlank(formDTO.getFeedbackInfo())) { + request.setVersionDesc(formDTO.getVersionDesc()); + request.setItemList(formDTO.getItemList()); + request.setPreviewInfo(formDTO.getPreviewInfo()); + request.setUgcDeclare(formDTO.getUgcDeclare()); + } request.setFeedbackInfo(formDTO.getFeedbackInfo()); request.setFeedbackStuff(formDTO.getFeedbackStuff()); - request.setItemList(formDTO.getItemList()); - request.setPreviewInfo(formDTO.getPreviewInfo()); - request.setUgcDeclare(formDTO.getUgcDeclare()); WxResult wxResult = wxMaCodeService.submitAudit(authInfo.getAuthorizerAccessToken(), request); if (!wxResult.success()) { saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType(), codeCustomerDTO.getId(), @@ -303,6 +305,9 @@ public class CodeServiceImpl implements CodeService { codeAuditResultDTO.setResult(CodeConstant.AUDITING); codeAuditResultService.save(codeAuditResultDTO); } else { + codeAuditResultDTO.setFeedbackInfo(formDTO.getFeedbackInfo()); + codeAuditResultDTO.setFeedbackStuff(formDTO.getFeedbackStuff()); + codeAuditResultService.update(codeAuditResultDTO); codeAuditResultService.deleteById(codeAuditResultDTO.getId()); codeAuditResultDTO = new CodeAuditResultDTO(); codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId()); @@ -447,6 +452,8 @@ public class CodeServiceImpl implements CodeService { codeAuditResultService.update(dto); } result.setScreenshotUrl(urlList); + result.setFeedbackInfo(dto.getFeedbackInfo()); + result.setFeedbackStuff(dto.getFeedbackStuff()); } else { String[] url = dto.getScreenShotUrl().split("[|]"); List urlList = new ArrayList<>(url.length); @@ -562,18 +569,64 @@ public class CodeServiceImpl implements CodeService { } authInfoList.forEach(authInfo -> { //设置服务器域名 - WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken()); - if (!wxResult.success()) { - throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + WxResult modifyDomain = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set"); + if (!modifyDomain.success()) { + throw new RenException(modifyDomain.getErrorCode(), modifyDomain.getErrorMsg()); } //设置业务域名 - wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken()); - if (!wxResult.success()) { - throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + WxResult setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set"); + if (!setWebviewDomain.success()) { + throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg()); } }); } + @Override + public void setDomains(CodeCommonFormDTO formDTO) { + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType()); + if (null == authInfo) { + throw new RenException("未授权"); + } + //设置服务器域名 + WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "set"); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + //设置业务域名 + WxResult setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "set"); + if (!setWebviewDomain.success()) { + throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg()); + } + } + + @Override + public DomainResultDTO getDomains(CodeCommonFormDTO formDTO) { + DomainResultDTO resultDTO = new DomainResultDTO(); + //获取小程序调用令牌 + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType()); + if (null == authInfo) { + throw new RenException("未授权"); + } + //设置服务器域名 + WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken(), "get"); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + resultDTO.setDownloadDomain(wxResult.getData().getDownloadDomain()); + resultDTO.setRequestDomain(wxResult.getData().getRequestDomain()); + resultDTO.setUploadDomain(wxResult.getData().getUploadDomain()); + resultDTO.setWsRequestDomain(wxResult.getData().getWsRequestDomain()); + + //设置业务域名 + WxResult setWebviewDomain = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken(), "get"); + if (!setWebviewDomain.success()) { + throw new RenException(setWebviewDomain.getErrorCode(), setWebviewDomain.getErrorMsg()); + } + resultDTO.setWebViewDomain(setWebviewDomain.getData().getWebViewDomain()); + return resultDTO; + } + @Override public PageData getCustomerList(UploadListFormDTO formDTO) { return paCustomerService.getCustomerList(formDTO); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java new file mode 100644 index 0000000000..4f5606eb06 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaModifyDomainResult.java @@ -0,0 +1,33 @@ +package com.epmet.wxapi.result; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/13 15:46 + */ +@NoArgsConstructor +@Data +public class WxMaModifyDomainResult implements Serializable { + + private static final long serialVersionUID = 8602059705480008729L; + /** + * errcode : 0 + */ + private Integer errcode; + private String errmsg; + @SerializedName("requestdomain") + private List requestDomain; + @SerializedName("wsrequestdomain") + private List wsRequestDomain; + @SerializedName("uploaddomain") + private List uploadDomain; + @SerializedName("downloaddomain") + private List downloadDomain; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java new file mode 100644 index 0000000000..6700e03b7a --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaSetWebviewDomainResult.java @@ -0,0 +1,27 @@ +package com.epmet.wxapi.result; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/13 15:53 + */ +@NoArgsConstructor +@Data +public class WxMaSetWebviewDomainResult implements Serializable { + + private static final long serialVersionUID = -5871654910653283111L; + /** + * errcode : 0 + */ + private Integer errcode; + private String errmsg; + @SerializedName("webviewdomain") + private List webViewDomain; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java index df405b12e9..1918e79603 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java @@ -123,21 +123,23 @@ public interface WxMaCodeService { * 设置服务器域名 * * @param accessToken + * @param action * @return com.epmet.wxapi.result.WxResult * @author zhaoqifeng * @date 2020/7/16 17:21 */ - WxResult modifyDomain(String accessToken); + WxResult modifyDomain(String accessToken, String action); /** * 设置业务域名 * * @param accessToken + * @param action * @return com.epmet.wxapi.result.WxResult * @author zhaoqifeng * @date 2020/7/16 17:22 */ - WxResult setWebviewDomain(String accessToken); + WxResult setWebviewDomain(String accessToken, String action); /** * 上传临时素材 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index ce18ca880c..87b7afb0f6 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -231,11 +231,11 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } @Override - public WxResult modifyDomain(String accessToken) { - WxResult result = new WxResult(); + public WxResult modifyDomain(String accessToken, String action) { + WxResult result = new WxResult<>(); String url = WxMaCodeConstant.MODIFY_DOMAIN_URL + "?" + "access_token=" + accessToken; WxMaModifyDomainReq request = new WxMaModifyDomainReq(); - request.setAction("set"); + request.setAction(action); request.setRequestDomain(wxMaDomainDTO.getRequestDomain()); request.setUploadDomain(wxMaDomainDTO.getUploadDomain()); request.setWsRequestDomain(wxMaDomainDTO.getWsRequestDomain()); @@ -246,18 +246,20 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { result.setErrorMsg(modifyResult.getMsg()); return result; } - JSONObject jsonObject = JSONObject.parseObject(modifyResult.getData()); - result.setErrorCode(jsonObject.getInteger(ERR_CODE)); - result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + Gson gson = new Gson(); + WxMaModifyDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaModifyDomainResult.class); + result.setErrorCode(domainResult.getErrcode()); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode())); + result.setData(domainResult); return result; } @Override - public WxResult setWebviewDomain(String accessToken) { - WxResult result = new WxResult(); + public WxResult setWebviewDomain(String accessToken, String action) { + WxResult result = new WxResult<>(); String url = WxMaCodeConstant.SET_WEBVIEW_DOMAIN_URL + "?" + "access_token=" + accessToken; WxMaSetWebviewDomainReq request = new WxMaSetWebviewDomainReq(); - request.setAction("set"); + request.setAction(action); request.setWebViewDomain(wxMaDomainDTO.getWebviewDomain()); Result modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request)); if (!modifyResult.success()) { @@ -265,9 +267,11 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { result.setErrorMsg(modifyResult.getMsg()); return result; } - JSONObject jsonObject = JSONObject.parseObject(modifyResult.getData()); - result.setErrorCode(jsonObject.getInteger(ERR_CODE)); - result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + Gson gson = new Gson(); + WxMaSetWebviewDomainResult domainResult = gson.fromJson(modifyResult.getData(), WxMaSetWebviewDomainResult.class); + result.setErrorCode(domainResult.getErrcode()); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(domainResult.getErrcode())); + result.setData(domainResult); return result; } From 3811356b05ce7c244670e0398f036e15296906c2 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 16:23:13 +0800 Subject: [PATCH 06/17] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 250b240692..4bd3602a2f 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.124 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.125 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 6149dc735d..9bf16b4e2d 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.124 + 0.0.125 com.epmet From 5206cc98dfb657471a539566cb732bb45ed390e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 13 Aug 2020 16:47:37 +0800 Subject: [PATCH 07/17] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=20=E6=9B=B4=E6=96=B0=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserResiInfoServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index c3d4efaca1..fd7b3a0072 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -193,6 +193,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Thu, 13 Aug 2020 16:52:31 +0800 Subject: [PATCH 08/17] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9B=9E=E9=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/CodeController.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java index 01014d7564..cdaa2a6742 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java @@ -232,11 +232,24 @@ public class CodeController { return new Result().ok(result); } + /** + * 版本回退 + * @author zhaoqifeng + * @date 2020/8/13 16:51 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ @PostMapping("speedupaudit") public Result speedUpAudit(@RequestBody CodeCommonFormDTO formDTO) { codeService.speedUpAudit(formDTO); return new Result<>(); } + @PostMapping("revertcoderelease") + public Result revertCodeRelease(@RequestBody CodeCommonFormDTO formDTO) { + codeService.revertCodeRelease(formDTO); + return new Result<>(); + } + } From abf62739693d6e2cf8044969cb4aa3e2edc710bf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 16:53:42 +0800 Subject: [PATCH 09/17] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 4bd3602a2f..6bc39da836 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.125 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.126 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index 9bf16b4e2d..f8a5371837 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.125 + 0.0.126 com.epmet From b24045f383a72f1010db0825c5e8c92d6106a710 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 16:56:50 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E4=BB=8Euser=5Fcustomer=E6=9F=A5=E8=AF=A2(=E9=A6=96?= =?UTF-8?q?=E6=AC=A1=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A[=E9=9D=9E=E9=A6=96=E6=AC=A1]=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91Id)=E6=94=B9=E6=88=90=E4=BB=8Eregister=5Frela?= =?UTF-8?q?tion=E6=9F=A5=E8=AF=A2(=E9=A6=96=E6=AC=A1=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=B1=85=E6=B0=91Id=E4=BB=A5=E5=8F=8A[=E9=9D=9E=E9=A6=96?= =?UTF-8?q?=E6=AC=A1]=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91Id)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/GridLatestServiceImpl.java | 10 +++++----- .../src/main/resources/mapper/GridLatestDao.xml | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java index 051666a7cc..46bd30dfff 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java @@ -190,12 +190,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl getCustomerUsers(CustomerUserFormDTO customerUserFormDTO) { - - List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); List allData = new LinkedList<>(); - if(null == userIds || userIds.isEmpty()){ - return allData; - } + List userIds = baseDao.selectAllUserByCustomerId(customerUserFormDTO.getCustomerId()); + if(null == userIds) userIds = new LinkedList<>(); CommonCustomerFormDTO customerParam = new CommonCustomerFormDTO(); customerParam.setCustomerId(customerUserFormDTO.getCustomerId()); Result> volunteer = epmetHeartOpenFeignClient.volunteerUserIds(customerParam); @@ -203,6 +200,9 @@ public class GridLatestServiceImpl extends BaseServiceImpl From 4cf31f07c8176129c279aabba6f2c73c6150966b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 17:05:26 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20+=201?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 614297ad11..60fb75bf2c 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.115 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.116 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index c97c10d46f..a1575aa794 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.115 + 0.3.116 com.epmet epmet-user From 391618f6b9750a7f9441c86c98e60ac2b0f03372 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:28:57 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/CodeAuditResultDao.java | 5 +++-- .../com/epmet/service/CodeAuditResultService.java | 5 +++-- .../service/impl/CodeAuditResultServiceImpl.java | 4 ++-- .../com/epmet/service/impl/CodeServiceImpl.java | 3 ++- .../db/migration/V0.0.7__thirdUpdate.sql | 5 +++++ .../main/resources/mapper/CodeAuditResultDao.xml | 15 +++++++++++---- 6 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java index 691f8cd708..a72e0756b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeAuditResultDao.java @@ -46,10 +46,11 @@ public interface CodeAuditResultDao extends BaseDao { * 获取审核失败列表 * @author zhaoqifeng * @date 2020/8/5 11:11 - * @param codeId + * @param customerId + * @param clientType * @return java.util.List */ - List selectAuditFailedList(@Param("codeId") String codeId); + List selectAuditFailedList(@Param("customerId") String customerId, @Param("clientType") String clientType); /** * @Description 更新 代码审核结果中的审核状态 diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java index 9fff9570dd..4ecb436796 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeAuditResultService.java @@ -106,10 +106,11 @@ public interface CodeAuditResultService extends BaseService getAuditFailedList(String codeId); + List getAuditFailedList(String customerId, String clientType); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java index dfcd1cb87c..534aba66b4 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeAuditResultServiceImpl.java @@ -107,8 +107,8 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl getAuditFailedList(String codeId) { - return baseDao.selectAuditFailedList(codeId); + public List getAuditFailedList(String customerId, String clientType) { + return baseDao.selectAuditFailedList(customerId, clientType); } } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 216330a6e3..ce3a43181d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java @@ -420,7 +420,8 @@ public class CodeServiceImpl implements CodeService { throw new RenException("未授权"); } //获取审核结果信息 - List codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCodeId()); + List codeAuditResultList = codeAuditResultService.getAuditFailedList(codeCustomerDTO.getCustomerId(), + codeCustomerDTO.getClientType()); codeAuditResultList.forEach(dto -> { ReasonResultDTO result = new ReasonResultDTO(); result.setReason(dto.getReason()); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql new file mode 100644 index 0000000000..6cf941f4ee --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql @@ -0,0 +1,5 @@ +alter table code_audit_result add FEEDBACK_INFO varchar(255) NULL comment '反馈内容' after SCREEN_SHOT_URL; +alter table code_audit_result add FEEDBACK_STUFF tinytext NULL comment '反馈素材' after FEEDBACK_INFO; + + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml index 7fdba9ef6f..2c3146763a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeAuditResultDao.xml @@ -22,10 +22,17 @@ ORDER BY CREATED_TIME DESC From 9b4b4a49f0ab4123ecd1d88c3944b8a60abf9a64 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:30:28 +0800 Subject: [PATCH 13/17] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 6bc39da836..4dcb903831 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.126 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.127 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index f8a5371837..ad595a9de5 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.126 + 0.0.127 com.epmet From cd5f14f8b6749213538185c9a18299ffd35b7b7b Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 17:40:33 +0800 Subject: [PATCH 14/17] =?UTF-8?q?heart=E6=A8=A1=E5=9D=97=20=20feign?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index acfd546f9f..267de1b18d 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -16,7 +16,7 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:25 */ -@FeignClient(name = ServiceConstant.EPMET_POINT_SERVER, fallback = EpmetHeartOpenFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPMET_HEART_SERVER, fallback = EpmetHeartOpenFeignClientFallback.class) public interface EpmetHeartOpenFeignClient { /** From 7d390859bdb4c4e377cb2ae3ce55edf501930fb7 Mon Sep 17 00:00:00 2001 From: wangchao Date: Thu, 13 Aug 2020 17:43:13 +0800 Subject: [PATCH 15/17] heart +1 --- .../epmet-heart-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-heart/epmet-heart-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index ba3776d6fe..e931198209 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.50 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.51 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 5b2fef6ae2..f13e5cefd5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.50 + 0.0.51 com.epmet epmet-heart From 16dbdfbad17b06aa67fedd85611a2dc44674e2ef Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:51:30 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E8=84=9A=E6=9C=AC=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{V0.0.7__thirdUpdate.sql => V0.0.8__thirdUpdate.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/{V0.0.7__thirdUpdate.sql => V0.0.8__thirdUpdate.sql} (100%) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.8__thirdUpdate.sql similarity index 100% rename from epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.7__thirdUpdate.sql rename to epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.8__thirdUpdate.sql From 33d2e142ff4c92196ff3ce457f087b98fcbb0a82 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 13 Aug 2020 17:55:14 +0800 Subject: [PATCH 17/17] =?UTF-8?q?third=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-third-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-third/epmet-third-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml index 4dcb903831..82959467c7 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.127 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.128 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index ad595a9de5..1db077dd4f 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.127 + 0.0.128 com.epmet