From 115edc19fa256b5f5ff8aa0f081f3b5ee943e6e5 Mon Sep 17 00:00:00 2001 From: Jerry Yan <792602257@qq.com> Date: Fri, 30 May 2025 09:37:03 +0800 Subject: [PATCH] Deprecated --- .../ycwl/basic/constant/WeiXinConstant.java | 126 ------------------ .../mobile/AppScenicController.java | 1 + .../controller/mobile/AppVideoController.java | 1 + .../pc/FaceDetectLogController.java | 1 + .../controller/pc/FaceSampleController.java | 1 + .../basic/controller/pc/SourceController.java | 21 +-- .../basic/controller/pc/TaskController.java | 1 + .../basic/controller/pc/VideoController.java | 1 + .../controller/proxy/ProxyController.java | 1 + .../mobile/impl/AppMemberServiceImpl.java | 5 +- 10 files changed, 15 insertions(+), 144 deletions(-) delete mode 100644 src/main/java/com/ycwl/basic/constant/WeiXinConstant.java diff --git a/src/main/java/com/ycwl/basic/constant/WeiXinConstant.java b/src/main/java/com/ycwl/basic/constant/WeiXinConstant.java deleted file mode 100644 index 602b007..0000000 --- a/src/main/java/com/ycwl/basic/constant/WeiXinConstant.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.ycwl.basic.constant; - -import com.wechat.pay.java.service.payments.model.Transaction; - -import java.util.HashMap; -import java.util.Map; - -/** - *

@description: 微信常量

- *

@author: songmingsong

- **/ -public class WeiXinConstant { - - private static final Map STATE_DESCRIPTION_MAP = new HashMap<>(); - - static { - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.SUCCESS, "SUCCESS"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.REFUND, "REFUND"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.NOTPAY, "NOTPAY"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.CLOSED, "CLOSED"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.REVOKED, "REVOKED"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.USERPAYING, "USERPAYING"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.PAYERROR, "PAYERROR"); - STATE_DESCRIPTION_MAP.put(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum.ACCEPT, "ACCEPT"); - } - - public static String getDescriptionState(com.wechat.pay.java.service.payments.model.Transaction.TradeStateEnum state) { - return STATE_DESCRIPTION_MAP.getOrDefault(state, "未知状态"); - } - - private static final Map STATE_DESCRIPTION_MAP_TYPE = new HashMap<>(); - - static { - STATE_DESCRIPTION_MAP_TYPE.put(Transaction.TradeTypeEnum.JSAPI, "JSAPI"); - STATE_DESCRIPTION_MAP_TYPE.put(Transaction.TradeTypeEnum.NATIVE, "NATIVE"); - STATE_DESCRIPTION_MAP_TYPE.put(Transaction.TradeTypeEnum.APP, "APP"); - STATE_DESCRIPTION_MAP_TYPE.put(Transaction.TradeTypeEnum.MICROPAY, "MICROPAY"); - STATE_DESCRIPTION_MAP_TYPE.put(Transaction.TradeTypeEnum.MWEB, "MWEB"); - STATE_DESCRIPTION_MAP_TYPE.put(Transaction.TradeTypeEnum.FACEPAY, "FACEPAY"); - } - - public static String getDescriptionType(Transaction.TradeTypeEnum type) { - return STATE_DESCRIPTION_MAP_TYPE.getOrDefault(type, "未知类型"); - } - - - /** - * 公众号模板地址 - */ - public static final String PUBLIC_ACCOUNT_TEMPLATE = - "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token="; - /** - * 获取微信用户基本信息地址 - */ - public static final String WECHAT_OAUTH_ACCESS_TOKEN = "https://api.weixin.qq.com/sns/oauth2/access_token"; - /** - * 获取ACCESS_TOKEN - */ - public static final String ACCESS_TOKEN = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; - /** - * 登录凭证校验 - */ - public static final String GET_OPEN_ID = "https://api.weixin.qq.com/sns/jscode2session"; - /** - * 获取小程序地址 - */ - public static final String GET_MINI_QRCODE = "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=%s"; - /** - * 获取用户基本信息 - */ - public static final String GET_USER_BASIC_INFO = "https://api.weixin.qq.com/sns/userinfo?access_token=%s&openid=%s&lang=zh_CN"; - /** - * 获取包含请求参数ACCESS_TOKEN - */ - public static final String ACCESS_TOKEN_WITH_PARAM = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s"; - /** - * 获取小程序 URL Link - */ - public static final String GENERATE_URL_LINK = "https://api.weixin.qq.com/wxa/generate_urllink?access_token=%s"; - - /** - * 发送模板消息 - */ - public static final String MESSAGE_SEND_URL = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="; - - /*-----------------------------*/ - /* */ - /* 支付相关 */ - /* */ - /*-----------------------------*/ - /** - * 退款链接 - */ - public static final String REFUNDS_URL = "https://api.mch.weixin.qq.com/v3/refund/domestic/refunds"; - public static final String REFUNDS_URi = "/v3/refund/domestic/refunds/"; - /** - * 其他 - */ - public static final String WECHATPAY_STATUS = "status"; - public static final String WECHATPAY_SUCCESS = "SUCCESS"; - public static final String WECHATPAY_PROCESSING = "PROCESSING"; - public static final String WECHATPAY_OUT_TRADE_NO = "out_trade_no"; - public static final String WECHATPAY_OUT_REFUND_NO = "out_refund_no"; - public static final String WECHATPAY_REFUND = "refund"; - public static final String WECHATPAY_TOTAL = "total"; - public static final String WECHATPAY_CURRENCY = "currency"; - public static final String WECHATPAY_CURRENCY_CNY = "CNY"; - public static final String WECHATPAY_AMOUNT = "amount"; - public static final String WECHATPAY_NOTIFY_URL = "notify_url"; - - public static final String REFUNDS_RESOURCE = "resource"; - public static final String REFUNDS_CIPHERTEXT = "ciphertext"; - public static final String REFUNDS_NONCE = "nonce"; - public static final String REFUNDS_REFUND_STATUS = "refund_status"; - public static final String REFUNDS_ASSOCIATED_DATA = "associated_data"; - public static final String WECHAT_ERRCODE = "errcode"; - public static final String WECHAT_ERRMSG = "errmsg"; - /** - * 退款的token的SCHEMA - */ - public static final String REFUNDS_SCHEMA = "Wechatpay-Signature-Type "; // 注意有一个空格 - /** - * 支付请求头 - */ - public static final String WECHATPAY_SIGNATURE_TYPE = "Wechatpay-Signature-Type"; -} diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java index 83ac966..a131661 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppScenicController.java @@ -29,6 +29,7 @@ import java.util.List; * @Date:2024/12/5 10:22 */ @Slf4j +@Deprecated @RestController @RequestMapping("/api/mobile/scenic/v1") @Api(tags = "景区相关接口") diff --git a/src/main/java/com/ycwl/basic/controller/mobile/AppVideoController.java b/src/main/java/com/ycwl/basic/controller/mobile/AppVideoController.java index 197e719..a636e16 100644 --- a/src/main/java/com/ycwl/basic/controller/mobile/AppVideoController.java +++ b/src/main/java/com/ycwl/basic/controller/mobile/AppVideoController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +@Deprecated @RestController @RequestMapping("/api/mobile/video/v1") public class AppVideoController { diff --git a/src/main/java/com/ycwl/basic/controller/pc/FaceDetectLogController.java b/src/main/java/com/ycwl/basic/controller/pc/FaceDetectLogController.java index 9b115f1..f8a9273 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/FaceDetectLogController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/FaceDetectLogController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; +@Deprecated @RestController @RequestMapping("/api/face/detect_log/v1") public class FaceDetectLogController { diff --git a/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java b/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java index 181d783..0ba5213 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/FaceSampleController.java @@ -17,6 +17,7 @@ import java.util.List; * @Author:longbinbin * @Date:2024/12/2 16:33 */ +@Deprecated @RestController @RequestMapping("/api/faceSample/v1") @Api(tags = "人脸样本管理") diff --git a/src/main/java/com/ycwl/basic/controller/pc/SourceController.java b/src/main/java/com/ycwl/basic/controller/pc/SourceController.java index 5d2d2f2..1c2b1c1 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/SourceController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/SourceController.java @@ -1,5 +1,6 @@ package com.ycwl.basic.controller.pc; +import com.ycwl.basic.annotation.IgnoreToken; import com.ycwl.basic.model.jwt.JwtInfo; import com.ycwl.basic.model.pc.source.entity.SourceEntity; import com.ycwl.basic.model.pc.source.req.SourceReqQuery; @@ -23,41 +24,29 @@ public class SourceController { @Autowired private SourceService sourceService; + @Deprecated @ApiOperation("分页查询视频源") @PostMapping("/page") public ApiResponse pageQuery(@RequestBody SourceReqQuery sourceReqQuery) { return sourceService.pageQuery(sourceReqQuery); } + @Deprecated @ApiOperation("查询视频源列表") @PostMapping("/list") public ApiResponse list(@RequestBody SourceReqQuery sourceReqQuery) { return sourceService.list(sourceReqQuery); } - @ApiOperation("查询视频源详情") - @GetMapping("getDetail/{id}") - public ApiResponse getById(@PathVariable Long id) { - JwtInfo worker = JwtTokenUtil.getWorker(); - return sourceService.getById(id, worker.getUserId()); - } @PostMapping("/{id}/cutVideo") + @IgnoreToken public ApiResponse cutVideo(@PathVariable("id") Long id) { return sourceService.cutVideo(id); } - @ApiOperation("添加视频源") - @PostMapping("/add") - public ApiResponse add(@RequestBody SourceEntity source) { - return sourceService.add(source); - } + @Deprecated @ApiOperation("删除视频源") @DeleteMapping("/delete/{id}") public ApiResponse deleteById(@PathVariable Long id) { return sourceService.deleteById(id); } - @ApiOperation("修改视频源") - @PostMapping("/update") - public ApiResponse update(@RequestBody SourceEntity source) { - return sourceService.update(source); - } } diff --git a/src/main/java/com/ycwl/basic/controller/pc/TaskController.java b/src/main/java/com/ycwl/basic/controller/pc/TaskController.java index f71e7a4..73049c0 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/TaskController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/TaskController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/api/task/v1") +@Deprecated @Api(tags = "任务列表管理") public class TaskController { diff --git a/src/main/java/com/ycwl/basic/controller/pc/VideoController.java b/src/main/java/com/ycwl/basic/controller/pc/VideoController.java index 99306d8..067eaaa 100644 --- a/src/main/java/com/ycwl/basic/controller/pc/VideoController.java +++ b/src/main/java/com/ycwl/basic/controller/pc/VideoController.java @@ -20,6 +20,7 @@ import java.util.List; @RestController @RequestMapping("/api/video/v1") +@Deprecated @Api(tags = "视频成片管理") public class VideoController { diff --git a/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java b/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java index 87a0c95..7c711d0 100644 --- a/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java +++ b/src/main/java/com/ycwl/basic/controller/proxy/ProxyController.java @@ -18,6 +18,7 @@ import java.util.Enumeration; import java.util.List; import java.util.Map; +@Deprecated @RestController public class ProxyController { @IgnoreToken diff --git a/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java index 1544a7b..a9e0de4 100644 --- a/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java +++ b/src/main/java/com/ycwl/basic/service/mobile/impl/AppMemberServiceImpl.java @@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.ObjectMapper; import com.ycwl.basic.constant.BaseContextHandler; import com.ycwl.basic.constant.NumberConstant; -import com.ycwl.basic.constant.WeiXinConstant; import com.ycwl.basic.enums.BizCodeEnum; import com.ycwl.basic.enums.WechatErrorCodeEnum; import com.ycwl.basic.exception.AppException; @@ -47,6 +46,8 @@ public class AppMemberServiceImpl implements AppMemberService { @Autowired private ScenicRepository scenicRepository; + public static final String GET_OPEN_ID = "https://api.weixin.qq.com/sns/jscode2session"; + @Override public Map getOpenId(Long scenicId, String code) { Map paramMap = new HashMap<>(NumberConstant.FOUR); @@ -56,7 +57,7 @@ public class AppMemberServiceImpl implements AppMemberService { paramMap.put("js_code", code); paramMap.put("grant_type", "authorization_code"); try { - String response = HttpUtil.post(WeiXinConstant.GET_OPEN_ID, paramMap); + String response = HttpUtil.post(GET_OPEN_ID, paramMap); if (StringUtils.isBlank(response)) { return null; }