From 25fd361007a843306bb4a1f4a5204ef9243fb974 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期三, 27 三月 2024 19:18:53 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java | 86 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 86 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java index 0aed5d4..ddd66a5 100644 --- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java +++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/client/ClientCtrl.java @@ -1,5 +1,8 @@ package com.dy.pipIrrSell.client; +import com.alibaba.fastjson2.JSONObject; +import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; +import com.aliyuncs.exceptions.ClientException; import com.dy.common.aop.SsoAop; import com.dy.common.webUtil.BaseResponse; import com.dy.common.webUtil.BaseResponseUtils; @@ -8,6 +11,9 @@ import com.dy.pipIrrGlobal.pojoBa.BaClient; import com.dy.pipIrrGlobal.pojoSe.SeClient; import com.dy.pipIrrGlobal.voSe.VoClient; +import com.dy.pipIrrSell.result.SellResultCode; +import com.dy.pipIrrSell.sms.AliyunSmsSv; +import com.dy.pipIrrSell.sms.RandomCode; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; @@ -38,6 +44,8 @@ @RequiredArgsConstructor public class ClientCtrl { private final ClientSv clientSv; + private final AliyunSmsSv aliyunSmsSv; + //private final RedisUtils redisUtils; /** * 鑾峰彇鍐滄埛鍒楄〃 @@ -324,4 +332,82 @@ } return BaseResponseUtils.buildSuccess(map_WaterTypes); } + + /** + * 鍙戦�侀獙璇佺爜 + * @param phoneNumber + * @return + */ + @Operation(summary = "鍙戦�侀獙璇佺爜", description = "鍙戦�侀獙璇佺爜") + @ApiResponses(value = { + @ApiResponse( + responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, + description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�", + content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE, + schema = @Schema(implementation = Boolean.class))} + ) + }) + @PostMapping(path = "send_sms") + @SsoAop() + public BaseResponse<Boolean> sendSms(@RequestParam(name = "phoneNumber", required = true) String phoneNumber) throws ClientException { + if(phoneNumber == null || phoneNumber.length() <= 0) { + return BaseResponseUtils.buildFail(SellResultCode.PHONE_NUMBER_CANNOT_BE_NULL.getMessage()); + } + + // 鐢熸垚6浣嶉獙璇佺爜骞惰浆涓篔son鏍煎紡 + String securityCode = String.valueOf(RandomCode.genCode()); + JSONObject param = new JSONObject(); + param.put("code", securityCode); + String templateParam = param.toJSONString(); + + //redisUtils.set(phoneNumber, securityCode, 60); + + SendSmsResponse response = aliyunSmsSv.sendSms(phoneNumber, templateParam); + if (response.getCode().equals("OK")) { + // 鍙戦�佹垚鍔熷鐞嗛�昏緫 + return BaseResponseUtils.buildSuccess(true) ; + } else { + // 鍙戦�佸け璐ュ鐞嗛�昏緫 + return BaseResponseUtils.buildFail(SellResultCode.SECURITY_CODE_SEND_FAIL.getMessage()) ; + } + } + + /** + * 鏍¢獙楠岃瘉鐮� + * @param phoneNumber + * @param code + * @return + * @throws ClientException + */ + @Operation(summary = "鏍¢獙楠岃瘉鐮�", description = "鏍¢獙楠岃瘉鐮�") + @ApiResponses(value = { + @ApiResponse( + responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE, + description = "鎿嶄綔缁撴灉锛歵rue锛氭垚鍔燂紝false锛氬け璐ワ紙BaseResponse.content锛�", + content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE, + schema = @Schema(implementation = Boolean.class))} + ) + }) + @PostMapping(path = "verify") + @SsoAop() + public BaseResponse<Boolean> verify(@RequestParam("phoneNumber") String phoneNumber, @RequestParam("code") String code) throws ClientException { + if(phoneNumber == null || phoneNumber.length() <= 0 || code == null || code.length() <=0) { + return BaseResponseUtils.buildFail(SellResultCode.VERIFY_PARAMS_INCOMPLETE.getMessage()); + } + + // redis涓敭涓嶅瓨鍦ㄦ垨閿�间笉瀛樺湪鍒欐彁绀烘牎楠屽け璐� + //if(!redisUtils.hasKey(phoneNumber) || redisUtils.get(phoneNumber) == null) + // return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage()); + // + //String code_redis = redisUtils.get(phoneNumber).toString(); + //System.out.println("--------------------: " + code_redis); + // + //if(code_redis != null && code_redis.equals(code)) { + // return BaseResponseUtils.buildSuccess(true) ; + //}else { + // return BaseResponseUtils.buildFail(SellResultCode.CODE_VERIFY_FAIL.getMessage()); + //} + + return BaseResponseUtils.buildSuccess(true) ; + } } -- Gitblit v1.8.0