From acc6adcc84e3fb0811bbe433da6d3581dce78760 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 6 Aug 2020 15:55:50 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=8A=A0=E6=80=A5=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=9F=9F=E5=90=8D=EF=BC=8C=E5=B7=B2=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E7=B1=BB=E7=9B=AE=EF=BC=8C=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/SubmitAuditFormDTO.java | 5 + .../dto/result/AccountBasicInfoResultDTO.java | 129 ++++++++++++++++++ .../dto/result/GetCategoryResultDTO.java | 69 ++++++++++ .../dto/result/SupportVersionResultDTO.java | 2 +- .../com/epmet/controller/CodeController.java | 12 +- .../controller/PaCustomerController.java | 30 +++- .../com/epmet/dao/AuthorizationInfoDao.java | 9 ++ .../java/com/epmet/service/CodeService.java | 9 ++ .../com/epmet/service/PaCustomerService.java | 18 +++ .../epmet/service/impl/CodeServiceImpl.java | 44 ++++-- .../service/impl/PaCustomerServiceImpl.java | 39 +++++- .../wxapi/constant/WxMaCodeConstant.java | 13 ++ .../wxapi/param/WxMaSpeedUpAuditReq.java | 21 +++ .../epmet/wxapi/result/WxBasicInfoResult.java | 66 +++++++++ .../wxapi/result/WxOpenGetCategoryResult.java | 44 ++++++ .../wxapi/result/WxSupportVersionResult.java | 2 +- .../epmet/wxapi/service/WxMaCodeService.java | 30 ++++ .../service/impl/WxMaCodeServiceImpl.java | 59 ++++++++ .../resources/mapper/AuthorizationInfoDao.xml | 8 ++ .../service/impl/CustomerServiceImpl.java | 8 ++ 20 files changed, 595 insertions(+), 22 deletions(-) create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AccountBasicInfoResultDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaSpeedUpAuditReq.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java create mode 100644 epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxOpenGetCategoryResult.java diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java index 222250510f..9c2f1c506f 100644 --- a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/SubmitAuditFormDTO.java @@ -20,6 +20,11 @@ public class SubmitAuditFormDTO implements Serializable { */ private String codeId; + /** + * 是否加急 + */ + private Boolean isSpeed; + /** * 小程序版本说明和功能解释 */ diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AccountBasicInfoResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AccountBasicInfoResultDTO.java new file mode 100644 index 0000000000..4a6f221c8d --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/AccountBasicInfoResultDTO.java @@ -0,0 +1,129 @@ +package com.epmet.dto.result; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/6 10:50 + */ +@NoArgsConstructor +@Data +public class AccountBasicInfoResultDTO implements Serializable { + + private static final long serialVersionUID = -5111203845293330004L; + /** + * 帐号 appid + */ + @SerializedName("appid") + private String appid; + /** + * 帐号类型（1：订阅号，2：服务号，3：小程序） + */ + @SerializedName("account_type") + private Integer accountType; + /** + * 主体类型 0.个人 1.企业 2.媒体 3.政府 4.其他组织 + */ + @SerializedName("principal_type") + private Integer principalType; + /** + * 主体名称 + */ + @SerializedName("principal_name") + private String principalName; + /** + * 实名验证状态 1.实名验证成功 2.实名验证中 3.实名验证失败 + */ + @SerializedName("realname_status") + private Integer realnameStatus; + /** + * 微信认证信息 + */ + @SerializedName("wx_verify_info") + private WxVerifyInfoBean wxVerifyInfo; + /** + * 功能介绍信息 + */ + @SerializedName("signature_info") + private SignatureInfoBean signatureInfo; + /** + * 头像信息 + */ + @SerializedName("head_image_info") + private HeadImageInfoBean headImageInfo; + + @NoArgsConstructor + @Data + public static class WxVerifyInfoBean { + /** + * 是否资质认证，若是，拥有微信认证相关的权限。 + */ + @SerializedName("qualification_verify") + private Boolean qualificationVerify; + /** + * 是否名称认证 + */ + @SerializedName("naming_verify") + private Boolean namingVerify; + /** + * 是否需要年审（qualification_verify == true 时才有该字段） + */ + @SerializedName("annual_review") + private Boolean annualReview; + /** + * 年审开始时间，时间戳（qualification_verify == true 时才有该字段） + */ + @SerializedName("annual_review_begin_time") + private String annualReviewBeginTime; + /** + * 年审截止时间，时间戳（qualification_verify == true 时才有该字段） + */ + @SerializedName("annual_review_end_time") + private String annualReviewEndTime; + } + + @NoArgsConstructor + @Data + public static class SignatureInfoBean { + /** + * 功能介绍 + */ + @SerializedName("signature") + private String signature; + /** + * 功能介绍已使用修改次数（本月） + */ + @SerializedName("modify_used_count") + private Integer modifyUsedCount; + /** + * 功能介绍修改次数总额度（本月） + */ + @SerializedName("modify_quota") + private Integer modifyQuota; + } + + @NoArgsConstructor + @Data + public static class HeadImageInfoBean { + /** + * 头像 url + */ + @SerializedName("head_image_url") + private String headImageUrl; + /** + * 头像已使用修改次数（本月） + */ + @SerializedName("modify_used_count") + private Integer modifyUsedCount; + /** + * 头像修改次数总额度（本月） + */ + @SerializedName("modify_quota") + private Integer modifyQuota; + } +} diff --git a/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java new file mode 100644 index 0000000000..9dd7117852 --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/GetCategoryResultDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto.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/6 10:03 + */ +@NoArgsConstructor +@Data +public class GetCategoryResultDTO implements Serializable { + + private static final long serialVersionUID = -6803569581887971887L; + /** + * 一个更改周期内可以添加类目的次数 + */ + private Integer limit; + /** + * 本更改周期内还可以添加类目的次数 + */ + private Integer quota; + /** + * 最多可以设置的类目数量 + */ + private Integer categoryLimit; + /** + * 已设置的类目信息列表 + */ + private List categories; + + @NoArgsConstructor + @Data + public static class CategoriesBean { + /** + * 一级类目 ID + */ + private Integer first; + /** + * 一级类目名称 + */ + @SerializedName("first_name") + private String firstName; + /** + * 二级类目 ID + */ + private Integer second; + /** + * 二级类目名称 + */ + @SerializedName("second_name") + private String secondName; + /** + * 审核状态（1 审核中 2 审核不通过 3 审核通过） + */ + @SerializedName("audit_status") + private Integer auditStatus; + /** + * 审核不通过的原因 + */ + @SerializedName("audit_reason") + private String auditReason; + } +} 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 index 6a75b4972c..57092a3755 100644 --- 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 @@ -31,7 +31,7 @@ public class SupportVersionResultDTO implements Serializable { /** * 百分比 */ - private int percentage; + private Integer percentage; /** * 基础库版本号 */ 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 36e561394e..25cc536e72 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 @@ -6,10 +6,8 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.CodeService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -203,4 +201,10 @@ public class CodeController { List result = codeService.getCategory(formDTO); return new Result>().ok(result); } + + @PostMapping("setdomain/{customerId}") + public Result setDomain(@PathVariable("customerId") String customerId) { + codeService.setDomain(customerId); + return new Result<>(); + } } 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 cbff84f9e3..ef9f3d3425 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 @@ -137,7 +137,7 @@ public class PaCustomerController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping(value = "getweappsupportversion") - public Result getSupportVersion( @RequestBody CustomerClientFormDTO formDTO) { + public Result getSupportVersion(@RequestBody CustomerClientFormDTO formDTO) { return new Result().ok( paCustomerService.getSupportVersion(formDTO)); } @@ -149,9 +149,35 @@ public class PaCustomerController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping(value = "setweappsupportversion") - public Result setSupportVersion( @RequestBody CustomerClientFormDTO formDTO) { + public Result setSupportVersion(@RequestBody CustomerClientFormDTO formDTO) { paCustomerService.getSupportVersion(formDTO); return new Result(); } + + /** + * 获取已设置的所有类目 + * @author zhaoqifeng + * @date 2020/8/6 14:36 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping(value = "getcategory") + public Result getSetCategory(@RequestBody CustomerClientFormDTO formDTO) { + return new Result().ok(paCustomerService.getSetCategory(formDTO)); + } + + /** + * 获取基本信息 + * @author zhaoqifeng + * @date 2020/8/6 14:36 + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping(value = "getaccountbasicinfo") + public Result getAccountBasicInfo(@RequestBody CustomerClientFormDTO formDTO) { + return new Result().ok(paCustomerService.getAccountBasicInfo(formDTO)); + } + + } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java index 3d26bcffab..88ba820fba 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/dao/AuthorizationInfoDao.java @@ -90,4 +90,13 @@ public interface AuthorizationInfoDao extends BaseDao { */ AuthCodeResultDTO selectCustomerIdByAuthAppId(@Param("authAppId")String authAppId); + /** + * 根据客户ID，客户端类型获取授权信息 + * @author zhaoqifeng + * @date 2020/8/6 15:36 + * @param customerId + * @return java.util.List + */ + List getAuthInfoByCustomerId(@Param("customerId") String customerId); + } \ No newline at end of file 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 cdd7123ade..19928c70f6 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 @@ -139,4 +139,13 @@ public interface CodeService { */ List getCategory(CodeCommonFormDTO formDTO); + /** + * 设置服务器域名和业务域名 + * @author zhaoqifeng + * @date 2020/8/6 15:34 + * @param customerId + * @return int + */ + void setDomain(String customerId); + } 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 fec268261b..88259e13c9 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 @@ -186,4 +186,22 @@ public interface PaCustomerService extends BaseService { * @return void */ void setSupportVersion(CustomerClientFormDTO formDTO); + + /** + * 获取已设置的所有类目 + * @author zhaoqifeng + * @date 2020/8/6 14:36 + * @param formDTO + * @return com.epmet.dto.result.GetCategoryResultDTO + */ + GetCategoryResultDTO getSetCategory(CustomerClientFormDTO formDTO); + + /** + * 获取基本信息 + * @author zhaoqifeng + * @date 2020/8/6 14:36 + * @param formDTO + * @return com.epmet.dto.result.AccountBasicInfoResultDTO + */ + AccountBasicInfoResultDTO getAccountBasicInfo(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/CodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java index 836261721b..a922fbd20b 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 @@ -166,19 +166,6 @@ 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, "上传成功"); } @@ -250,6 +237,17 @@ public class CodeServiceImpl implements CodeService { wxResult.getErrorMsg()); throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); } + if(formDTO.getIsSpeed()) { + //调用微信API 加急审核 + WxMaSpeedUpAuditReq speedRequest = new WxMaSpeedUpAuditReq(); + speedRequest.setAuditId(wxResult.getData()); + WxResult wxSpeedResult = wxMaCodeService.speedUpAudit(authInfo.getAuthorizerAccessToken(), speedRequest); + if (!wxSpeedResult.success()) { + saveOperation(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getId(), codeCustomerDTO.getUserVersion(), CodeConstant.OPER_SUBMIT, + wxSpeedResult.getErrorMsg()); + throw new RenException(wxSpeedResult.getErrorCode(), wxSpeedResult.getErrorMsg()); + } + } //获取审核结果信息 CodeAuditResultDTO codeAuditResultDTO = codeAuditResultService.getAuditResultByCodeId(formDTO.getCodeId()); if (null == codeAuditResultDTO) { @@ -504,6 +502,26 @@ public class CodeServiceImpl implements CodeService { return ConvertUtils.sourceToTarget(wxResult.getData(), CategoryResultDTO.class); } + @Override + public void setDomain(String customerId) { + List authInfoList = authorizationInfoDao.getAuthInfoByCustomerId(customerId); + if (null == authInfoList || authInfoList.size() == NumConstant.ZERO) { + throw new RenException("没有有效的Access Token"); + } + authInfoList.forEach(authInfo -> { + //设置服务器域名 + WxResult wxResult = wxMaCodeService.modifyDomain(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + //设置业务域名 + wxResult = wxMaCodeService.setWebviewDomain(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + }); + } + private void saveOperation(String customerId, String codeId, String version, String operation, String describe) { CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO(); operationDTO.setCustomerId(customerId); 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 3e2f971062..806be0f664 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,7 +31,6 @@ 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.*; @@ -44,6 +43,8 @@ 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.WxBasicInfoResult; +import com.epmet.wxapi.result.WxOpenGetCategoryResult; import com.epmet.wxapi.result.WxResult; import com.epmet.wxapi.result.WxSupportVersionResult; import com.epmet.wxapi.service.WxMaCodeService; @@ -596,4 +597,40 @@ public class PaCustomerServiceImpl extends BaseServiceImpl wxResult = wxMaCodeService.getSetCategory(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + WxOpenGetCategoryResult categoryResult = wxResult.getData(); + result = ConvertUtils.sourceToTarget(categoryResult, GetCategoryResultDTO.class); + return result; + } + + @Override + public AccountBasicInfoResultDTO getAccountBasicInfo(CustomerClientFormDTO formDTO) { + //获取小程序调用令牌 + AccountBasicInfoResultDTO result; + AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType()); + if (null == authInfo) { + throw new RenException("未授权"); + } + //调用微信API + WxResult wxResult = wxMaCodeService.getAccountBasicInfo(authInfo.getAuthorizerAccessToken()); + if (!wxResult.success()) { + throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg()); + } + WxBasicInfoResult basicInfoResult = wxResult.getData(); + result = ConvertUtils.sourceToTarget(basicInfoResult, AccountBasicInfoResultDTO.class); + return result; + } + } \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java index f27eaff2c1..08f17ae49a 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/constant/WxMaCodeConstant.java @@ -171,5 +171,18 @@ public interface WxMaCodeConstant { */ String GET_TEMPLATE_URL = "https://api.weixin.qq.com/wxa/gettemplatelist"; + /** + * 获取基本信息 + */ + String GET_BASIC_INFO_URL = "https://api.weixin.qq.com/cgi-bin/account/getaccountbasicinfo"; + /** + * 获取已设置的所有类目 + */ + String GET_SET_CATEGORY_URL = "https://api.weixin.qq.com/cgi-bin/wxopen/getcategory"; + + /** + * 加急审核申请 + */ + String SPEED_UP_AUDIT_URL = "https://api.weixin.qq.com/wxa/speedupaudit"; } diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaSpeedUpAuditReq.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaSpeedUpAuditReq.java new file mode 100644 index 0000000000..7f07a4bb8b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaSpeedUpAuditReq.java @@ -0,0 +1,21 @@ +package com.epmet.wxapi.param; + +import com.google.gson.annotations.SerializedName; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/6 15:10 + */ +@Data +public class WxMaSpeedUpAuditReq implements Serializable { + private static final long serialVersionUID = 3042725610534211385L; + /** + * 审核单ID + */ + @SerializedName("auditid") + private String auditId; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java new file mode 100644 index 0000000000..adc88ce88b --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxBasicInfoResult.java @@ -0,0 +1,66 @@ +package com.epmet.wxapi.result; + +import com.epmet.dto.result.AccountBasicInfoResultDTO; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/6 14:05 + */ +@Data +public class WxBasicInfoResult implements Serializable { + private static final long serialVersionUID = -9027187315142350899L; + /** + * 返回码 + */ + private Integer errcode; + /** + * 错误信息 + */ + private String errmsg; + /** + * 帐号 appid + */ + @SerializedName("appid") + private String appid; + /** + * 帐号类型（1：订阅号，2：服务号，3：小程序） + */ + @SerializedName("account_type") + private Integer accountType; + /** + * 主体类型 0.个人 1.企业 2.媒体 3.政府 4.其他组织 + */ + @SerializedName("principal_type") + private Integer principalType; + /** + * 主体名称 + */ + @SerializedName("principal_name") + private String principalName; + /** + * 实名验证状态 1.实名验证成功 2.实名验证中 3.实名验证失败 + */ + @SerializedName("realname_status") + private Integer realnameStatus; + /** + * 微信认证信息 + */ + @SerializedName("wx_verify_info") + private AccountBasicInfoResultDTO.WxVerifyInfoBean wxVerifyInfo; + /** + * 功能介绍信息 + */ + @SerializedName("signature_info") + private AccountBasicInfoResultDTO.SignatureInfoBean signatureInfo; + /** + * 头像信息 + */ + @SerializedName("head_image_info") + private AccountBasicInfoResultDTO.HeadImageInfoBean headImageInfo; +} diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxOpenGetCategoryResult.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxOpenGetCategoryResult.java new file mode 100644 index 0000000000..609679cc5a --- /dev/null +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxOpenGetCategoryResult.java @@ -0,0 +1,44 @@ +package com.epmet.wxapi.result; + +import com.epmet.dto.result.GetCategoryResultDTO; +import com.google.gson.annotations.SerializedName; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/8/6 10:11 + */ +@NoArgsConstructor +@Data +public class WxOpenGetCategoryResult { + + /** + * 返回码 + */ + private Integer errcode; + /** + * 错误信息 + */ + private String errmsg; + /** + * 一个更改周期内可以添加类目的次数 + */ + private Integer limit; + /** + * 本更改周期内还可以添加类目的次数 + */ + private Integer quota; + /** + * 最多可以设置的类目数量类目信息说明 + */ + @SerializedName("category_limit") + private Integer categoryLimit; + /** + * 已设置的类目信息列表 + */ + private List categories; +} 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 index f15ab9f48b..c9cced8352 100644 --- 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 @@ -48,7 +48,7 @@ public class WxSupportVersionResult implements Serializable { /** * 百分比 */ - private int percentage; + private Integer percentage; /** * 基础库版本号 */ 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 6f41f29539..28212e5674 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 @@ -72,6 +72,16 @@ public interface WxMaCodeService { */ WxResult submitAudit(String accessToken, WxMaCodeSubmitAuditRequest auditRequest); + /** + * 加急审核申请 + * @author zhaoqifeng + * @date 2020/8/6 15:11 + * @param accessToken + * @param request + * @return com.epmet.wxapi.result.WxResult + */ + WxResult speedUpAudit(String accessToken, WxMaSpeedUpAuditReq request); + /** * 查询指定版本审核状态（仅供第三方代小程序调用）. * @@ -161,4 +171,24 @@ public interface WxMaCodeService { * @date 2020/8/5 16:06 */ WxResult setWeAppSupportVersion(String accessToken, WxSetWeAppSupportVersionReq request); + + /** + * 获取已设置的所有类目 + * + * @param accessToken + * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/8/6 10:47 + */ + WxResult getSetCategory(String accessToken); + + /** + * 获取基本信息 + * + * @param accessToken + * @return com.epmet.wxapi.result.WxResult + * @author zhaoqifeng + * @date 2020/8/6 14:07 + */ + WxResult getAccountBasicInfo(String accessToken); } 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 1f92c3b1fd..e91b31cee6 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 @@ -1,6 +1,7 @@ package com.epmet.wxapi.service.impl; import com.alibaba.fastjson.JSONObject; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.wxapi.constant.WxMaCodeConstant; @@ -147,6 +148,22 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { return result; } + @Override + public WxResult speedUpAudit(String accessToken, WxMaSpeedUpAuditReq request) { + WxResult result = new WxResult(); + String url = WxMaCodeConstant.SPEED_UP_AUDIT_URL + "?" + "access_token=" + accessToken; + Result submitResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request)); + if (!submitResult.success()) { + result.setErrorCode(submitResult.getCode()); + result.setErrorMsg(submitResult.getMsg()); + return result; + } + JSONObject jsonObject = JSONObject.parseObject(submitResult.getData()); + result.setErrorCode(jsonObject.getInteger(ERR_CODE)); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + return result; + } + @Override public WxResult getAuditStatus(String accessToken, WxMaCodeAuditStatusReq request) { WxResult result = new WxResult<>(); @@ -308,6 +325,48 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { return result; } + @Override + public WxResult getSetCategory(String accessToken) { + WxResult result = new WxResult<>(); + String url = WxMaCodeConstant.GET_SET_CATEGORY_URL + "?" + "access_token=" + accessToken; + Result statusResult = HttpClientManager.getInstance().sendGet(url, null); + if (!statusResult.success()) { + result.setErrorCode(statusResult.getCode()); + result.setErrorMsg(statusResult.getMsg()); + return result; + } + Gson gson = new Gson(); + WxOpenGetCategoryResult categoryResult = gson.fromJson(statusResult.getData(), WxOpenGetCategoryResult.class); + if (categoryResult.getErrcode() != NumConstant.ZERO) { + result.setErrorCode(categoryResult.getErrcode()); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(categoryResult.getErrcode())); + return result; + } + result.ok(categoryResult); + return result; + } + + @Override + public WxResult getAccountBasicInfo(String accessToken) { + WxResult result = new WxResult<>(); + String url = WxMaCodeConstant.GET_BASIC_INFO_URL + "?" + "access_token=" + accessToken; + Result statusResult = HttpClientManager.getInstance().sendGet(url, null); + if (!statusResult.success()) { + result.setErrorCode(statusResult.getCode()); + result.setErrorMsg(statusResult.getMsg()); + return result; + } + Gson gson = new Gson(); + WxBasicInfoResult basicInfoResult = gson.fromJson(statusResult.getData(), WxBasicInfoResult.class); + if (basicInfoResult.getErrcode() != NumConstant.ZERO) { + result.setErrorCode(basicInfoResult.getErrcode()); + result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(basicInfoResult.getErrcode())); + return result; + } + result.ok(basicInfoResult); + 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/mapper/AuthorizationInfoDao.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml index ec104db583..b06647013c 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/AuthorizationInfoDao.xml @@ -90,5 +90,13 @@ del_flag = 0 AND authorizer_appid = #{authAppId} + \ No newline at end of file diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 06413c8a1e..219ad17f20 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -526,6 +526,14 @@ public class CustomerServiceImpl extends BaseServiceImpl Date: Thu, 6 Aug 2020 17:53:20 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=20=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-point-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-point/epmet-point-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 ff70765756..d947ffdaae 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.36 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.37 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 31a6611bae..7dd73fd3ad 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.36 + 0.0.37 epmet-point com.epmet From 226699085951694f3f8b9cf65dbcd69617c449f6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 6 Aug 2020 18:02:26 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E7=89=88=E6=9C=AC=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 +- .../oper-crm/oper-crm-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/oper-crm/oper-crm-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 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 f22f3a06d8..5b987eab6d 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.106 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.107 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 ad077c1cf9..c434881c8e 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.106 + 0.0.107 com.epmet diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml index 8a4503945f..e35c7ad0a8 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.64 + image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.65 ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index b05f28236e..075a098902 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.64 + 0.3.65 com.epmet oper-crm From ba37088a354918b59951111f27e13429088f701f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 6 Aug 2020 18:03:43 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E7=9A=84post?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PublicAccountCallBackController.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PublicAccountCallBackController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PublicAccountCallBackController.java index e1a47748a7..b28809053d 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PublicAccountCallBackController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PublicAccountCallBackController.java @@ -5,10 +5,7 @@ import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.Collections; @@ -58,6 +55,11 @@ public class PublicAccountCallBackController { } } + @PostMapping(value = "/callback") + public String wxServerValdation() { + return ""; + } + @GetMapping(value = "test") public Result test(){ return new Result<>().ok("test"); From 6e06aea4c4ad4cc2116fd00d7698a15a03c64d01 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 6 Aug 2020 18:08:33 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=E7=9A=84post?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= 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 5b987eab6d..3b9a6b3a15 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.107 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.108 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 c434881c8e..a16b983f97 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.107 + 0.0.108 com.epmet From 50d71ad639e860830bea4be061ac8e7602cfdca2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 6 Aug 2020 18:11:06 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=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-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 317ce1d01d..fcbc9c9d3b 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.105 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.108 ports: - "8110:8110" network_mode: host # 使用现有网络 From 207fd8ac8e421678a91c133e1f4427660a7a576f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Aug 2020 10:16:21 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9selectDraftContentDetai?= =?UTF-8?q?l=E3=80=81selectDraftAttr=E8=BF=99=E4=B8=A4=E4=B8=AAsql,?= =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8E=9F=E6=9D=A5=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/DraftDao.xml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml index 81dd162aa7..823e936884 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml @@ -35,15 +35,13 @@ WHEN DC.AUDIT_STATUS="null" then "" else dc.AUDIT_STATUS end ) as AUDIT_STATUS, - dc.AUDIT_STATUS as "AUDIT_STATUS原来的值", ( CASE WHEN dc.AUDIT_REASON IS NULL THEN "" WHEN dc.AUDIT_REASON<=1 THEN "" WHEN dc.AUDIT_REASON="null" then "" else dc.AUDIT_REASON end - )as AUDIT_REASON, - dc.AUDIT_REASON as "AUDIT_REASON原来的值" + )as AUDIT_REASON FROM draft_content dc WHERE @@ -65,7 +63,6 @@ ELSE PUBLISHER_ID END ) AS PUBLISHER, - PUBLISHER_ID as "PUBLISHER_ID原来的值", ( case when PUBLISHER_NAME is NULL THEN "" when LENGTH(PUBLISHER_NAME)<=1 THEN "" @@ -73,7 +70,6 @@ ELSE PUBLISHER_NAME END )as PUBLISHER_NAME, - PUBLISHER_NAME as "PUBLISHER_NAME原来的值", (CASE WHEN PUBLISH_DATE IS NULL THEN CURDATE() ELSE PUBLISH_DATE @@ -86,7 +82,6 @@ ELSE PUBLISH_RANGE_DESC END )AS PUBLISH_RANGE_DESC, - PUBLISH_RANGE_DESC as "PUBLISH_RANGE_DESC原来的值", ( CASE WHEN PUBLISHER_TYPE IS NULL THEN "" WHEN LENGTH(PUBLISHER_TYPE) <=1 THEN "" @@ -94,15 +89,13 @@ ELSE PUBLISHER_TYPE END )AS PUBLISHER_TYPE, - PUBLISHER_TYPE as "PUBLISHER_TYPE原来的值", ( CASE when TAGS IS NULL THEN "" WHEN LENGTH(TAGS)<=1 THEN "" when TAGS="null" then "" ELSE TAGS END - )TAGS, - TAGS as "TAGS原来的值" + )TAGS FROM draft WHERE From 33c448bd6ef811b9948d571690c73ebd82933eb1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 7 Aug 2020 10:17:22 +0800 Subject: [PATCH 08/13] govvoice+1,=>68 --- .../gov-voice/gov-voice-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-voice/gov-voice-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index 7fa5341481..1c7018c56e 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.67 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.68 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index a593e507c0..921e42689a 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-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.3.67 + 0.3.68 gov-voice com.epmet From 16337acade863310dfde1b77a8e040942b2dfaff Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 10:46:10 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E9=97=B2=E7=BD=AE=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B8=85=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ActSignInRecServiceImpl.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java index a896694d27..57c50d58e7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSignInRecServiceImpl.java @@ -38,15 +38,12 @@ import com.epmet.dao.ActSignInRecDao; import com.epmet.dao.ActUserRelationDao; import com.epmet.dto.ActSignInRecDTO; import com.epmet.dto.ActUserRelationDTO; -import com.epmet.dto.HeartUserInfoDTO; import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO; import com.epmet.dto.form.resi.ResiActSignInFormDTO; import com.epmet.entity.ActSignInPicEntity; import com.epmet.entity.ActSignInRecEntity; -import com.epmet.redis.ActSignInRecRedis; import com.epmet.service.ActLiveRecService; import com.epmet.service.ActSignInRecService; -import com.epmet.service.HeartUserInfoService; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -66,9 +63,6 @@ import java.util.UUID; @Service public class ActSignInRecServiceImpl extends BaseServiceImpl implements ActSignInRecService { - @Autowired - private ActSignInRecRedis actSignInRecRedis; - @Autowired private ActUserRelationDao actUserRelationDao; @@ -78,9 +72,6 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl Date: Fri, 7 Aug 2020 13:59:01 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E5=90=8D=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E5=8C=85=E5=90=AB=E6=9C=AA=E5=AE=A1=E6=A0=B8=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?= 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 889c170bae..8732b7c248 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 @@ -145,7 +145,7 @@ IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} - LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID + LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' -- 活动开始时间 <= 当前时间 进行中 AND NOW() @@ -171,7 +171,7 @@ IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} - LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID + LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' AND i.ACT_STATUS = 'finished' AND i.CUSTOMER_ID = #{customerId} From 34ac200702aca8c9e5977942dff61c049c0e11ff Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 14:03:25 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=EF=BC=8C=E6=8A=A5=E5=90=8D=E4=BA=BA=E6=95=B0=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E5=8C=85=E5=90=AB=E6=9C=AA=E5=AE=A1=E6=A0=B8=E3=80=81?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87-heart?= 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 889c170bae..8a6488ceb1 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 @@ -145,7 +145,7 @@ IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} - LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID + LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' -- 活动开始时间 <= 当前时间 进行中 AND NOW() @@ -171,7 +171,7 @@ IF(u.USER_ID = #{userId},'signed_up','no_signed_up') as signupFlag FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId} - LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` = 'passed' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID + LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID WHERE i.DEL_FLAG = '0' AND i.ACT_STATUS = 'finished' AND i.CUSTOMER_ID = #{customerId} From 7fc075eb5cd5451dfad55146fcd9178338c1358d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Fri, 7 Aug 2020 15:07:13 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=9A?= =?UTF-8?q?=E5=B7=B2=E6=8A=A5=E5=90=8D=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WorkActUserController.java | 18 +++++++++--------- .../java/com/epmet/dao/ActUserRelationDao.java | 9 +++++++++ .../epmet/service/ActUserRelationService.java | 9 +++++++++ .../impl/ActUserRelationServiceImpl.java | 5 +++++ .../service/impl/WorkActUserServiceImpl.java | 4 ++-- .../resources/mapper/ActUserRelationDao.xml | 13 +++++++++++++ 6 files changed, 47 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java index 59769d69b9..5e421381a3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java @@ -25,13 +25,13 @@ public class WorkActUserController { @Autowired private WorkActUserService workActUserService; - + /** * @return com.epmet.commons.tools.utils.Result> * @param formDTO * @author yinzuomei * @description 报名审核-待审核列表 - * @Date 2020/7/21 22:24 + * @Date 2020/7/21 22:24 **/ @PostMapping("auditinglist") public Result> getAuditingList(@RequestBody ActIdFormDTO formDTO){ @@ -45,7 +45,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-已通过列表 - * @Date 2020/7/22 15:16 + * @Date 2020/7/22 15:16 **/ @PostMapping("passedlist") public Result> getPassedList(@RequestBody ActIdFormDTO formDTO){ @@ -58,7 +58,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-已拒绝列表 - * @Date 2020/7/22 15:49 + * @Date 2020/7/22 15:49 **/ @PostMapping("rejectedlist") public Result> getRejectedlist(@RequestBody ActIdFormDTO formDTO){ @@ -123,7 +123,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-审核通过 - * @Date 2020/7/23 17:31 + * @Date 2020/7/23 17:31 **/ @PostMapping("auditpass") public Result auditPass(@RequestBody AuditUserFormDTO formDTO){ @@ -137,7 +137,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 报名审核-拒绝报名 - * @Date 2020/7/23 18:08 + * @Date 2020/7/23 18:08 **/ @PostMapping("auditrefuse") public Result auditrefuse(@RequestBody AuditUserFormDTO formDTO){ @@ -150,8 +150,8 @@ public class WorkActUserController { * @return com.epmet.commons.tools.utils.Result> * @param formDTO * @author yinzuomei - * @description 已结束-已参加人员列表 - * @Date 2020/7/24 10:17 + * @description 已结束-已参加人员列表(审核中、审核通过) + * @Date 2020/7/24 10:17 **/ @PostMapping("joinuserlist") public Result> queryJoinUserList(@RequestBody ActIdFormDTO formDTO){ @@ -164,7 +164,7 @@ public class WorkActUserController { * @param formDTO * @author yinzuomei * @description 已结束-已取消报名人员列表 - * @Date 2020/7/24 10:53 + * @Date 2020/7/24 10:53 **/ @PostMapping("canceleduserlist") public Result> queryCanceledUserList(@RequestBody ActIdFormDTO formDTO){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java index 1322db3c83..a18f3ae5dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActUserRelationDao.java @@ -218,4 +218,13 @@ public interface ActUserRelationDao extends BaseDao { * @Date 15:59 2020-07-30 **/ String selectUserStatusByActIdAndUserId(@Param("actId") String actId, @Param("userId")String userId); + + /** + * @return java.util.List + * @param actId + * @author zhangyong + * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合 + * @Date 2020/7/21 22:44 + **/ + List getSignUpUserIdList(@Param("actId") String actId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java index 91ec9355da..1540926469 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActUserRelationService.java @@ -151,4 +151,13 @@ public interface ActUserRelationService extends BaseService registration(TokenDto tokenDto, ResiActRegistrationFormDTO formDTO); + + /** + * @return java.util.List + * @param actId + * @author zhangyong + * @description 根据活动id，查询活动已报名人员,返回(（已报名/待审核auditing，审核通过passed）)用户id集合 + * @Date 2020/7/21 22:44 + **/ + List getSignUpUserIdList(@Param("actId") String actId); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java index 7b25b31eab..935a5cd8a8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActUserRelationServiceImpl.java @@ -238,6 +238,11 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl getSignUpUserIdList(String actId) { + return baseDao.getSignUpUserIdList(actId); + } + /** * 开始报名活动 * diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java index 3694611f3c..879213f11a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java @@ -529,8 +529,8 @@ public class WorkActUserServiceImpl implements WorkActUserService { } List list=actInfoDao.queryJoinUserList(formDTO.getActId()); if(null!=list&&list.size()>0){ - //查询已通过审核的人员id集合 - List userIdList=actUserRelationService.getUserIdList(formDTO.getActId(), ActConstant.ACT_USER_STATUS_PASSED); + //查询已报名(审核中、审核通过)的人员id集合 + List userIdList=actUserRelationService.getSignUpUserIdList(formDTO.getActId()); //根据已通过的人员集合，查询出用户基本信息 List userInfoList=this.queryUserBaseInfoList(userIdList); for(JoinedUserResultDTO joinedUserResultDTO:list){ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml index 17fbb27e9a..f6f1e87c0d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActUserRelationDao.xml @@ -319,4 +319,17 @@ AND aur.USER_ID = #{userId} AND aur.ACT_ID = #{actId} + + + From f54f3b65e4f8b1e56796237dcd6dbe18ef183aa3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 7 Aug 2020 15:26:14 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E5=8D=87=E7=BA=A7heart?= 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 44f6c63ac8..ac05d69371 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.42 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.43 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 0b24223812..9c015b3dd0 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.42 + 0.0.43 com.epmet epmet-heart