feats

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>xiangsong</artifactId>
-	<version>1.0.1</version>
+	<version>1.0.4</version>
 	<name>xiangsong</name>
 	<description>香颂</description>
 
@@ -95,6 +95,12 @@
 			<artifactId>aliyun-sdk-oss</artifactId>
 			<version>2.8.3</version>
 		</dependency>
+
+		<dependency>
+			<groupId>com.aliyun</groupId>
+			<artifactId>aliyun-java-sdk-core</artifactId>
+			<version>[4.4.9,5.0.0)</version>
+		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.dom4j/dom4j -->
 		<dependency>
 			<groupId>org.dom4j</groupId>

src/main/java/com/huiju/estateagents/common/smsService/Captcha.java

@@ -0,0 +1,157 @@
+package com.huiju.estateagents.common.smsService;
+
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Random;
+
+@Slf4j
+@Component
+@EnableScheduling
+public class Captcha {
+    @Value("${sms-service.captcha.code}")
+    String code;
+
+    @Value("${sms-service.captcha.product}")
+    String product;
+
+    @Value("${sms-service.captcha.sign}")
+    String sign;
+
+    @Autowired
+    Service service;
+
+    // 默认超时时间, 单位秒
+    Integer expireSec = 5 * 60;
+
+    // 缓存电话列表
+    Hashtable<String, Phone> allPhones = new Hashtable<>();
+
+    /**
+     * 发送验证码
+     * @param tel
+     * @param captcha
+     * @throws Exception
+     */
+    public void send(String tel, String captcha) throws Exception {
+        if (null == captcha) {
+            throw new Exception("没有有效的验证码");
+        }
+
+        Map<String, String> content = new HashMap<>();
+        content.put("code", captcha);
+        content.put("product", product);
+
+        Phone phone = new Phone()
+                .setNumber(tel)
+                .setCaptcha(captcha)
+                .setExpire(expireTime());
+
+        Service.Message message = new Service.Message()
+                .setCode(code)
+                .setSign(sign)
+                .setTel(tel)
+                .setContent(JSONObject.toJSONString(content));
+
+        try {
+            service.sendMessage(message);
+        } catch (Exception e) {
+            // 修改友好点的错误
+            throw new Exception("发送验证码失败");
+        }
+
+        log.info(String.format("发送验证码 %s 到手机 %s", captcha, tel));
+
+        // 发送成功, 写入缓存
+        toCache(phone);
+    }
+
+    /**
+     * 校验验证码
+     * @param tel
+     * @param captcha
+     * @return
+     */
+    public boolean validate(String tel, String captcha) {
+        Phone phone = fromCache(tel);
+        if (null == phone) {
+            return false;
+        }
+
+        if (null == captcha || !captcha.equals(phone.getCaptcha())) {
+            return false;
+        }
+
+        // 过期则清除缓存
+        boolean res = checkExpire(phone);
+        if (res) {
+            clearCache(phone);
+        }
+
+        return !res;
+    }
+
+    /**
+     * 辅助方法: 随机生成验证码
+     * @param length
+     * @return
+     */
+    public String randCaptcha(int length) {
+        Random random = new Random();
+        String res = "";
+        for (int i = 0; i < length; i ++) {
+            int num = random.nextInt(10);
+            res += String.valueOf(num);
+        }
+        return res;
+    }
+
+    /**
+     * 定时任务 每半小时 清除一次不用的手机号
+     */
+    @Scheduled(fixedRate = 1000 * 60 * 30)
+    public void clearUnused() {
+        for (Phone phone: allPhones.values()) {
+            if (checkExpire(phone)) {
+                clearCache(phone);
+            }
+        }
+    }
+
+    private Phone fromCache(String phone) {
+        return allPhones.get(phone);
+    }
+    private void toCache(Phone phone) {
+        allPhones.put(phone.getNumber(), phone);
+    }
+    private void clearCache(Phone phone) { allPhones.remove(phone); }
+
+    private LocalDateTime expireTime() {
+        return LocalDateTime.now().plusSeconds(expireSec);
+    }
+
+    // 过期返回 true
+    private boolean checkExpire(Phone phone) {
+        return LocalDateTime.now().isAfter(phone.getExpire());
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Phone {
+        String number;
+        String captcha;
+        LocalDateTime expire;
+    }
+
+}

src/main/java/com/huiju/estateagents/common/smsService/Service.java

@@ -0,0 +1,72 @@
+package com.huiju.estateagents.common.smsService;
+
+import com.aliyuncs.CommonRequest;
+import com.aliyuncs.CommonResponse;
+import com.aliyuncs.DefaultAcsClient;
+import com.aliyuncs.IAcsClient;
+import com.aliyuncs.http.MethodType;
+import com.aliyuncs.profile.DefaultProfile;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+public class Service implements InitializingBean {
+
+    @Value("${sms-service.accessKeyId}")
+    String accessKeyId;
+
+    @Value("${sms-service.accessKeySecret}")
+    String accessKeySecret;
+
+    //产品名称:云通信短信API产品,开发者无需替换
+    static final String product = "Dysmsapi";
+    //产品域名,开发者无需替换
+    static final String domain = "dysmsapi.aliyuncs.com";
+    //API 的名称,开发者无需替换
+    static final String action = "SendSms";
+    //API RegionId,开发者无需替换
+    static final String regionId = "cn-hangzhou";
+    //API 版本,开发者无需替换
+    static final String verison = "2017-05-25";
+
+    IAcsClient acsClient;
+
+    public void sendMessage(Message message) throws Exception {
+        request(message);
+    }
+
+    private CommonResponse request(Message message) throws Exception {
+        CommonRequest request = new CommonRequest();
+        request.setSysMethod(MethodType.POST);
+        request.setSysDomain(domain);
+        request.setSysVersion(verison);
+        request.setSysAction(action);
+        request.putQueryParameter("RegionId", regionId);
+        request.putQueryParameter("PhoneNumbers", message.getTel());
+        request.putQueryParameter("SignName", message.getSign());
+        request.putQueryParameter("TemplateCode", message.getCode());
+        request.putQueryParameter("TemplateParam", message.getContent());
+
+        return acsClient.getCommonResponse(request);
+    }
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        DefaultProfile profile = DefaultProfile.getProfile("cn-hangzhou", accessKeyId, accessKeySecret);
+        acsClient = new DefaultAcsClient(profile);
+    }
+
+    @Data
+    @Accessors(chain = true)
+    public static class Message {
+        String code;
+        String tel;
+        String sign;
+        String content;
+    }
+}

src/main/java/com/huiju/estateagents/controller/CommonController.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.AliOSSUtils;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.smsService.Captcha;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITdMiniappTemplateTypeService;
 import io.swagger.annotations.Api;
@@ -37,6 +38,9 @@ public class CommonController extends BaseController {
     @Autowired
     IMiniAppService iMiniAppService;
 
+    @Autowired
+    Captcha captchaServ;
+
     /**
      * 图片
      * @param multipartFile
@@ -119,10 +123,11 @@ public class CommonController extends BaseController {
     @ApiOperation(value = "发送验证码", notes = "发送验证码")
     @PostMapping("{plat}/captcha")
     public ResponseBean sendCaptcha(@RequestParam String tel) {
-        boolean success = smsUtils.sendCaptcha(tel);
-        if (success) {
+        try {
+            captchaServ.send(tel, captchaServ.randCaptcha(6));
             return ResponseBean.success("发送验证码成功");
-        } else {
+        } catch (Exception e) {
+            e.printStackTrace();
             return ResponseBean.error("验证码发送失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -130,8 +135,7 @@ public class CommonController extends BaseController {
     @ApiOperation(value = "校验验证码", notes = "校验验证码")
     @PostMapping("{plat}/check/captcha")
     public ResponseBean sendCaptcha(@RequestParam String tel,@RequestParam String captcha) {
-        boolean success = smsUtils.checkCaptcha(tel,captcha);
-        if (success) {
+        if (captchaServ.validate(tel, captcha)) {
             return ResponseBean.success("验证码校验成功");
         } else {
             return ResponseBean.error("验证码校验失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/controller/TaPersonController.java

@@ -12,6 +12,7 @@ import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.SMSUtils;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.common.smsService.Captcha;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaChannelPerson;
 import com.huiju.estateagents.entity.TaPerson;
@@ -21,6 +22,7 @@ import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -54,6 +56,10 @@ public class TaPersonController extends BaseController {
     ITaUserService taUserService;
     @Autowired
     SMSUtils smsUtils;
+
+    @Autowired
+    Captcha captchaServ;
+
     @Autowired
     ITaPersonBuildingService taPersonBuildingService;
 
@@ -107,10 +113,16 @@ public class TaPersonController extends BaseController {
     @PutMapping("/wx/registerConsultant")
     public ResponseBean registerConsultant(HttpServletRequest request,@RequestParam String phone,@RequestParam String code) {
         ResponseBean responseBean = new ResponseBean();
-        if(!smsUtils.checkCaptcha(phone,code)){
+//        if(!smsUtils.checkCaptcha(phone,code)){
+//            responseBean.addError("验证码错误。");
+//            return responseBean;
+//        }
+
+        if (!captchaServ.validate(phone, code)) {
             responseBean.addError("验证码错误。");
             return responseBean;
         }
+
         Integer orgId =getOrgId(request);
         String openid = getOpenId(request);
         List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);

src/main/resources/application-prod.yml

@@ -50,7 +50,8 @@ ali:
 # 手机短信服务
 sms:
   # 先使用外网地址, 后期使用内网地址
-  url: http://101.200.84.17:8081/sms
+  # http://101.200.84.17:8081/sms
+  url:
   method: POST
   contentType: "application/json;charset=UTF-8"
   template:
@@ -68,7 +69,7 @@ sms:
     # 验证码长度
     size: 4
     # 短信签名
-    sign: 橙蕉
+    sign: 远道
 
   visitor:
     code: "0501"

src/main/resources/application.yml

@@ -3,4 +3,10 @@ spring:
   profiles:
     active: @profiles.active@
 
-
+sms-service:
+  accessKeyId: LTAIGQtIi28MfXms
+  accessKeySecret: b6maakcdzEywmkhcK15rStx54hOiIA
+  captcha:
+    code: SMS_27440200
+    product: 【远道荟】
+    sign: 身份验证