Merge remote-tracking branch 'origin/cc_20230520_partner' into cc_20230520_partner

coolstore-partner-dao/src/main/java/com/cool/store/dao/HyIntendDevMappingDAO.java

@@ -52,6 +52,13 @@ public class HyIntendDevMappingDAO {
         return hyIntendDevelopementMappingMapper.selectByMappingIdList(idList);
     }
 
+    public List<ZoneCheckDTO> selectByOpenAreaMappingIdList(List<Long> idList){
+        if (CollectionUtils.isEmpty(idList)){
+            return new ArrayList<>();
+        }
+        return hyIntendDevelopementMappingMapper.selectByOpenAreaMappingIdList(idList);
+    }
+
 
     public int batchInsert(List<HyIntendDevelopementMappingDO> recordList){
         if (CollectionUtils.isEmpty(recordList)){

coolstore-partner-dao/src/main/java/com/cool/store/mapper/HyIntendDevelopementMappingMapper.java

@@ -54,4 +54,6 @@ public interface HyIntendDevelopementMappingMapper {
      * @return
      */
     List<ZoneCheckDTO> selectByMappingIdList(@Param("mappingIdList") List<Long> mappingIdList);
+
+    List<ZoneCheckDTO> selectByOpenAreaMappingIdList(@Param("openAreaMappingIdList") List<Long> openAreaMappingIdList);
 }

coolstore-partner-dao/src/main/resources/mapper/HyIntendDevelopementMappingMapper.xml

@@ -130,4 +130,19 @@
       </if>
     </where>
   </select>
+
+
+  <select id="selectByOpenAreaMappingIdList" resultType="com.cool.store.dto.partner.ZoneCheckDTO">
+    select
+    a.open_area_mapping_id  as openAreaMappingId,
+    b.zone_name as zoneName
+    from hy_intend_developement_mapping a inner join hy_intend_dev_zone_info b on a.mapping_id = b.id
+    <where>
+      <if test="openAreaMappingIdList!=null and openAreaMappingIdList.size>0">
+        <foreach collection="openAreaMappingIdList" open="and a.open_area_mapping_id in (" close=")" separator="," item="mappingId">
+          #{mappingId}
+        </foreach>
+      </if>
+    </where>
+  </select>
 </mapper>

coolstore-partner-dao/src/main/resources/mapper/HyOpenAreaInfoMapper.xml

@@ -194,6 +194,9 @@
       <if test="keyword!=null and keyword!=''">
         and area_path like  concat('%',#{keyword},'%')
       </if>
+      <if test="applyFlag!=null and applyFlag==true">
+        and (area_status = 'open' or area_status = 'keyOpen')
+      </if>
       <if test="areaStatus!=null and areaStatus!=''">
         and area_status = #{areaStatus}
       </if>

coolstore-partner-dao/src/main/resources/mapper/HyPartnerCertificationInfoMapper.xml

@@ -227,7 +227,7 @@
         or id = #{record.id}
       </if>
       <if test="record.partnerLineId != null">
-        or partner_id_line_id = #{record.partnerLineId}
+        or partner_line_id = #{record.partnerLineId}
       </if>
     </where>
   </update>

coolstore-partner-dao/src/main/resources/mapper/HyPartnerInterviewMapper.xml

@@ -47,7 +47,7 @@
 
   <sql id="Base_Column_List">
     id, status, partner_line_id, interview_plan_id, partner_id, deadline, interviewer,
-    recorder, process_info, record_time, summary, auth_code, qualify_verify_id, pass_file_url, expiry_date,
+    recorder, process_info, record_time, summary, auth_code, pass_pdf_url, pass_image_url, expiry_date,
     latest_log_message, pass_reason, certify_file, create_time, update_time, approve_time,
     partner_enter_time, interviewer_enter_time
   </sql>

coolstore-partner-model/src/main/java/com/cool/store/entity/FraSourceDO.java

@@ -0,0 +1,15 @@
+package com.cool.store.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class FraSourceDO {
+
+    @ApiModelProperty("key")
+    private String key;
+
+    @ApiModelProperty("text")
+    private String text;
+
+}

coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerfyReq.java

@@ -1,87 +0,0 @@
-package com.cool.store.request;
-
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author: young.yu
- * @Date: 2023-06-14  15:06
- * @Description:
- */
-public class RpcCreateQualifyVerfyReq {
-    @ApiModelProperty(value = "意向签约时间", required = true)
-    private String intendedSignDate;
-
-    @ApiModelProperty(value = "请求来源", required = true)
-    private String fraSource;
-
-    @ApiModelProperty(value = "保证金（元）", required = true, example = "5000")
-    private int amtDeposit;
-
-    @ApiModelProperty(value = "授权码", required = true)
-    private String authCode;
-
-    @ApiModelProperty(value = "意向签约人", required = true)
-    private String intendedSigner;
-
-    @ApiModelProperty(value = "手机号", required = true)
-    private String intendedSignerTel;
-
-    @ApiModelProperty(value = "钉钉用户id", required = true)
-    private String dingUserId;
-
-    public String getIntendedSignDate() {
-        return intendedSignDate;
-    }
-
-    public void setIntendedSignDate(String intendedSignDate) {
-        this.intendedSignDate = intendedSignDate;
-    }
-
-    public String getFraSource() {
-        return fraSource;
-    }
-
-    public void setFraSource(String fraSource) {
-        this.fraSource = fraSource;
-    }
-
-    public int getAmtDeposit() {
-        return amtDeposit;
-    }
-
-    public void setAmtDeposit(int amtDeposit) {
-        this.amtDeposit = amtDeposit;
-    }
-
-    public String getAuthCode() {
-        return authCode;
-    }
-
-    public void setAuthCode(String authCode) {
-        this.authCode = authCode;
-    }
-
-    public String getIntendedSigner() {
-        return intendedSigner;
-    }
-
-    public void setIntendedSigner(String intendedSigner) {
-        this.intendedSigner = intendedSigner;
-    }
-
-    public String getIntendedSignerTel() {
-        return intendedSignerTel;
-    }
-
-    public void setIntendedSignerTel(String intendedSignerTel) {
-        this.intendedSignerTel = intendedSignerTel;
-    }
-
-    public String getDingUserId() {
-        return dingUserId;
-    }
-
-    public void setDingUserId(String dingUserId) {
-        this.dingUserId = dingUserId;
-    }
-}

coolstore-partner-model/src/main/java/com/cool/store/request/RpcCreateQualifyVerifyReq.java

@@ -0,0 +1,42 @@
+package com.cool.store.request;
+
+import com.cool.store.entity.FraSourceDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author: young.yu
+ * @Date: 2023-06-14  15:06
+ * @Description:
+ */
+@Data
+public class RpcCreateQualifyVerifyReq {
+
+    @lombok.Data
+    public class Data {
+        @ApiModelProperty(value = "意向签约时间", required = true)
+        private String intendedSignDate;
+
+        @ApiModelProperty(value = "请求来源", required = true)
+        private FraSourceDO fraSource;
+
+        @ApiModelProperty(value = "保证金（元）", required = true, example = "5000")
+        private int amtDeposit;
+
+        @ApiModelProperty(value = "授权码", required = true)
+        private String authCode;
+
+        @ApiModelProperty(value = "意向签约人", required = true)
+        private String intendedSigner;
+
+        @ApiModelProperty(value = "手机号", required = true)
+        private String intendedSignerTel;
+
+    }
+
+    @ApiModelProperty(value = "数据体", required = true)
+    private Data data;
+
+    @ApiModelProperty(value = "钉钉用户id", required = true)
+    private String dingUserId;
+}

coolstore-partner-service/src/main/java/com/cool/store/oss/OSSServer.java

@@ -26,6 +26,9 @@ public class OSSServer {
     @Value("${corp.id:null}")
     private String corpId;
 
+    @Value("${cdn.url:null}")
+    private String cdnUrl;
+
     /**
      * 服务端上传文件的方法
      * ObjectName 为文件存放位置 + 名字，不可包含 bucket
@@ -38,7 +41,7 @@ public class OSSServer {
             PutObjectRequest putObjectRequest = new PutObjectRequest(bucket, objectName, inputStream);
             // 创建PutObject请求。
             ossClient.putObject(putObjectRequest);
-            return "http://" + bucket + "." + endpoint + "/" + objectName;
+            return cdnUrl + "/partner/" + corpId + "/" + objectName;
         } catch (OSSException oe) {
             log.error("Caught an OSSException, which means your request made it to OSS, "
                     + "but was rejected with an error response for some reason.");

coolstore-partner-service/src/main/java/com/cool/store/service/HyPartnerLineInfoService.java

@@ -130,6 +130,14 @@ public interface HyPartnerLineInfoService {
      */
     Boolean assignFollowUser(Long lineId);
 
+    /**
+     * 线索状态
+     * @param wantShopAreaId
+     * @param acceptAdjustType
+     * @return
+     */
+     Boolean getLineStatus(Long wantShopAreaId,Integer acceptAdjustType);
+
 
 
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/FlowServiceImpl.java

@@ -2,7 +2,6 @@ package com.cool.store.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
@@ -21,25 +20,23 @@ import com.cool.store.mapper.HyPartnerLineInfoMapper;
 import com.cool.store.oss.OSSServer;
 import com.cool.store.request.CreateQualifyVerifyReq;
 import com.cool.store.request.QualificationCallbackReq;
-import com.cool.store.request.RpcCreateQualifyVerfyReq;
+import com.cool.store.request.RpcCreateQualifyVerifyReq;
 import com.cool.store.request.RpcGetMdmTokenReq;
 import com.cool.store.service.FlowService;
 import com.cool.store.utils.PDFUtils;
 import com.cool.store.utils.PassLetterUtils;
 import com.cool.store.utils.RedisUtilPool;
 import com.cool.store.utils.RestTemplateUtil;
-import com.cool.store.vo.PartnerPassLetterDetailVO;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -54,8 +51,15 @@ import java.util.Objects;
 @Service
 public class FlowServiceImpl implements FlowService {
 
-    //    @Value("${hs.mdm.baseUrl}")
+    @Value("${hs.mdm.baseUrl}")
     private String mdmBaseUrl;
+
+    @Value("${hs.mdm.appkey}")
+    private String mdmAppKey;
+
+    @Value("${hs.mdm.appsec}")
+    private String mdmAppSec;
+
     @Autowired
     private RedisUtilPool redisUtilPool;
 
@@ -81,14 +85,18 @@ public class FlowServiceImpl implements FlowService {
     @Transactional
     public void createQualifyVerify(CreateQualifyVerifyReq request) throws ApiException {
         //1.发起加盟商资质审核
-        RpcCreateQualifyVerfyReq rpcRequest = new RpcCreateQualifyVerfyReq();
+        RpcCreateQualifyVerifyReq rpcRequest = new RpcCreateQualifyVerifyReq();
-        rpcRequest.setIntendedSignDate(request.getWantSignTime());
+        RpcCreateQualifyVerifyReq.Data data = new RpcCreateQualifyVerifyReq().new Data();
-        rpcRequest.setFraSource("HSAYPartner");
+        rpcRequest.setData(data);
-        rpcRequest.setAmtDeposit(Integer.valueOf(request.getSecurityFund()));
+        FraSourceDO fraSourceDO = new FraSourceDO();
+        fraSourceDO.setKey("HSAYPartner");
+        fraSourceDO.setText("沪上阿姨合伙人");
+        data.setFraSource(fraSourceDO);
+        data.setAmtDeposit(Integer.valueOf(request.getSecurityFund()));
 
         //获取授权码
         String authCode = null;
-        if (StringUtils.isBlank(request.getLineId())) {
+        if (!StringUtils.isBlank(request.getLineId())) {
             //根据线索id获取线索信息
             HyPartnerLineInfoDO hyPartnerLineInfoDO = hyPartnerLineInfoMapper.selectByPrimaryKeySelective(Long.valueOf(request.getLineId()));
             if (!Objects.isNull(hyPartnerLineInfoDO)) {
@@ -103,13 +111,13 @@ public class FlowServiceImpl implements FlowService {
                     }
                     rpcRequest.setDingUserId(dingdingUserDO.getUserid());
                     authCode = generateAuthCode(jobNumber);
-                    rpcRequest.setAuthCode(authCode);
+                    data.setAuthCode(authCode);
                 }
             }
 
         }
-        rpcRequest.setIntendedSigner(request.getIntentionSignerUsername());
+        data.setIntendedSigner(request.getIntentionSignerUsername());
-        rpcRequest.setIntendedSignerTel(request.getIntentionSignerMobile());
+        data.setIntendedSignerTel(request.getIntentionSignerMobile());
 
         //通过 rpc 请求审核系统获取返回数据
         Map<String, String> qualifyVerifyRespData = JSON.parseObject(createQualifyVerify(rpcRequest), new TypeReference<HashMap<String,String>>() {});
@@ -196,16 +204,17 @@ public class FlowServiceImpl implements FlowService {
     }
 
 
-    public String createQualifyVerify(RpcCreateQualifyVerfyReq rpcRequest) throws ApiException{
+    public String createQualifyVerify(RpcCreateQualifyVerifyReq rpcRequest) throws ApiException{
         String url = mdmBaseUrl + "/api/openapi/runtime/form/startFraQualExamWithData";
         ResponseEntity<MDMResultDTO> responseEntity = null;
         try {
             RpcGetMdmTokenReq rpcGetMDMTokenReq = new RpcGetMdmTokenReq();
-            // TODO set appKey 与 appSecret
+            rpcGetMDMTokenReq.setAppKey(mdmAppKey);
+            rpcGetMDMTokenReq.setAppSecret(mdmAppSec);
             Map<String, String> headers = new HashMap<>();
             headers.put("Authorization", getMdmAccessToken(rpcGetMDMTokenReq));
             responseEntity = RestTemplateUtil.post(url, headers, rpcRequest, MDMResultDTO.class);
-            log.info("url:{}, response:{}", url, JSONObject.toJSONString(responseEntity));
+            log.info("url:{}, header:{}, request:{} response:{}", url, JSONObject.toJSONString(headers), JSONObject.toJSONString(rpcRequest), JSONObject.toJSONString(responseEntity));
             if (Objects.nonNull(responseEntity.getBody()) && responseEntity.getBody().isSuccess()) {
                 return JSONObject.toJSONString(responseEntity.getBody().getData());
             }
@@ -260,13 +269,13 @@ public class FlowServiceImpl implements FlowService {
             ByteArrayOutputStream pdfOut = PassLetterUtils.genPassLetter(partnerName, passCode, verifyCity, passTime);
             //生成的 pdf 通过函内存输入流
             ByteArrayInputStream inputStream = new ByteArrayInputStream(pdfOut.toByteArray());
-            String passPdfUrl = ossServer.uploadFileServer(inputStream, "partner/passLetter/" + passCode + ".pdf");
+            String passPdfUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".pdf");
             //转换为图片
             inputStream.reset();
             ByteArrayOutputStream imageOut = PDFUtils.pdf2Img(inputStream, 2.0f);
             inputStream = new ByteArrayInputStream(imageOut.toByteArray());
             //上传 OSS
-            String passImageUrl = ossServer.uploadFileServer(inputStream, "partner/passLetter/" + passCode + ".png");
+            String passImageUrl = ossServer.uploadFileServer(inputStream, "passLetter/" + passCode + ".png");
             //计算有效期截止日期
             DateTime expiryDate = DateUtil.offsetDay(passTime, 60);
             HyPartnerInterviewDO interviewDO = new HyPartnerInterviewDO();

coolstore-partner-service/src/main/java/com/cool/store/service/impl/HyPartnerLineInfoServiceImpl.java

@@ -247,20 +247,20 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
     @Override
     public PageInfo<PublicSeaLineListVo> publicSeaLineList(String userId, LineRequest lineRequest) {
         //确认是招商经理还是部门负责人
-        EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId);
+//        EnterpriseUserDO userInfo = enterpriseUserDAO.getUserInfoById(userId);
-        List<String> userIds = new ArrayList<>();
+//        List<String> userIds = new ArrayList<>();
-        if (userInfo.getIsLeader()){
+//        if (userInfo.getIsLeader()){
-            if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){
+//            if (StringUtil.isNotEmpty(userInfo.getLeaderDeptIds())){
-                List<String> regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class);
+//                List<String> regionIds = JSONObject.parseArray(userInfo.getLeaderDeptIds(), String.class);
-                List<EnterpriseUserDO> enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true);
+//                List<EnterpriseUserDO> enterpriseUserDOS = enterpriseUserDAO.searchUserByRegionIdsAndKeyword(regionIds, null, true);
-                userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());
+//                userIds =enterpriseUserDOS.stream().map(EnterpriseUserDO::getUserId).collect(Collectors.toList());
-            }
+//            }
-        }else {
+//        }else {
-            userIds = Arrays.asList(userId);
+//            userIds = Arrays.asList(userId);
-        }
+//        }
         PageHelper.startPage(lineRequest.getPageNum(),lineRequest.getPageSize());
         PageInfo publicSeaLineList = new PageInfo(hyPartnerLineInfoDAO.getPublicSeaLineList(lineRequest.getUserNameKeyword(), lineRequest.getPhoneKeyword(),
-                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), userIds));
+                lineRequest.getIntentArea(), lineRequest.getAcceptAdjustType(), lineRequest.getUpdateStartTime(), lineRequest.getUpdateEndTime(), null));
 
         List<PublicSeaLineDTO> list = publicSeaLineList.getList();
         if (CollectionUtils.isEmpty(list)){
@@ -395,21 +395,34 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
             return Boolean.FALSE;
         }
         HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(hyPartnerLineInfoDO.getPartnerId());
-        HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()));
+
+        Boolean lineStatus = getLineStatus(Long.valueOf(hyPartnerUserInfoDO.getWantShopArea()), hyPartnerUserInfoDO.getAcceptAdjustType());
+        return lineStatus;
+    }
+
+    /**
+     * 线索状态
+     * @param wantShopAreaId
+     * @param acceptAdjustType
+     * @return
+     */
+    @Override
+    public Boolean getLineStatus(Long wantShopAreaId,Integer acceptAdjustType){
+        HyOpenAreaInfoDO hyOpenAreaInfoDO = hyOpenAreaInfoDAO.selectById(wantShopAreaId);
 
         if (AreaStatusEnum.OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.KEY_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())){
             return Boolean.TRUE;
         }
         if (AreaStatusEnum.NOT_OPEN.getCode().equals(hyOpenAreaInfoDO.getAreaStatus()) || AreaStatusEnum.SATURATED.getCode().equals(hyOpenAreaInfoDO.getAreaStatus())){
-            if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){
+            if (AcceptAdjustTypeEnum.NOT_ACCEPT.getCode().equals(acceptAdjustType)){
                 return Boolean.FALSE;
             }
             //全国调剂 默认分配呗 有啥好说的
-            if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){
+            if (AcceptAdjustTypeEnum.NATIONAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){
                 return Boolean.TRUE;
             }
             //省内调剂 有重点或者开放的 分配
-            if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){
+            if (AcceptAdjustTypeEnum.PROVINCIAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){
                 Integer apply = hyOpenAreaInfoDAO.getChildrenCount("apply", hyOpenAreaInfoDO.getId());
                 if (apply>CommonConstants.ZERO){
                     return Boolean.TRUE;
@@ -417,7 +430,7 @@ public class HyPartnerLineInfoServiceImpl implements HyPartnerLineInfoService {
                 return Boolean.FALSE;
             }
             //市内调剂 不分配
-            if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(hyPartnerUserInfoDO.getAcceptAdjustType())){
+            if (AcceptAdjustTypeEnum.LOCAL_ADJUSTMENT.getCode().equals(acceptAdjustType)){
                 return Boolean.FALSE;
             }
         }

coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java

@@ -202,7 +202,7 @@ public class ZoneServiceImpl implements ZoneService {
             throw  new ServiceException(ErrorCodeEnum.PARAMS_REQUIRED);
         }
         //查询已经绑定战区的 意向区域
-        List<ZoneCheckDTO> list = hyIntendDevMappingDAO.selectByMappingIdList(intentAreaSettingRequest.getOpenAreaIdList());
+        List<ZoneCheckDTO> list = hyIntendDevMappingDAO.selectByOpenAreaMappingIdList(intentAreaSettingRequest.getOpenAreaIdList());
         List<Long> openAreaIdList = list.stream().map(ZoneCheckDTO::getOpenAreaMappingId).collect(Collectors.toList());
         List<HyOpenAreaInfoDO> hyOpenAreaInfoDOList = openAreaInfoDAO.selectByIds(openAreaIdList);
         Map<Long, String> areaNameMap = hyOpenAreaInfoDOList.stream().collect(Collectors.toMap(HyOpenAreaInfoDO::getId, HyOpenAreaInfoDO::getAreaName));

coolstore-partner-webb/src/main/resources/application-dev.properties

@@ -58,8 +58,10 @@ weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
 
 signKey=77fea013c3a6459685b83c21a2fc3411
 
-#八佰流程配置
+#MDM
-hs.mdm.baseUrl=http://172.35.37.52:8080
+hs.mdm.baseUrl=http://10.56.21.30/
+hs.mdm.appkey = HSAYPartner
+hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3
 
 #xxljob配置
 xxl.job.admin.addresses = https://djob.coolstore.cn/xxl-job-admin

coolstore-partner-webb/src/main/resources/application-local.properties

@@ -64,6 +64,11 @@ weixin.appSecret=245a483747e6e9f8762d3e8539cf0318
 
 signKey=77fea013c3a6459685b83c21a2fc3411
 
+#MDM
+hs.mdm.baseUrl=http://10.56.21.30/
+hs.mdm.appkey = HSAYPartner
+hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3
+
 xxl.job.admin.addresses =
 xxl.job.executor.appname = ${spring.application.name}
 xxl.job.executor.ip =

coolstore-partner-webc/src/main/java/com/cool/store/config/SignValidateFilter.java

@@ -51,7 +51,7 @@ public class SignValidateFilter implements Filter {
                     "/partner/mini/program/doc.html","/partner/mini/program/v2/api-docs","/**/test/**",
                     "/partner/mini/program/oss/getUploadFileConfig",
                     "/partner/mini/program/v1/partnerManage/partner/getIdentityCardInfo",
-                    "/**/swagger*/**", "/**/webjars/**");
+                    "/**/swagger*/**", "/**/webjars/**","/partner/mini/program/v1/partnerManage/openArea/areaApplyQuery");
 
 
     /**

coolstore-partner-webc/src/main/resources/application-dev.properties

@@ -56,4 +56,9 @@ trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
 weixin.appId=wxb2a0addf956ad4b7
 weixin.appSecret=77abdcae754add92889566b543e5ad79
 
-signKey=77fea013c3a6459685b83c21a2fc3411
+signKey=77fea013c3a6459685b83c21a2fc3411
+
+#MDM
+hs.mdm.baseUrl=http://10.56.21.30/
+hs.mdm.appkey = HSAYPartner
+hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3

coolstore-partner-webc/src/main/resources/application-local.properties

@@ -63,4 +63,9 @@ trtc.secretKey=4854bab106c2ca2a2fda16a8c966933e28a078a34e458999d6227e8cd8ab8219
 weixin.appId=wxb2a0addf956ad4b7
 weixin.appSecret=77abdcae754add92889566b543e5ad79
 
-signKey=77fea013c3a6459685b83c21a2fc3411
+signKey=77fea013c3a6459685b83c21a2fc3411
+
+#MDM
+hs.mdm.baseUrl=http://10.56.21.30/
+hs.mdm.appkey = HSAYPartner
+hs.mdm.appsec = ab39fedb886fa3587c7f517551976de8b2606f5511fd8f8675266825d74c5cd3