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-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java index e641d17ed6..ddd5d69769 100644 --- a/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java +++ b/epmet-auth/src/main/java/com/epmet/redis/CustomerAppWxServiceUtil.java @@ -13,6 +13,7 @@ import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl; import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CustomerAppDTO; import com.epmet.dto.CustomerAppRedisDTO; @@ -115,7 +116,12 @@ public class CustomerAppWxServiceUtil implements ApplicationRunner { maServices = maServicesNew; if (appSet != null && result != null) { for (CustomerAppDTO app : result) { - appSet.add(appKey, app); + CustomerAppRedisDTO appRedis = ConvertUtils.sourceToTarget(app, CustomerAppRedisDTO.class); + if(appRedis == null){ + logger.warn("init CustomerAppRedis fail,convert return null,appDB:{}",JSON.toJSONString(app)); + continue; + } + appSet.add(appKey, appRedis); } } } diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index f3c4a05e89..2306d2da5b 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -10,7 +10,7 @@ spring: allow-bean-definition-overriding: true #环境 dev|test|prod profiles: - active: dev + active: @spring.profiles.active@ messages: encoding: UTF-8 basename: i18n/messages_common 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/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@ 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/deploy/docker-compose-dev.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml index a74ba3bc3d..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.40 + 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/deploy/docker-compose-test.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml index b3b8fecd49..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.38 + 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-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 4e75ddecf8..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.40 + 0.0.42 com.epmet epmet-heart 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); } 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/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-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 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} 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..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.33 + 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/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 # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 3fda51dcd7..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.33 + 0.0.37 epmet-point com.epmet diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java index 7ed5afbfe7..b65e80d705 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRedis.java @@ -20,7 +20,7 @@ public class PointRedis { public void lpush(String userId , PointExchangeResponseResultDTO verificationResult){ - redisUtils.leftPush(RedisKeys.getPointVerificationResultKey(userId),verificationResult); + redisUtils.leftPush(RedisKeys.getPointVerificationResultKey(userId),verificationResult,redisUtils.MINUTE_TEN_EXPIRE); } public Object lindex(String userId,Long index){ return redisUtils.lindex(RedisKeys.getPointVerificationResultKey(userId),index); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java index f32e1f607f..14194f057f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointVerificationLogServiceImpl.java @@ -239,6 +239,11 @@ public class PointVerificationLogServiceImpl extends BaseServiceImpl 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/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/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/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 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"; 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/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/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 4.0.0 - 0.3.108 + 0.3.110 com.epmet epmet-user diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index c54a5248cf..c895f10197 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -176,4 +176,18 @@ public class UserBaseInfoController { userBaseInfoService.saveUserBaseInfoWhenAuthVolunteer(param); return new Result(); } + + /** + * @Description 清除用户缓存信息 + * @param userIds + * @return + * @author wangc + * @date 2020.08.06 14:41 + **/ + @PostMapping("clearusercache") + public Result clearUserCache(@RequestBody List userIds){ + userBaseInfoService.clearUserCache(userIds); + return new Result(); + } } + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java index bfb4ff6110..a2439d4dcd 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java @@ -83,7 +83,8 @@ public class UserBaseInfoRedis { String key = UserRedisKeys.getResiUserKey(baseInfo.getUserId()); //bean to map Map map = BeanUtil.beanToMap(baseInfo, false, true); - redisUtils.hMSet(key, map,NOT_EXPIRE); + //用户缓存的有效期为七天 + redisUtils.hMSet(key, map,RedisUtils.DEFAULT_EXPIRE * NumConstant.SEVEN); } public String get(String id){ @@ -254,6 +255,20 @@ public class UserBaseInfoRedis { } + /** + * @Description 批量清楚用户缓存信息 + * @param userIds + * @return + * @author wangc + * @date 2020.08.06 14:34 + **/ + public void clearUserCache(List userIds){ + userIds.forEach(id ->{ + if(StringUtils.isNotBlank(id)) { + redisUtils.delete(UserRedisKeys.getResiUserKey(id)); + } + }); + } public void mergeObject(T origin, T destination) { if (origin == null || destination == null) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 060f8385f1..33e27f88a6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -152,4 +152,13 @@ public interface UserBaseInfoService extends BaseService { * @date 2020.07.31 09:38 **/ void saveUserBaseInfoWhenAuthVolunteer(ResiVolunteerAuthenticateFormDTO param); + + /** + * @Description 清除用户缓存信息 + * @param ids + * @return + * @author wangc + * @date 2020.08.06 14:38 + **/ + void clearUserCache(List ids); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 019a790f73..84e196906f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -248,7 +248,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl ids) { + if(null == ids || ids.isEmpty()) return; + userBaseInfoRedis.clearUserCache(ids); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 9534e42cdc..c3d4efaca1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -175,11 +175,11 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl