消息模块改造

java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/enums/ErrorMsgCode.java → java/storlead-framework/storlead-common/src/main/java/com/storlead/framework/common/enums/ErrorMsgCode.java

@@ -1,4 +1,4 @@
-package com.storlead.framework.web.enums;
+package com.storlead.framework.common.enums;
 
 /**
  * @program: sp-sales

java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/enums/ResultCode.java → java/storlead-framework/storlead-common/src/main/java/com/storlead/framework/common/enums/ResultCode.java

@@ -1,4 +1,4 @@
-package com.storlead.framework.web.enums;
+package com.storlead.framework.common.enums;
 
 import lombok.Getter;
 
@@ -11,7 +11,7 @@ public enum ResultCode {
     /**
      * 操作成功
      */
-    SC_OK_200(200, "操作成功"),
+    SUCCESS(200, "操作成功"),
 
     FAILED(-1, "处理失败"),
 

java/storlead-framework/storlead-common/src/main/java/com/storlead/framework/common/result/BizCode.java

@@ -1,20 +0,0 @@
-package com.storlead.framework.common.result;
-
-import lombok.Getter;
-
-@Getter
-public enum BizCode {
-    SUCCESS(200, "操作成功"),
-    FAILED(-1, "处理失败"),
-    VALIDATE_FAILED(1003, "参数校验失败"),
-    PARAM_IS_NEEDED(1004, "缺少必传参数"),
-    ERROR(5000, "未知错误");
-
-    private final int code;
-    private final String msg;
-
-    BizCode(int code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-}

java/storlead-framework/storlead-common/src/main/java/com/storlead/framework/common/result/BizResult.java

@@ -1,5 +1,7 @@
 package com.storlead.framework.common.result;
 
+import com.storlead.framework.common.enums.ErrorMsgCode;
+import com.storlead.framework.common.enums.ResultCode;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,15 +12,15 @@ public class BizResult<T> implements Serializable {
 
     private boolean success = true;
     private String message = "操作成功！";
-    private Integer code = BizCode.SUCCESS.getCode();
+    private Integer code = ResultCode.SUCCESS.getCode();
     private T result;
     private long timestamp = System.currentTimeMillis();
 
     public static <T> BizResult<T> ok() {
         BizResult<T> r = new BizResult<>();
         r.setSuccess(true);
-        r.setCode(BizCode.SUCCESS.getCode());
-        r.setMessage(BizCode.SUCCESS.getMsg());
+        r.setCode(ResultCode.SUCCESS.getCode());
+        r.setMessage(ResultCode.SUCCESS.getMsg());
         r.setTimestamp(System.currentTimeMillis());
         return r;
     }
@@ -38,13 +40,13 @@ public class BizResult<T> implements Serializable {
     public static <T> BizResult<T> error(String msg) {
         BizResult<T> r = new BizResult<>();
         r.setSuccess(false);
-        r.setCode(BizCode.ERROR.getCode());
+        r.setCode(ResultCode.ERROR.getCode());
         r.setMessage(msg);
         r.setTimestamp(System.currentTimeMillis());
         return r;
     }
 
-    public static <T> BizResult<T> error(BizCode code) {
+    public static <T> BizResult<T> error(ErrorMsgCode code) {
         BizResult<T> r = new BizResult<>();
         r.setSuccess(false);
         r.setCode(code.getCode());

java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/assemble/Result.java

@@ -1,8 +1,8 @@
 package com.storlead.framework.web.assemble;
 
 import com.storlead.framework.common.result.BizResult;
-import com.storlead.framework.web.enums.ErrorMsgCode;
-import com.storlead.framework.web.enums.ResultCode;
+import com.storlead.framework.common.enums.ErrorMsgCode;
+import com.storlead.framework.common.enums.ResultCode;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/filter/AuthRequestFilter.java

@@ -20,7 +20,7 @@ import com.storlead.framework.core.tenant.TenantConstants;
 import com.storlead.framework.core.tenant.TenantContext;
 import com.storlead.framework.redis.RedisService;
 import com.storlead.framework.web.assemble.Result;
-import com.storlead.framework.web.enums.ResultCode;
+import com.storlead.framework.common.enums.ResultCode;
 import com.storlead.framework.web.wrapper.JsonRequestWrapper;
 import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang3.StringUtils;

java/storlead-framework/storlead-web/src/main/java/com/storlead/framework/web/filter/RoutingRequestFilter.java

@@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.storlead.framework.common.util.SystemUtils;
 import com.storlead.framework.web.assemble.Result;
-import com.storlead.framework.web.enums.ResultCode;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpStatus;

java/storlead-sms/storlead-sms-api/pom.xml

@@ -23,7 +23,7 @@
 
         <dependency>
             <groupId>com.storlead.boot</groupId>
-            <artifactId>storlead-sms-biz</artifactId>
+            <artifactId>storlead-common</artifactId>
         </dependency>
     </dependencies>
 </project>

java/storlead-sms/storlead-sms-api/src/main/java/com/storlead/sms/server/SmsLogService.java

@@ -0,0 +1,14 @@
+package com.storlead.sms.server;
+
+import com.storlead.framework.common.result.BizResult;
+
+/**
+ * SMS external service interface.
+ */
+public interface SmsLogService {
+
+    /**
+     * Send login verification SMS code.
+     */
+    BizResult sendLoginSmsCode(String mobile);
+}

java/storlead-sms/storlead-sms-biz/pom.xml

@@ -16,6 +16,11 @@
     <name>storlead-sms-biz</name>
 
     <dependencies>
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-sms-api</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.storlead.boot</groupId>
             <artifactId>storlead-sms-core</artifactId>
@@ -26,6 +31,15 @@
             <artifactId>storlead-common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-redis</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.storlead.boot</groupId>
+            <artifactId>storlead-mybatis</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>

java/storlead-sms/storlead-sms-biz/src/main/java/com/storlead/sms/constants/SmsTemplateConstants.java

@@ -1,4 +1,7 @@
 package com.storlead.sms.constants;
+
+import com.storlead.framework.common.util.encryptor.AccessKeyEncryptor;
+
 /**
  * 短信模板常量类
  * ˚

java/storlead-sms/storlead-sms-biz/src/main/java/com/storlead/sms/mapper/SmsLogMapper.java

@@ -1,7 +1,7 @@
 package com.storlead.sms.mapper;
 
+import com.storlead.framework.mybatis.mapper.MyBaseMapper;
 import com.storlead.sms.pojo.entity.SmsLogEntity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author chenkq
  * @since 2022-05-27
  */
-public interface SmsLogMapper extends BaseMapper<SmsLogEntity> {
+public interface SmsLogMapper extends MyBaseMapper<SmsLogEntity> {
 
 }

java/storlead-sms/storlead-sms-biz/src/main/java/com/storlead/sms/pojo/entity/SmsLogEntity.java

@@ -1,12 +1,10 @@
 package com.storlead.sms.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.extension.activerecord.Model;
 
-import java.time.LocalDateTime;
 import java.util.Date;
 
-import com.storlead.frame.mybatis.entity.SysBaseField;
+import com.storlead.framework.mybatis.entity.SysBaseField;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -20,8 +18,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class
-SmsLogEntity extends SysBaseField {
+public class SmsLogEntity extends SysBaseField {
 
     /**
      * ID

java/storlead-sms/storlead-sms-biz/src/main/java/com/storlead/sms/service/SmsLogService.java

@@ -1,23 +0,0 @@
-package com.storlead.sms.service;
-
-import com.aliyuncs.exceptions.ClientException;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.storlead.frame.core.assemble.Result;
-import com.storlead.sms.exception.SMSException;
-import com.storlead.sms.pojo.entity.SmsLogEntity;
-
-/**
- * <p>
- * 短信日志 服务类
- * </p>
- *
- * @author chenkq
- * @since 2022-05-27
- */
-public interface SmsLogService extends IService<SmsLogEntity> {
-
-    /**
-     * 发送登录短信code
-     */
-    public Result sendLoginSmsCode(String mobile) throws ClientException, SMSException;
-}

java/storlead-sms/storlead-sms-biz/src/main/java/com/storlead/sms/service/impl/SmsLogServiceImpl.java

@@ -3,19 +3,18 @@ package com.storlead.sms.service.impl;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.storlead.frame.constants.RedisKeySaltConstant;
-import com.storlead.frame.core.assemble.Result;
-import com.storlead.frame.enums.ErrorMsgCode;
-import com.storlead.frame.redis.RedisService;
+import com.storlead.framework.common.constant.RedisKeySaltConstant;
+import com.storlead.framework.common.enums.ErrorMsgCode;
+import com.storlead.framework.common.result.BizResult;
+import com.storlead.framework.common.util.RandomCodeUtil;
+import com.storlead.framework.redis.RedisService;
 import com.storlead.sms.constants.SmsTemplateConstants;
-import com.storlead.sms.exception.SMSException;
 import com.storlead.sms.mapper.SmsLogMapper;
 import com.storlead.sms.pojo.entity.SmsLogEntity;
-import com.storlead.sms.service.SmsLogService;
-import com.storlead.common.util.RandomCodeUtil;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.storlead.sms.server.SmsLogService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -31,17 +30,15 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLogEntity> implements SmsLogService {
 
-    @Autowired
+    @Resource
     private RedisService redisService;
 
-
-
     @Override
-    public Result sendLoginSmsCode(String mobile) throws ClientException, SMSException {
+    public BizResult sendLoginSmsCode(String mobile) {
         //
         int count = this.count(new LambdaQueryWrapper<SmsLogEntity>().eq(SmsLogEntity::getMobile,mobile).eq(SmsLogEntity::getType,Integer.valueOf(10)).apply(" TO_DAYS(send_time) = TO_DAYS(NOW()) "));
         if (count >= SmsTemplateConstants.SEND_MAXIMIZE) {
-            return Result.error(ErrorMsgCode.D_400001);
+            return BizResult.error(ErrorMsgCode.D_400001);
         }
         Object var1 = redisService.getCacheObject(RedisKeySaltConstant.REDIS_LOGIN_VALID_CODE_KEY+mobile);
         if (Objects.nonNull(var1)) {
@@ -49,7 +46,7 @@ public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLogEntity> i
             Long currentTime = System.currentTimeMillis();
             Long sendTime = smsLog.getSendTime().getTime();
             if ((currentTime - sendTime) / 1000 < smsLog.getValidTime()) {
-                return Result.error(ErrorMsgCode.D_400002);
+                return BizResult.error(ErrorMsgCode.D_400002);
             }
         }
         int checkCode = RandomCodeUtil.RandomCheckCode();
@@ -57,7 +54,7 @@ public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLogEntity> i
         try {
             boolean res = sendMobileVerifyCode(mobile, checkCode);
             if (!res) {
-                return Result.error(ErrorMsgCode.D_400003);
+                return BizResult.error(ErrorMsgCode.D_400003);
             }
             log.error("SmsLog ---- = "+checkCode);
             SmsLogEntity smsLog = new SmsLogEntity();
@@ -71,10 +68,10 @@ public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLogEntity> i
             smsLog.setStatus(1);
             this.baseMapper.insert(smsLog);
             redisService.setCacheObject(RedisKeySaltConstant.REDIS_LOGIN_VALID_CODE_KEY+mobile,smsLog,120L, TimeUnit.MINUTES);
-        } catch (ClientException e) {
-            return Result.error(e.getMessage());
+        } catch (Exception e) {
+            return BizResult.error(e.getMessage());
         }
-        return Result.ok();
+        return BizResult.ok();
     }
 
 

java/storlead-sms/storlead-sms-biz/src/main/java/com/storlead/util/SmsUtil.java

@@ -13,7 +13,7 @@ import com.google.common.collect.ImmutableMap;
 import com.storlead.sms.constants.SmsTemplateConstants;
 import com.storlead.sms.exception.SMSException;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections.map.HashedMap;
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -139,7 +139,7 @@ public class SmsUtil {
      *
      */
     public static void leftAmtPaymentSmsNotice(String userName, String mobile, String orderNumber, String duetime) throws ClientException, SMSException {
-        Map<String, String> paramMap = new HashedMap();
+        Map<String, String> paramMap = new HashedMap<>();
         paramMap.put("usename", userName);
         paramMap.put("ordernumber", orderNumber.substring(orderNumber.length() - 4));
         paramMap.put("duetime", duetime+"天");

java/storlead-sms/storlead-sms-core/src/main/java/com/storlead/sms/constants/SmsTemplateConstants.java

@@ -0,0 +1,18 @@
+package com.storlead.sms.constants;
+
+/**
+ * SMS template and platform constants.
+ */
+public final class SmsTemplateConstants {
+
+    private SmsTemplateConstants() {
+    }
+
+    public static final int SEND_MAXIMIZE = 10;
+
+    public static final String SMS_CHECK_CODE_TEMPLATE = "SMS_CHECK_CODE_TEMPLATE";
+
+    public static final String SMS_ACCESS_KEY = "";
+
+    public static final String SMS_ACCESS_KEY_SECRET = "";
+}

java/storlead-sms/storlead-sms-core/src/main/java/com/storlead/sms/exception/SMSException.java

@@ -0,0 +1,15 @@
+package com.storlead.sms.exception;
+
+/**
+ * SMS business exception.
+ */
+public class SMSException extends Exception {
+
+    public SMSException(String message) {
+        super(message);
+    }
+
+    public SMSException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}