From 11ce6dc306dd23068cb05e5de8e8953d1bcbd762 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E9=9D=9E=E5=87=A1?= Date: Tue, 14 Apr 2026 01:14:25 +0000 Subject: [PATCH] Merge #95 into master from cc_20260412_jwt_ge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix * cc_20260412_jwt_ge: (7 commits squashed) - fix:营帐通JWT生成 - fix:营帐通JWT改为post - fix:修改secret - fix:配置 - fix:pc端营帐通jwt接口 - Merge branch 'master' into cc_20260412_jwt_ge - fix Signed-off-by: 王非凡 Merged-by: 正新 CR-link: https://codeup.aliyun.com/692ea314dec569489f6f167c/hangzhou/java/custom_zxjp/change/95 --- .../controller/webc/ThirdTokenController.java | 47 ------------------- 1 file changed, 47 deletions(-) delete mode 100644 coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ThirdTokenController.java diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ThirdTokenController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ThirdTokenController.java deleted file mode 100644 index dc6da67d0..000000000 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webc/ThirdTokenController.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.cool.store.controller.webc; - -import cn.hutool.jwt.JWTUtil; -import com.cool.store.request.YztTokenGenRequest; -import com.cool.store.response.ResponseResult; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.HashMap; -import java.util.Map; - -/** - *

- * 三方验签 - *

- * - * @author wangff - * @since 2026/4/12 - */ -@Slf4j -@RestController -@RequestMapping("/mini/third/token") -@Api(tags = "三方验签") -public class ThirdTokenController { - - private static final long EXPIRE_SECONDS = 3600; - - @Value("${third.party.appKey}") - private String appKey; - @Value("${third.party.secret}") - private String secret; - - @PostMapping("/generate") - @ApiOperation("营帐通JWT") - public ResponseResult generateToken(@RequestBody @Validated YztTokenGenRequest request) { - Map payload = new HashMap<>(); - payload.put("platform", "crm"); - payload.put("storeSn", request.getStoreNum()); - payload.put("appKey", appKey); - payload.put("exp", System.currentTimeMillis() / 1000 + EXPIRE_SECONDS); - return ResponseResult.success(JWTUtil.createToken(payload, secret.getBytes())); - } -}