From 91963e50725d00affc7f4aa13fd5bf4da4ade8ca Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 5 Aug 2020 15:51:39 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=EF=BC=9Aheart?= =?UTF-8?q?39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index b3b8fecd49..6d1bf3366b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.38 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.39 ports: - "8111:8111" network_mode: host # 使用现有网络 From e04bfd4be5852012f20c1ccb47e8502d92d6be27 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 5 Aug 2020 16:44:50 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=EF=BC=9Aheart?= =?UTF-8?q?40?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 6d1bf3366b..4a381aad89 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.39 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.40 ports: - "8111:8111" network_mode: host # 使用现有网络 From 9846c9108d6ebdb50365d7f8c8f736e8f9bcbd43 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 5 Aug 2020 17:48:23 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E6=9C=80=E4=BD=8E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/CodeAuditResultDTO.java | 2 + .../epmet/dto/form/CustomerClientFormDTO.java | 18 ++++ .../com/epmet/dto/result/ReasonResultDTO.java | 4 + .../dto/result/SupportVersionResultDTO.java | 40 ++++++++ .../com/epmet/controller/CodeController.java | 6 +- .../controller/PaCustomerController.java | 31 +++++- .../com/epmet/dao/CodeAuditResultDao.java | 11 +++ .../epmet/dao/CodeOperationHistoryDao.java | 2 + .../epmet/entity/CodeAuditResultEntity.java | 3 + .../epmet/service/CodeAuditResultService.java | 10 ++ .../service/CodeOperationHistoryService.java | 5 +- .../java/com/epmet/service/CodeService.java | 3 +- .../com/epmet/service/PaCustomerService.java | 18 ++++ .../impl/CodeAuditResultServiceImpl.java | 5 + .../impl/CodeOperationHistoryServiceImpl.java | 4 +- .../epmet/service/impl/CodeServiceImpl.java | 95 ++++++++++++++----- .../service/impl/PaCustomerServiceImpl.java | 50 ++++++++++ .../param/WxSetWeAppSupportVersionReq.java | 19 ++++ .../wxapi/result/WxSupportVersionResult.java | 58 +++++++++++ .../epmet/wxapi/service/WxMaCodeService.java | 43 ++++++--- .../service/impl/WxMaCodeServiceImpl.java | 37 +++++++- .../src/main/resources/bootstrap.yml | 15 ++- .../db/migration/V0.0.5__thirdUpdate.sql | 1 + .../resources/mapper/CodeAuditResultDao.xml | 7 ++ .../mapper/CodeOperationHistoryDao.xml | 11 +++ 25 files changed, 445 insertions(+), 53 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CustomerClientFormDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SupportVersionResultDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxSetWeAppSupportVersionReq.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxSupportVersionResult.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.5__thirdUpdate.sql 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 880e646668..a79140593e 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,6 +68,8 @@ public class CodeAuditResultDTO implements Serializable { */ private String screenShot; + private String screenShotUrl; + /** * 乐观锁 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CustomerClientFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CustomerClientFormDTO.java new file mode 100644 index 0000000000..35bc80c075 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/CustomerClientFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/5 16:28 + */ +@Data +public class CustomerClientFormDTO implements Serializable { + private static final long serialVersionUID = -7557372702358069962L; + private String customerId; + private String clientType; + private String version; +} 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 82223d583a..e2d9d1c2ad 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,4 +23,8 @@ public class ReasonResultDTO implements Serializable { * 失败的小程序截图url */ private List screenshotUrl; + /** + * 提交审核时间 + */ + private String auditTime; } diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SupportVersionResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SupportVersionResultDTO.java new file mode 100644 index 0000000000..6a75b4972c --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/SupportVersionResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/5 16:25 + */ +@NoArgsConstructor +@Data +public class SupportVersionResultDTO implements Serializable { + + private static final long serialVersionUID = -8730772183416898738L; + /** + * 当前版本 + */ + private String newVersion; + /** + * 版本的用户占比列表 + */ + private List uvInfo; + + @NoArgsConstructor + @Data + public static class UvInfoBean { + /** + * 百分比 + */ + private int percentage; + /** + * 基础库版本号 + */ + private String version; + } +} 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 b7fd36db66..36e561394e 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 @@ -131,9 +131,9 @@ public class CodeController { * @date 2020/7/14 17:52 */ @PostMapping("reason") - public Result reason(@RequestBody CodeCommonFormDTO formDTO) { - ReasonResultDTO resultDTO = codeService.reason(formDTO); - return new Result().ok(resultDTO); + public Result> reason(@RequestBody CodeCommonFormDTO formDTO) { + List resultDTO = codeService.reason(formDTO); + return new Result>().ok(resultDTO); } /** diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java index 26ad711e95..cbff84f9e3 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java @@ -6,10 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.form.CreateAgencyFormDTO; -import com.epmet.dto.form.RegisterByAuthFormDTO; -import com.epmet.dto.form.RegisterFormDTO; -import com.epmet.dto.form.RegisterInfoFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -131,4 +128,30 @@ public class PaCustomerController { return new Result>().ok( paCustomerService.registerByAuth(formDTO)); } + + /** + * 获取小程序基础库版本 + * @author zhaoqifeng + * @date 2020/8/5 16:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping(value = "getweappsupportversion") + public Result getSupportVersion( @RequestBody CustomerClientFormDTO formDTO) { + return new Result().ok( paCustomerService.getSupportVersion(formDTO)); + } + + /** + * 设置最低基础库版本 + * @author zhaoqifeng + * @date 2020/8/5 16:55 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping(value = "setweappsupportversion") + public Result setSupportVersion( @RequestBody CustomerClientFormDTO formDTO) { + paCustomerService.getSupportVersion(formDTO); + return new Result(); + } + } 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 6ead2846d6..691f8cd708 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 @@ -23,6 +23,8 @@ import com.epmet.entity.CodeAuditResultEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + /** * 代码审核结果 * @@ -40,6 +42,15 @@ public interface CodeAuditResultDao extends BaseDao { */ CodeAuditResultDTO selectAuditResultByCodeId(@Param("codeId") String codeId); + /** + * 获取审核失败列表 + * @author zhaoqifeng + * @date 2020/8/5 11:11 + * @param codeId + * @return java.util.List + */ + List selectAuditFailedList(@Param("codeId") String codeId); + /** * @Description 更新 代码审核结果中的审核状态 * @param customerId diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeOperationHistoryDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeOperationHistoryDao.java index f624c2212e..c7e7f05aee 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeOperationHistoryDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/CodeOperationHistoryDao.java @@ -36,6 +36,8 @@ public interface CodeOperationHistoryDao extends BaseDao selectHistoryList(@Param("customerId") String customerId, @Param("clientType") String clientType); + List selectHistoryListByCode(@Param("codeId") String codeId); + /** * 更新描述 * @author zhaoqifeng 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 69d7b4b775..8ad218032f 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 @@ -68,4 +68,7 @@ public class CodeAuditResultEntity extends BaseEpmetEntity { */ private String screenShot; + private String screenShotUrl; + + } 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 5f93c4031e..9fff9570dd 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 @@ -102,4 +102,14 @@ public interface CodeAuditResultService extends BaseService getAuditFailedList(String codeId); } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java index 7f0ba1752c..094baed605 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeOperationHistoryService.java @@ -98,11 +98,10 @@ public interface CodeOperationHistoryService extends BaseService getHistoryList(String customerId, String clientType); + List getHistoryList(String codeId); /** * 更新描述 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 2993445932..cdd7123ade 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 @@ -89,7 +89,7 @@ public interface CodeService { * @author zhaoqifeng * @date 2020/7/16 9:38 */ - ReasonResultDTO reason(CodeCommonFormDTO formDTO); + List reason(CodeCommonFormDTO formDTO); /** * 获取体验版二维码 @@ -138,4 +138,5 @@ public interface CodeService { * @return java.util.List */ List getCategory(CodeCommonFormDTO formDTO); + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java index b08f4aead1..fec268261b 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/PaCustomerService.java @@ -168,4 +168,22 @@ public interface PaCustomerService extends BaseService { * @Description 修改各业务表customerId(兼容党群e事通已上线客户，将已有客户Id同步到第三方问题) **/ void modifyCustomer(ModifyCustomerFormDTO formDTO); + + /** + * 获取小程序基础库版本 + * @author zhaoqifeng + * @date 2020/8/5 16:57 + * @param formDTO + * @return com.epmet.dto.result.SupportVersionResultDTO + */ + SupportVersionResultDTO getSupportVersion(CustomerClientFormDTO formDTO); + + /** + * 设置最低基础库版本 + * @author zhaoqifeng + * @date 2020/8/5 16:57 + * @param formDTO + * @return void + */ + void setSupportVersion(CustomerClientFormDTO formDTO); } \ 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 8898ed569f..dfcd1cb87c 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 @@ -106,4 +106,9 @@ public class CodeAuditResultServiceImpl extends BaseServiceImpl getAuditFailedList(String codeId) { + return baseDao.selectAuditFailedList(codeId); + } + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java index c50199c644..c75f01637f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeOperationHistoryServiceImpl.java @@ -103,8 +103,8 @@ public class CodeOperationHistoryServiceImpl extends BaseServiceImpl getHistoryList(String customerId, String clientType) { - return baseDao.selectHistoryList(customerId, clientType); + public List getHistoryList(String codeId) { + return baseDao.selectHistoryListByCode(codeId); } @Override 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 9913399fac..836261721b 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 @@ -23,6 +23,7 @@ import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; @@ -165,12 +166,26 @@ public class CodeServiceImpl implements CodeService { codeCustomerDTO.setStatus(CodeConstant.UNAUDITED); String codeId = codeCustomerService.save(codeCustomerDTO); + //设置服务器域名 + wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg()); + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + //设置业务域名 + wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg()); + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + saveOperation(formDTO.getCustomerId(), codeId, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, "上传成功"); } @Override public PageData uploadList(UploadListFormDTO formDTO) { List auditingList = codeCustomerService.getAuditingCodeList(formDTO.getSource()); + String customerId = formDTO.getCustomerId(); if (null != auditingList && auditingList.size() > NumConstant.ZERO) { auditingList.forEach(code -> { //获取小程序调用令牌 @@ -186,18 +201,18 @@ public class CodeServiceImpl implements CodeService { if (result.getStatus() == NumConstant.ZERO) { code.setStatus(CodeConstant.AUDIT_SUCCESS); auditResult.setResult(CodeConstant.AUDIT_SUCCESS); - saveOperation(formDTO.getCustomerId(), code.getId(), code.getUserVersion(), CodeConstant.OPER_SUCCESS, "审核成功"); + saveOperation(customerId, code.getId(), code.getUserVersion(), CodeConstant.OPER_SUCCESS, "审核成功"); } else if (result.getStatus() == NumConstant.ONE) { code.setStatus(CodeConstant.AUDIT_FAILED); auditResult.setResult(CodeConstant.AUDIT_FAILED); auditResult.setReason(result.getReason()); auditResult.setScreenShot(result.getScreenshot()); - saveOperation(formDTO.getCustomerId(), code.getId(), code.getUserVersion(), CodeConstant.OPER_FAILED, result.getReason()); + saveOperation(customerId, code.getId(), code.getUserVersion(), CodeConstant.OPER_FAILED, result.getReason()); } else if (result.getStatus() == NumConstant.FOUR) { code.setStatus(CodeConstant.DELAY); auditResult.setResult(CodeConstant.DELAY); auditResult.setReason(result.getReason()); - saveOperation(formDTO.getCustomerId(), code.getId(), code.getUserVersion(), CodeConstant.OPER_DELAY, result.getReason()); + saveOperation(customerId, code.getId(), code.getUserVersion(), CodeConstant.OPER_DELAY, result.getReason()); } codeCustomerService.update(code); codeAuditResultService.update(auditResult); @@ -246,9 +261,13 @@ public class CodeServiceImpl implements CodeService { codeAuditResultDTO.setResult(CodeConstant.AUDITING); codeAuditResultService.save(codeAuditResultDTO); } else { + codeAuditResultService.deleteById(codeAuditResultDTO.getId()); + codeAuditResultDTO = new CodeAuditResultDTO(); + codeAuditResultDTO.setCustomerId(codeCustomerDTO.getCustomerId()); + codeAuditResultDTO.setCodeId(codeCustomerDTO.getId()); codeAuditResultDTO.setAuditId(wxResult.getData()); codeAuditResultDTO.setResult(CodeConstant.AUDITING); - codeAuditResultService.update(codeAuditResultDTO); + codeAuditResultService.save(codeAuditResultDTO); } //更新代码表状态 codeCustomerDTO.setStatus(CodeConstant.AUDITING); @@ -333,8 +352,9 @@ public class CodeServiceImpl implements CodeService { } @Override - public ReasonResultDTO reason(CodeCommonFormDTO formDTO) { - ReasonResultDTO result = new ReasonResultDTO(); + public List reason(CodeCommonFormDTO formDTO) { + List resultList = new ArrayList<>(); + //获取上传代码信息 CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); //是否授权 @@ -346,25 +366,48 @@ public class CodeServiceImpl implements CodeService { throw new RenException("未授权"); } //获取审核结果信息 - CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId()); - result.setReason(codeAuditResultDTO.getReason()); - String[] mediaIds = codeAuditResultDTO.getScreenShot().split("[|]"); - List mediaIdList = new ArrayList<>(mediaIds.length); - Collections.addAll(mediaIdList, mediaIds); - List urlList = new ArrayList<>(); - mediaIdList.forEach(mediaId -> { - //调用微信API获取素材 - WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq(); - request.setAuditId(codeAuditResultDTO.getAuditId()); - WxMaNewsReq wxMaNewsReq = new WxMaNewsReq(); - wxMaNewsReq.setMediaId(mediaId); - WxResult wxAuditResult = wxMaCodeService.getMaterial(authInfo.getAuthorizerAccessToken(), wxMaNewsReq); - MultipartFile file = new MockMultipartFile("file", "QRCode.jpg", "image/jpeg", wxAuditResult.getData()); - Result uploadResult = ossFeignClient.uploadQrCode(file); - urlList.add(uploadResult.getData().getUrl()); + List codeAuditResultList = codeAuditResultService.getAuditFailedList(formDTO.getCodeId()); + codeAuditResultList.forEach(dto -> { + ReasonResultDTO result = new ReasonResultDTO(); + result.setReason(dto.getReason()); + result.setAuditTime(DateUtils.format(dto.getCreatedTime(), DateUtils.DATE_TIME_PATTERN)); + if (StringUtils.isBlank(dto.getScreenShotUrl())) { + List urlList = new ArrayList<>(); + if(StringUtils.isNotBlank(dto.getScreenShot())) { + String[] mediaIds = dto.getScreenShot().split("[|]"); + List mediaIdList = new ArrayList<>(mediaIds.length); + Collections.addAll(mediaIdList, mediaIds); + String screenShotUrl = ""; + for(String mediaId : mediaIdList) { + //调用微信API获取素材 + WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq(); + request.setAuditId(dto.getAuditId()); + WxMaNewsReq wxMaNewsReq = new WxMaNewsReq(); + wxMaNewsReq.setMediaId(mediaId); + WxResult wxAuditResult = wxMaCodeService.getMaterial(authInfo.getAuthorizerAccessToken(), wxMaNewsReq); + MultipartFile file = new MockMultipartFile("file", "QRCode.jpg", "image/jpeg", wxAuditResult.getData()); + Result uploadResult = ossFeignClient.uploadQrCode(file); + urlList.add(uploadResult.getData().getUrl()); + if (StringUtils.isBlank(screenShotUrl)) { + screenShotUrl = uploadResult.getData().getUrl(); + } else { + screenShotUrl = screenShotUrl + "|" + uploadResult.getData().getUrl(); + } + } + dto.setScreenShotUrl(screenShotUrl); + codeAuditResultService.update(dto); + } + result.setScreenshotUrl(urlList); + } else { + String[] url = dto.getScreenShotUrl().split("[|]"); + List urlList = new ArrayList<>(url.length); + Collections.addAll(urlList, url); + result.setScreenshotUrl(urlList); + } + resultList.add(result); }); - result.setScreenshotUrl(urlList); - return result; + + return resultList; } @Override @@ -400,8 +443,8 @@ public class CodeServiceImpl implements CodeService { public PageData history(CodeCommonFormDTO formDTO) { PageHelper.startPage(formDTO.getPage(), formDTO.getLimit()); //获取上传代码信息 - CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); - List list = codeOperationHistoryService.getHistoryList(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType()); +// CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId()); + List list = codeOperationHistoryService.getHistoryList(formDTO.getCodeId()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java index 09c2429eba..3e2f971062 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaCustomerServiceImpl.java @@ -31,6 +31,7 @@ import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.CpUserDetailRedis; +import com.epmet.constant.CodeConstant; import com.epmet.constant.PaConstant; import com.epmet.dao.*; import com.epmet.dto.*; @@ -42,6 +43,10 @@ import com.epmet.service.CustomerMpService; import com.epmet.service.PaCustomerAgencyService; import com.epmet.service.PaCustomerService; import com.epmet.service.PaCustomerUserAgencyService; +import com.epmet.wxapi.param.WxSetWeAppSupportVersionReq; +import com.epmet.wxapi.result.WxResult; +import com.epmet.wxapi.result.WxSupportVersionResult; +import com.epmet.wxapi.service.WxMaCodeService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; @@ -92,6 +97,10 @@ public class PaCustomerServiceImpl extends BaseServiceImpl page(Map params) { @@ -546,4 +555,45 @@ public class PaCustomerServiceImpl extends BaseServiceImpl wxResult = wxMaCodeService.getWeAppSupportVersion(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + WxSupportVersionResult versionResult = wxResult.getData(); + result.setNewVersion(versionResult.getNowVersion()); + List list = new ArrayList<>(); + versionResult.getUvInfo().getItems().forEach(item -> { + SupportVersionResultDTO.UvInfoBean uvInfo = new SupportVersionResultDTO.UvInfoBean(); + uvInfo.setPercentage(item.getPercentage()); + uvInfo.setVersion(item.getVersion()); + list.add(uvInfo); + }); + result.setUvInfo(list); + return result; + } + + @Override + public void setSupportVersion(CustomerClientFormDTO formDTO) { + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType()); + if (null == authInfo) { + throw new RenException("未授权"); + } + //调用微信API + WxSetWeAppSupportVersionReq request = new WxSetWeAppSupportVersionReq(); + request.setVersion(formDTO.getVersion()); + WxResult wxResult = wxMaCodeService.setWeAppSupportVersion(authInfo.getAuthorizerAccessToken(), request); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + } + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxSetWeAppSupportVersionReq.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxSetWeAppSupportVersionReq.java new file mode 100644 index 0000000000..e316eea051 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxSetWeAppSupportVersionReq.java @@ -0,0 +1,19 @@ +package com.epmet.wxapi.param; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/5 16:04 + */ +@Data +public class WxSetWeAppSupportVersionReq implements Serializable { + private static final long serialVersionUID = 3665790223442056698L; + /** + * 已发布的基础库版本号 + */ + private String version; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxSupportVersionResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxSupportVersionResult.java new file mode 100644 index 0000000000..f15ab9f48b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxSupportVersionResult.java @@ -0,0 +1,58 @@ +package com.epmet.wxapi.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/5 15:55 + */ +@NoArgsConstructor +@Data +public class WxSupportVersionResult implements Serializable { + + private static final long serialVersionUID = 6399585321399172945L; + /** + * 错误码 + */ + private Integer errcode; + /** + * 错误信息 + */ + private String errmsg; + /** + * 当前版本 + */ + private String nowVersion; + /** + * 版本的用户占比列表 + */ + private UvInfoBean uvInfo; + + public boolean success(){ + return errcode == 0; + } + + @NoArgsConstructor + @Data + public static class UvInfoBean { + private List items; + + @NoArgsConstructor + @Data + public static class ItemsBean { + /** + * 百分比 + */ + private int percentage; + /** + * 基础库版本号 + */ + private String version; + } + } +} 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 b71f9b4c66..6f41f29539 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 @@ -1,9 +1,6 @@ package com.epmet.wxapi.service; -import com.epmet.wxapi.param.WxMaCodeAuditStatusReq; -import com.epmet.wxapi.param.WxMaCodeCommitReq; -import com.epmet.wxapi.param.WxMaCodeSubmitAuditRequest; -import com.epmet.wxapi.param.WxMaNewsReq; +import com.epmet.wxapi.param.*; import com.epmet.wxapi.result.*; import java.io.File; @@ -113,31 +110,55 @@ public interface WxMaCodeService { WxResult getMaterial(String accessToken, WxMaNewsReq request); /** - * 设置服务器郁闷 - * @author zhaoqifeng - * @date 2020/7/16 17:21 + * 设置服务器域名 + * * @param accessToken * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/7/16 17:21 */ WxResult modifyDomain(String accessToken); /** * 设置业务域名 - * @author zhaoqifeng - * @date 2020/7/16 17:22 + * * @param accessToken * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/7/16 17:22 */ WxResult setWebviewDomain(String accessToken); /** * 上传临时素材 - * @author zhaoqifeng - * @date 2020/7/17 10:27 + * * @param accessToken * @param type * @param file * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/7/17 10:27 */ WxResult uploadMedia(String accessToken, String type, File file); + + /** + * 查询当前设置的最低基础库版本及各版本用户占比 + * + * @param accessToken + * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/8/5 16:02 + */ + WxResult getWeAppSupportVersion(String accessToken); + + /** + * 设置最低基础库版本 + * + * @param accessToken + * @param request + * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/8/5 16:06 + */ + WxResult setWeAppSupportVersion(String accessToken, WxSetWeAppSupportVersionReq request); } 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 7b09a3e440..1f92c3b1fd 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 @@ -16,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.io.File; -import java.io.InputStream; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -273,6 +272,42 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { return result; } + @Override + public WxResult getWeAppSupportVersion(String accessToken) { + WxResult result = new WxResult<>(); + String url = WxMaCodeConstant.GET_SUPPORT_VERSION_URL + "?" + "access_token=" + accessToken; + Result statusResult = HttpClientManager.getInstance().sendPostByJSON(url, null); + if (!statusResult.success()) { + result.setErrorCode(statusResult.getCode()); + result.setErrorMsg(statusResult.getMsg()); + return result; + } + WxSupportVersionResult supportVersionResult = JSONObject.parseObject(statusResult.getData(), WxSupportVersionResult.class); + if (!supportVersionResult.success()) { + result.setErrorCode(supportVersionResult.getErrcode()); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(supportVersionResult.getErrcode())); + return result; + } + result.ok(supportVersionResult); + return result; + } + + @Override + public WxResult setWeAppSupportVersion(String accessToken, WxSetWeAppSupportVersionReq request) { + WxResult result = new WxResult(); + String url = WxMaCodeConstant.SET_SUPPORT_VERSION_URL + "?" + "access_token=" + accessToken; + Result setVersionResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request)); + if (!setVersionResult.success()) { + result.setErrorCode(setVersionResult.getCode()); + result.setErrorMsg(setVersionResult.getMsg()); + return result; + } + JSONObject jsonObject = JSONObject.parseObject(setVersionResult.getData()); + result.setErrorCode(jsonObject.getInteger(ERR_CODE)); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + return result; + } + private String toJson(Object object) { GsonBuilder gsonBuilder = new GsonBuilder(); gsonBuilder.setPrettyPrinting(); diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 82188b3697..d52b94a564 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -106,12 +106,23 @@ third: token: 1ae5f230c67f11eabac1c03fd56f7847 domain: requestDomain: + - https://apis.map.qq.com - https://epmet-cloud.elinkservice.cn + - https://epmet-dev.elinkservice.cn + - https://epmet-test.elinkservice.cn wsRequestDomain: - - https://epmet-cloud.elinkservice.cn + - wss://epmet-cloud.elinkservice.cn + - wss://epmet-dev.elinkservice.cn + - wss://epmet-test.elinkservice.cn uploadDomain: - https://epmet-cloud.elinkservice.cn + - https://epmet-dev.elinkservice.cn + - https://epmet-test.elinkservice.cn downloadDomain: - https://epmet-cloud.elinkservice.cn + - https://epmet-dev.elinkservice.cn + - https://epmet-test.elinkservice.cn webviewDomain: - - https://epmet-cloud.elinkservice.cn \ No newline at end of file + - udp://epmet-cloud.elinkservice.cn + - udp://epmet-dev.elinkservice.cn + - udp://epmet-test.elinkservice.cn \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.5__thirdUpdate.sql b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.5__thirdUpdate.sql new file mode 100644 index 0000000000..cb25e83685 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/db/migration/V0.0.5__thirdUpdate.sql @@ -0,0 +1 @@ +alter table code_audit_result add SCREEN_SHOT_URL tinytext NULL comment '失败截图地址' after SCREEN_SHOT; \ No newline at end of file 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 995aff00b0..7fdba9ef6f 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 @@ -19,6 +19,13 @@ + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeOperationHistoryDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeOperationHistoryDao.xml index e3082547af..6f0d321af7 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeOperationHistoryDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeOperationHistoryDao.xml @@ -36,6 +36,17 @@ AND cc.CLIENT_TYPE = #{clientType} ORDER BY coh.CREATED_TIME DESC + \ No newline at end of file From 5fd5f3d885199553a26a8370781a777ab6e34547 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 5 Aug 2020 17:55:41 +0800 Subject: [PATCH 04/15] =?UTF-8?q?auth=E3=80=81third=E3=80=81gov-org?= =?UTF-8?q?=E3=80=81oper-crm=E3=80=81resi-guide=E3=80=81resi-mine=E6=9C=8D?= =?UTF-8?q?=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-auth/deploy/docker-compose-test.yml | 2 +- .../epmet-third-server/deploy/docker-compose-test.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-test.yml | 2 +- .../oper-crm/oper-crm-server/deploy/docker-compose-test.yml | 2 +- .../resi-guide/resi-guide-server/deploy/docker-compose-test.yml | 2 +- .../resi-mine/resi-mine-server/deploy/docker-compose-test.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index 2f062fe8a3..3f4980855e 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/epmet-auth/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.67 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.68 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml index 6df1062901..317ce1d01d 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.100 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.105 ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index 35418ce4aa..a7c713d4f3 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.80 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.81 ports: - "8092:8092" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml index 19896e77f4..ca375b4fc1 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.63 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/oper-crm-server:0.3.64 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml index 0504afe0e9..581215f95a 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.19 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-guide-server:0.3.20 ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml index 664549415c..52cf5df96b 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.37 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-mine-server:0.3.38 ports: - "8094:8094" network_mode: host # 使用现有网络 From 0b1d2a4de87bf0e02060a71eedeb8e98af2deb68 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 6 Aug 2020 09:17:22 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=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/constant/ModuleConstant.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java index bdf4ea37bb..17bb891ece 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/ModuleConstant.java @@ -91,7 +91,7 @@ public interface ModuleConstant { String FROM_CALLBACK = "from_callback"; String APPLICATION_JSON = "application/json"; String _FROM_API = "_from_api"; - String WE_APP_AUDIT = "we_app_audit"; + String WE_APP_AUDIT = "weapp_audit"; String TO_USER_NAME = "ToUserName"; String FROM_USER_NAME = "FromUserName"; From 0e25add2eb270cf7781bb28ab25ff397d76448f6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 6 Aug 2020 09:18:53 +0800 Subject: [PATCH 06/15] =?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 63f601776a..f22f3a06d8 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.105 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.106 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 43277ff9ff..ad077c1cf9 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.105 + 0.0.106 com.epmet From f6942827d734ae106ab3ed06aac08a26273d2db9 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 6 Aug 2020 09:34:29 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActInfoServiceImpl.java | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java index 2fc4a666cb..f2907b33d4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java @@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; @@ -399,14 +400,19 @@ public class ActInfoServiceImpl extends BaseServiceImpl().ok(resultDTO); } From 29846d2c35f042dc4efcffc132ce0c327c481103 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 6 Aug 2020 09:53:32 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=9E=E9=A1=BESQL?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ActInfoDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml index 17dbb6c169..889c170bae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml @@ -351,7 +351,7 @@ AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL AND i.CUSTOMER_ID = #{customerId} AND i.ACT_STATUS = 'finished' - GROUP BY r.ACT_ID + GROUP BY i.ID ORDER BY i.CREATED_TIME DESC LIMIT #{pageNo}, #{pageSize} @@ -721,7 +721,7 @@ AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL AND i.CUSTOMER_ID = #{customerId} AND i.ACT_STATUS = 'finished' - GROUP BY r.ACT_ID + GROUP BY i.ID ORDER BY i.CREATED_TIME DESC LIMIT 0, #{num} From cf236e9ee544bd41975686108c1f6535ffbc7e05 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 10:25:04 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=8A=A5=E5=90=8D=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=A1=AB=E5=86=99=E9=BB=98=E8=AE=A4=E6=97=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/constant/StrConstant.java | 2 ++ .../com/epmet/dto/form/work/PublishActInfoFormDTO.java | 3 +-- .../java/com/epmet/dto/form/work/RePublishFormDTO.java | 3 +-- .../com/epmet/service/impl/WorkActDraftServiceImpl.java | 7 ++++++- .../java/com/epmet/service/impl/WorkActServiceImpl.java | 6 ++++++ .../main/resources/db/migration/V0.0.2__updateactinfo.sql | 1 + 6 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index a05eac28c6..655635e6d7 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -75,4 +75,6 @@ public interface StrConstant { String EPMETY_STR=""; String NULL_STR="null"; + + String NOT_FILLED = "无"; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java index 5ded502bb2..fae068b230 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java @@ -120,8 +120,7 @@ public class PublishActInfoFormDTO implements Serializable { /** * 报名条件 */ - @NotBlank(message = "报名条件不能为空", groups = {AddUserShowGroup.class}) - @Length(min=1, max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) + @Length(max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) private String requirement; /** diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java index 06208c4564..dfd1aeed99 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java @@ -126,8 +126,7 @@ public class RePublishFormDTO implements Serializable { /** * 报名条件 */ - @NotBlank(message = "报名条件不能为空", groups = {AddUserShowGroup.class}) - @Length(min=1, max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) + @Length(max=500,message = "报名条件限500字以内", groups = {AddUserShowGroup.class}) private String requirement; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java index e622f5f9fb..da6a45db44 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActDraftServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.dto.LatestActContentDTO; @@ -182,7 +183,11 @@ public class WorkActDraftServiceImpl implements WorkActDraftService { latestActInfoDTO.setSignUpEndTime(signUpEndTime); } //招募要求 - latestActInfoDTO.setRequirement(formDTO.getRequirement()); + if(StringUtils.isNotBlank(formDTO.getRequirement())){ + latestActInfoDTO.setRequirement(formDTO.getRequirement()); + }else{ + latestActInfoDTO.setRequirement(StrConstant.NOT_FILLED); + } //活动预计开始时间 if(StringUtils.isNotBlank(formDTO.getActStartTime())){ Date actStartTime= DateUtils.minStrToSecondDate(formDTO.getActStartTime()); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java index 1936de361d..4656baf0ee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java @@ -332,6 +332,9 @@ public class WorkActServiceImpl implements WorkActService { }else{ actInfoEntity.setPid(StrConstant.EPMETY_STR); } + if(StringUtils.isBlank(actInfoEntity.getRequirement())){ + actInfoEntity.setRequirement(StrConstant.NOT_FILLED); + } return actInfoEntity; } @@ -375,6 +378,9 @@ public class WorkActServiceImpl implements WorkActService { }else{ actInfoEntity.setPid(StrConstant.EPMETY_STR); } + if(StringUtils.isBlank(actInfoEntity.getRequirement())){ + actInfoEntity.setRequirement(StrConstant.NOT_FILLED); + } return actInfoEntity; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql new file mode 100644 index 0000000000..e15cfae871 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.2__updateactinfo.sql @@ -0,0 +1 @@ +alter table act_info MODIFY column REQUIREMENT VARCHAR(512) DEFAULT '' COMMENT '招募要求'; \ No newline at end of file From 38dbec117348ddcb848f93da79080470500e4a0a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 10:26:28 +0800 Subject: [PATCH 10/15] =?UTF-8?q?130=EF=BC=9Aheart=3D>41?= 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 a74ba3bc3d..48b868b0ce 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.40 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.41 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 4e75ddecf8..7427d89f12 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.40 + 0.0.41 com.epmet epmet-heart From e35be4e1e9c962c399fe30808cf97c9a618c2537 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 10:33:42 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=EF=BC=9Aheart?= =?UTF-8?q?=3D>41?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-heart-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index 4a381aad89..a72e22e368 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.40 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.41 ports: - "8111:8111" network_mode: host # 使用现有网络 From dba5dfc1d968c87aa3d001ef1576d80da6ce8f6b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 10:49:15 +0800 Subject: [PATCH 12/15] =?UTF-8?q?130=EF=BC=8Cheart\point+1?= 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 +- .../epmet-heart-server/src/main/resources/bootstrap.yml | 2 +- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- .../epmet-point-server/src/main/resources/bootstrap.yml | 2 +- 6 files changed, 6 insertions(+), 6 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 a74ba3bc3d..48b868b0ce 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.40 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.41 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 4e75ddecf8..7427d89f12 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.40 + 0.0.41 com.epmet epmet-heart diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index fe8a9ba0d4..0ac5876e27 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -53,7 +53,7 @@ spring: # 数据迁移工具flyway flyway: - enabled: false + enabled: @spring.flyway.enabled@ locations: classpath:db/migration url: @datasource.druid.url@ user: @datasource.druid.username@ diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml index 40fdbfdc04..6b361f8660 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.33 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.34 ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 3fda51dcd7..162a3dd9ed 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.33 + 0.0.34 epmet-point com.epmet diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index 0f4b3289d7..720887f6bd 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -53,7 +53,7 @@ spring: # 数据迁移工具flyway flyway: - enabled: false + enabled: @spring.flyway.enabled@ locations: classpath:db/migration url: @datasource.druid.url@ user: @datasource.druid.username@ From 541139fb0d702b2c8c58b229d244a879e5d280db Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 11:01:53 +0800 Subject: [PATCH 13/15] 130heart42 --- .../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 48b868b0ce..44f6c63ac8 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.41 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.42 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 7427d89f12..0b24223812 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.41 + 0.0.42 com.epmet epmet-heart From 45763bcf94c5fb23d136e131f76304b9c206dd03 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 11:03:43 +0800 Subject: [PATCH 14/15] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=9C=8D?= =?UTF-8?q?=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-heart-server/deploy/docker-compose-test.yml | 2 +- .../epmet-point-server/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index a72e22e368..05632f1c83 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.41 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-heart-server:0.0.42 ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml index fa710c245b..1f8607180a 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-point-server:0.0.34 ports: - "8112:8112" network_mode: host # 使用现有网络 From 56b3bc4188f95d003f775958959f101d23efcd78 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 6 Aug 2020 11:16:47 +0800 Subject: [PATCH 15/15] flyway.enabledxiugai --- .../data-statistical-server/src/main/resources/bootstrap.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index f148ea791b..a475fa198f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -53,7 +53,7 @@ spring: # 数据迁移工具flyway flyway: - enabled: false + enabled: @spring.flyway.enabled@ locations: classpath:db/migration url: @datasource.druid.stats.url@ user: @datasource.druid.stats.username@