From 080019ac0df3b7679a79f9da6b0ef4b7795638f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Thu, 10 Apr 2025 20:29:57 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=E5=B9=B3=E5=8F=B0=E8=B4=A6=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cool/store/utils/OpenSignatureUtil.java | 1 + .../com/cool/store/utils/PasswordUtil.java | 11 ++++--- .../com/cool/store/dao/ShopAccountDAO.java | 7 ++-- .../java/com/cool/store/dao/ShopInfoDAO.java | 7 ++++ .../cool/store/mapper/ShopAccountMapper.java | 1 + .../com/cool/store/mapper/ShopInfoMapper.java | 2 ++ .../resources/mapper/ShopAccountMapper.xml | 1 + .../main/resources/mapper/ShopInfoMapper.xml | 6 ++++ .../com/cool/store/dto/ModifyPasswordDTO.java | 4 +++ .../store/entity/HyPartnerUserInfoDO.java | 4 +++ .../com/cool/store/entity/ShopAccountDO.java | 5 +++ .../impl/JoinIntentionServiceImpl.java | 3 +- .../store/service/impl/PushServiceImpl.java | 8 ++--- .../service/impl/ShopAccountServiceImpl.java | 14 ++++---- .../store/config/OpenApiValidateFilter.java | 32 ++++++++++++++----- .../controller/webb/OpenApiController.java | 11 +++---- .../controller/webb/PCTestController.java | 9 ++++++ .../resources/application-online.properties | 10 ++++++ .../resources/application-test.properties | 16 +++++----- 19 files changed, 111 insertions(+), 41 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java index 03f970669..9ad877515 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/OpenSignatureUtil.java @@ -50,6 +50,7 @@ public class OpenSignatureUtil { return hmacSha256(sb.toString(), appSecret); } + private static String hmacSha256(String data, String key) { try { Mac sha256_HMAC = Mac.getInstance(HMAC_SHA256); diff --git a/coolstore-partner-common/src/main/java/com/cool/store/utils/PasswordUtil.java b/coolstore-partner-common/src/main/java/com/cool/store/utils/PasswordUtil.java index 98cce2d4d..bde162246 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/utils/PasswordUtil.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/utils/PasswordUtil.java @@ -20,7 +20,7 @@ public class PasswordUtil { public static byte[] generateSalt() { SecureRandom secureRandom = new SecureRandom(); // 16 字节的盐值 - byte[] salt = new byte[16]; + byte[] salt = new byte[3]; secureRandom.nextBytes(salt); return salt; } @@ -50,12 +50,13 @@ public class PasswordUtil { * @param salt 盐值 * @return 加密后的密码（十六进制字符串） */ - public static String encryptPassword(String plainPassword, byte[] salt) { + public static String encryptPassword(String plainPassword, String salt) { try { MessageDigest messageDigest = MessageDigest.getInstance("MD5"); - // 将盐值和明文密码拼接后进行哈希计算 - messageDigest.update(salt); - byte[] hashedBytes = messageDigest.digest(plainPassword.getBytes()); + + String combined = plainPassword + salt; + + byte[] hashedBytes = messageDigest.digest(combined.getBytes()); // 将字节数组转换为十六进制字符串 return bytesToHex(hashedBytes); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java index 352177ec4..6dd983e62 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopAccountDAO.java @@ -40,6 +40,7 @@ public class ShopAccountDAO { if (ShopAccountEnum.getSpecialEnumList().contains(shopAccountEnum)){ shopAccountDO.setPasswordSalt(partnerUserInfoDO.getDownstreamSystemSalting()); shopAccountDO.setPassword(partnerUserInfoDO.getDownstreamSystemPassword()); + shopAccountDO.setSecondaryPassword(partnerUserInfoDO.getDownstreamSystemSecondaryPassword()); } shopAccountDO.setStatus(shopAccountEnum.getInitStatus().getCode()); if (ShopAccountEnum.HUOMA.equals(shopAccountEnum)){ @@ -71,7 +72,7 @@ public class ShopAccountDAO { /** * 根据shopId与system_name修改status * @param shopId 店铺ID - * @param systemName 系统名称 + * @param systemNameList 系统名称 * @param status 状态 * @return 影响的行数 */ @@ -112,9 +113,9 @@ public class ShopAccountDAO { * @param lastSyncTime * @return */ - public int batchUpdatePasswordByShopIds( List shopIds, String password, String passwordSalt, Date lastSyncTime){ + public int batchUpdatePasswordByShopIds( List shopIds, String password,String secondaryPassword, String passwordSalt, Date lastSyncTime){ return shopAccountMapper.batchUpdatePasswordByShopIds( - shopIds, password, passwordSalt, lastSyncTime + shopIds, password, secondaryPassword, passwordSalt, lastSyncTime ); } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java index a5c3b21ce..99b9592a4 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/ShopInfoDAO.java @@ -253,4 +253,11 @@ public class ShopInfoDAO { } return shopInfoMapper.getShopCodeList(lineId); } + + public List getShopIdList(Long lineId){ + if (lineId == null){ + return new ArrayList<>(); + } + return shopInfoMapper.getShopIdList(lineId); + } } diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java index 37b5693f1..7aca90fe5 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopAccountMapper.java @@ -64,6 +64,7 @@ public interface ShopAccountMapper extends Mapper { int batchUpdatePasswordByShopIds( @Param("shopIds") List shopIds, @Param("password") String password, + @Param("secondaryPassword") String secondaryPassword, @Param("passwordSalt") String passwordSalt, @Param("lastSyncTime") Date lastSyncTime ); diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java index 15f01078a..8623ac354 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/mapper/ShopInfoMapper.java @@ -132,4 +132,6 @@ public interface ShopInfoMapper extends Mapper { Integer updateShopCode(@Param("shopCode") String shopCode,@Param("shopId") Long shopId); List getShopCodeList(@Param("lineId") Long lineId); + + List getShopIdList(@Param("lineId") Long lineId); } diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml index b8882e2c8..5639bd6c0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml @@ -117,6 +117,7 @@ xfsg_shop_account SET password = #{password}, + secondary_password = #{secondaryPassword}, password_salt = #{passwordSalt}, last_sync_time = #{lastSyncTime,jdbcType=TIMESTAMP} WHERE diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml index 4022a35a7..3b076b045 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopInfoMapper.xml @@ -439,6 +439,12 @@ where deleted = 0 and line_id = #{lineId} and shop_code is not null + + UPDATE xfsg_shop_info diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java index 3cbac846d..fac8459ef 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/ModifyPasswordDTO.java @@ -13,10 +13,14 @@ import java.util.List; @Data public class ModifyPasswordDTO { + @ApiModelProperty(value = "手机号",hidden = true) + private String mobile; @ApiModelProperty(value = "盐值",required = true) String passwordSalt; @ApiModelProperty(value = "密码",required = true) String password; + @ApiModelProperty(value = "第二密码",required = true) + String passwordSecondary; @ApiModelProperty(value = "门店ID",required = true) Long shopId; @ApiModelProperty(value = "门店ID",hidden = true) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java index 95a8b7e7e..d90bc3bb9 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/HyPartnerUserInfoDO.java @@ -57,4 +57,8 @@ public class HyPartnerUserInfoDO implements Serializable { @ApiModelProperty("下游系统密码") @Column(name = "downstream_system_password") private String downstreamSystemPassword; + + @ApiModelProperty("下游系统第二密码") + @Column(name = "downstream_system_Secondary_password") + private String downstreamSystemSecondaryPassword; } \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java index f63ee82f2..c216b81eb 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/entity/ShopAccountDO.java @@ -49,6 +49,11 @@ public class ShopAccountDO { */ private String password; + /** + * 第二密码 + */ + private String secondaryPassword; + /** * 状态：1-开通资料收集中, 2-资料审核中, 3-资料审核失败, 4-开通中, 5-开通成功, 6-开通失败 */ diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java index 0f9dcf527..ae444e132 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/JoinIntentionServiceImpl.java @@ -126,7 +126,7 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt //生成密码和盐值 byte[] saltBytes = PasswordUtil.generateSalt(); String salt = PasswordUtil.bytesToHex(saltBytes); - String password = PasswordUtil.encryptPassword(substring, saltBytes); + String password = PasswordUtil.encryptPassword(substring, salt); HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(lineInfo.getPartnerId()); hyPartnerUserInfoDO.setDownstreamSystemPassword(password); hyPartnerUserInfoDO.setDownstreamSystemSalting(salt); @@ -169,4 +169,5 @@ public class JoinIntentionServiceImpl extends LineFlowService implements JoinInt response.setBigRegionId(byLineId.getBigRegionId()); return response; } + } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java index a200944ca..d5950d941 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/PushServiceImpl.java @@ -83,7 +83,7 @@ public class PushServiceImpl implements PushService { @Override public Boolean pushDataToPOS(ZxjpApiRequest zxjpApiRequest) { - String apiUrl = url + "XXX"; + String apiUrl = url + "/dzgV1/zxcrm/shop/upsert"; return executeApiCall(apiUrl,zxjpApiRequest, Boolean.class,username,secret); } @@ -93,7 +93,7 @@ public class PushServiceImpl implements PushService { } private Boolean modifyPosPassword(ModifyPasswordDTO dto) { - String apiUrl = url + "XXX"; + String apiUrl = url + "/dzgV1/zxcrm/business_user/modifyPassword"; return executeApiCall(apiUrl,dto, Boolean.class,username,secret); } @@ -102,7 +102,7 @@ public class PushServiceImpl implements PushService { public Boolean modifyDownstreamSystem(ModifyPasswordDTO modifyPasswordDTO) { try { this.modifyPosPassword(modifyPasswordDTO); - this.modifyXGJPassword(modifyPasswordDTO); + //this.modifyXGJPassword(modifyPasswordDTO); } catch (Exception e) { throw new ServiceException(ErrorCodeEnum.THIRD_API_ERROR); } @@ -123,7 +123,7 @@ public class PushServiceImpl implements PushService { @Override public String getPosToken(GetAccessTokenDTO dto) { - String apiUrl = url + "XXX"; + String apiUrl = url + "/dzgV1/zxcrm/business_user/generateToken"; return executeApiCall(apiUrl,dto, String.class,username,secret); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java index 73e2af914..1f600384f 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ShopAccountServiceImpl.java @@ -94,20 +94,20 @@ public class ShopAccountServiceImpl implements ShopAccountService { } HyPartnerUserInfoDO hyPartnerUserInfoDO = hyPartnerUserInfoDAO.selectByPartnerId(shopInfo.getPartnerId()); hyPartnerUserInfoDO.setDownstreamSystemPassword(modifyPasswordDTO.getPassword()); + hyPartnerUserInfoDO.setDownstreamSystemSecondaryPassword(modifyPasswordDTO.getPasswordSecondary()); hyPartnerUserInfoDO.setDownstreamSystemSalting(modifyPasswordDTO.getPasswordSalt()); hyPartnerUserInfoDO.setUpdateTime(new Date()); hyPartnerUserInfoDAO.updatePasswordByPartnerId(hyPartnerUserInfoDO); - List shopListSuccessOpen = shopService.getShopListSuccessOpen(shopInfo.getLineId()); - //修改数据 - List shopIdList = shopListSuccessOpen.stream().map(MiniShopsResponse::getShopId).collect(Collectors.toList()); + List shopIdList = shopInfoDAO.getShopIdList(shopInfo.getLineId()); //批量修改密码 密码盐 - shopAccountDAO.batchUpdatePasswordByShopIds(shopIdList,modifyPasswordDTO.getPassword(),modifyPasswordDTO.getPasswordSalt(),new Date()); + shopAccountDAO.batchUpdatePasswordByShopIds(shopIdList,modifyPasswordDTO.getPassword(),modifyPasswordDTO.getPasswordSecondary(),modifyPasswordDTO.getPasswordSalt(),new Date()); //当前加盟商所有开店成功的CODE - List shopCodeList = shopListSuccessOpen.stream().map(MiniShopsResponse::getShopCode).collect(Collectors.toList()); + List shopCodeList = shopInfoDAO.getShopCodeList(shopInfo.getLineId()); modifyPasswordDTO.setShopCode(shopCodeList); + modifyPasswordDTO.setMobile(hyPartnerUserInfoDO.getMobile()); //推送下游系统 pushService.modifyDownstreamSystem(modifyPasswordDTO); @@ -202,7 +202,9 @@ public class ShopAccountServiceImpl implements ShopAccountService { // TODO: 2025/4/8 suzhuhong_ try { if (DownSystemTypeEnum.POS.equals(downSystemTypeEnum)){ - pushService.pushDataToPOS(data); + Boolean successFlag = pushService.pushDataToPOS(data); + OpenStatusEnum openStatusEnum = successFlag ? OpenStatusEnum.OPENSTATUSENUM_5 : OpenStatusEnum.OPENSTATUSENUM_6; + shopAccountDAO.updateEntryStatusByShopIdAndSystemName(accountAuditDTO.getShopId(),Arrays.asList(ShopAccountEnum.HUOMA.getSystemName()),openStatusEnum.getCode()); }else { pushService.pushDataToXGJ(data); } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java index 22646d865..c3336ed70 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/config/OpenApiValidateFilter.java @@ -4,6 +4,8 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.utils.OpenSignatureUtil; import com.cool.store.utils.UUIDUtils; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.slf4j.MDC; import org.springframework.beans.factory.annotation.Value; @@ -12,8 +14,11 @@ import org.springframework.stereotype.Component; import javax.servlet.*; import javax.servlet.http.HttpServletRequest; +import java.io.BufferedReader; import java.io.IOException; import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; import java.util.stream.Collectors; /** @@ -50,7 +55,7 @@ public class OpenApiValidateFilter implements Filter { // 1. 验证时间戳 try { - String timestampStr = request.getParameter("timestamp"); + String timestampStr = request.getHeader("timestamp"); if (timestampStr == null) { log.info("timestampStr is null {}","缺少timestamp参数"); throw new ServiceException(ErrorCodeEnum.SIGN_FAIL); @@ -71,22 +76,33 @@ public class OpenApiValidateFilter implements Filter { } // 2. 验证签名 - String appKey = request.getParameter("appKey"); + String appKey = request.getHeader("appkey"); if (appKey == null || !coolAppKey.equals(appKey)) { log.info("OpenApiValidateFilter==>{}","无效的appKey"); throw new ServiceException(ErrorCodeEnum.SIGN_FAIL); } - String clientSign = request.getParameter("sign"); + String clientSign = request.getHeader("sign"); if (clientSign == null) { throw new ServiceException(ErrorCodeEnum.SIGN_FAIL); } + // 1. 读取请求体 + StringBuilder requestBody = new StringBuilder(); + try (BufferedReader reader = request.getReader()) { + String line; + while ((line = reader.readLine()) != null) { + requestBody.append(line); + } + } - // 获取所有请求参数 - Map params = request.getParameterMap().entrySet().stream() - .collect(Collectors.toMap( - Map.Entry::getKey, - e -> String.join(",", e.getValue()))); + String jsonBody = requestBody.toString(); + + // 2. 使用 Jackson 解析 JSON 并转为 TreeMap（自动按键排序） + ObjectMapper objectMapper = new ObjectMapper(); + SortedMap params = objectMapper.readValue( + jsonBody, + new TypeReference>() {} + ); String serverSign = OpenSignatureUtil.generateSign(params, coolAppSecret); diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java index 374861725..170f7d95d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/OpenApiController.java @@ -4,9 +4,7 @@ import com.cool.store.dto.StatusRefreshDTO; import com.cool.store.response.bigdata.ApiResponse; import com.cool.store.service.OpenApiService; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -23,9 +21,10 @@ public class OpenApiController { @Resource OpenApiService openApiService; - @GetMapping("/statusRefresh") - public ApiResponse statusRefresh(StatusRefreshDTO statusRefreshDTO){ - return ApiResponse.success(openApiService.statusRefresh(statusRefreshDTO)); + @PostMapping("/statusRefresh") + public ApiResponse statusRefresh(@RequestBody StatusRefreshDTO statusRefreshDTO){ + //openApiService.statusRefresh(statusRefreshDTO) + return ApiResponse.success(Boolean.TRUE); } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java index c892a6d37..7a92d6420 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCTestController.java @@ -3,6 +3,7 @@ package com.cool.store.controller.webb; import com.alibaba.fastjson.JSONObject; import com.cool.store.constants.CommonConstants; import com.cool.store.dao.*; +import com.cool.store.dto.ModifyPasswordDTO; import com.cool.store.entity.*; import com.cool.store.enums.DownSystemTypeEnum; import com.cool.store.enums.MessageEnum; @@ -258,4 +259,12 @@ public class PCTestController { } + + @Resource + ShopAccountService accountService; + @ApiOperation("修改密码") + @GetMapping("/modifyPassword") + public ResponseResult modifyPassword(@RequestBody ModifyPasswordDTO request) { + return ResponseResult.success(accountService.modifyPassword(request)); + } } diff --git a/coolstore-partner-web/src/main/resources/application-online.properties b/coolstore-partner-web/src/main/resources/application-online.properties index 3bc06c68e..d3e67b460 100644 --- a/coolstore-partner-web/src/main/resources/application-online.properties +++ b/coolstore-partner-web/src/main/resources/application-online.properties @@ -80,3 +80,13 @@ mybatis.configuration.variables.enterpriseId=214ac5a3a517472a87268e02a2e6410a enterprise.dingCorpId=wpayJeDAAAklx_q1jGhyGUd4yEh8vV_g qywx.task.notice.url2=https://store-h5.coolstore.cn/?corpId=%s&appType=%s#/notice?target=%s¬iceType=zx&corpId=%s&appType=%s&eid=%s + + + +api.auth.url=https://api.zhengxindzg.cn +api.auth.username=GkqgAhUJ7p9swJo +api.auth.secret=NzVrnS3OWiupdDY + +xgj.api.auth.url=https://masterdata.zhengxinfood.com/dmp/one-id/ +xgj.api.auth.username=2677a58dd9e24fc6b20e835ef5f19e63 +xgj.api.auth.secret=3fe724f9607448728ee3393eff75718a diff --git a/coolstore-partner-web/src/main/resources/application-test.properties b/coolstore-partner-web/src/main/resources/application-test.properties index 1a776224e..892e14608 100644 --- a/coolstore-partner-web/src/main/resources/application-test.properties +++ b/coolstore-partner-web/src/main/resources/application-test.properties @@ -94,14 +94,14 @@ zx.big.data.appKey=ff203b5567744feaaae49fb86f58c5bf zx.big.data.appSecret=35b8b9a400b4430fa022190be0913cd6 #火吗POS -api.auth.url=https://api.zhengxindzg.cn -api.auth.username=GkqgAhUJ7p9swJo -api.auth.secret=NzVrnS3OWiupdDY +api.auth.url=https://api.hmdzg.top +api.auth.username=VA59C0ubfcpcVpl +api.auth.secret=H9YKHF6R7N16Fvy #新管家账号 -xgj.api.auth.url=**** -xgj.api.auth.username=**** -xgj.api.auth.secret=**** +xgj.api.auth.url=http://117.139.13.24:11180/dmp/one-id/ +xgj.api.auth.username=2677a58dd9e24fc6b20e835ef5f19e63 +xgj.api.auth.secret=3fe724f9607448728ee3393eff75718a #云流水账号 yls.api.auth.url=**** @@ -113,5 +113,5 @@ xzg.api.auth.url=**** xzg.api.auth.username=**** xzg.api.auth.secret=**** -cool.api.appKey=123 -cool.api.secret=123 +cool.api.appKey=k8J7fG2qR5tY9vX3 +cool.api.secret=wP4sN6dL8zK2xM9c From f455a7da9396aab759f47e2efa630d4d9b3512bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 11 Apr 2025 10:28:14 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=E5=B9=B3=E5=8F=B0=E8=B4=A6=E5=8F=B7?= =?UTF-8?q?=E5=8D=87=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ShopAccountMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml index 5639bd6c0..e0928c551 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/ShopAccountMapper.xml @@ -68,6 +68,7 @@ xfsg_shop_account WHERE shop_id = #{shopId} + order by id From 2a01e1542977b45bd92870b8b8a70a95aae63278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Fri, 11 Apr 2025 10:52:04 +0800 Subject: [PATCH 3/3] feat:mini --- .../webb/ShopAccountController.java | 17 ------------- .../webc/MiniShopAccountController.java | 24 +++++++++++++++++++ 2 files changed, 24 insertions(+), 17 deletions(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java index 80431d9d7..1020ccf5f 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/ShopAccountController.java @@ -74,23 +74,6 @@ public class ShopAccountController { } - @ApiOperation("获取云流水免登token") - @PostMapping("/getYlsToken") - public ResponseResult getYlsToken(@RequestBody @Validated GetAccessTokenDTO dto) { - return ResponseResult.success(pushService.getYlsToken(dto)); - } - - @ApiOperation("获取POS免登token") - @PostMapping("/getPosToken") - public ResponseResult getPosToken(@RequestBody @Validated GetAccessTokenDTO dto) { - return ResponseResult.success(pushService.getPosToken(dto)); - } - - @ApiOperation("获取新掌柜免登token") - @PostMapping("/getXzgToken") - public ResponseResult getXzgToken(@RequestBody @Validated GetAccessTokenDTO dto) { - return ResponseResult.success(pushService.getXzgToken(dto)); - } } diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java index daf22e8d7..ffd9702d2 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniShopAccountController.java @@ -1,11 +1,14 @@ package com.cool.store.controller.webc; +import com.cool.store.dto.GetAccessTokenDTO; import com.cool.store.dto.ModifyPasswordDTO; import com.cool.store.dto.ShopAccount.ShopAccountDTO; import com.cool.store.response.ResponseResult; +import com.cool.store.service.PushService; import com.cool.store.service.ShopAccountService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -25,6 +28,9 @@ public class MiniShopAccountController { @Resource ShopAccountService accountService; + @Resource + PushService pushService; + @ApiOperation("根据门店shopId查询平台账号") @GetMapping("/getShopAccountByShopId") @@ -39,5 +45,23 @@ public class MiniShopAccountController { return ResponseResult.success(accountService.modifyPassword(request)); } + @ApiOperation("获取云流水免登token") + @PostMapping("/getYlsToken") + public ResponseResult getYlsToken(@RequestBody @Validated GetAccessTokenDTO dto) { + return ResponseResult.success(pushService.getYlsToken(dto)); + } + + @ApiOperation("获取POS免登token") + @PostMapping("/getPosToken") + public ResponseResult getPosToken(@RequestBody @Validated GetAccessTokenDTO dto) { + return ResponseResult.success(pushService.getPosToken(dto)); + } + + @ApiOperation("获取新掌柜免登token") + @PostMapping("/getXzgToken") + public ResponseResult getXzgToken(@RequestBody @Validated GetAccessTokenDTO dto) { + return ResponseResult.success(pushService.getXzgToken(dto)); + } + }