app

winsea-haixin-plugin-yiliangyiyun/pom.xml

@@ -42,6 +42,12 @@
             <artifactId>japidocs</artifactId>
             <version>1.4.3</version>
         </dependency>
+        <!-- 良心云 sms -->
+        <dependency>
+            <groupId>com.github.qcloudsms</groupId>
+            <artifactId>qcloudsms</artifactId>
+            <version>1.0.5</version>
+        </dependency>
     </dependencies>
 
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/CommonUserController.java

@@ -2,10 +2,8 @@ package com.yh.saas.plugin.yiliangyiyun.controller;
 
 
 import com.yh.saas.plugin.yiliangyiyun.entity.CommonUser;
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
-import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -56,7 +54,7 @@ public class CommonUserController {
      * @return
      * @throws ServiceException
      */
-    @GetMapping("/sendloginVerifyCode")
+    @GetMapping("/login")
     public CommonUser login(CommonUser commonUser) throws ServiceException {
         return commonUserService.login(commonUser);
     }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/exception/ThirdPartServiceException.java

@@ -0,0 +1,17 @@
+package com.yh.saas.plugin.yiliangyiyun.exception;
+
+/**
+ * 第三方接口服务异常
+ * Created by rize on 2019/7/3.
+ */
+public class ThirdPartServiceException extends ServiceException {
+
+    public ThirdPartServiceException(ServiceExceptionDefinition definition) {
+        super(definition);
+    }
+
+    public ThirdPartServiceException(String message, int code) {
+        super(message, code);
+    }
+
+}

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/CommonUserServiceImpl.java

@@ -9,8 +9,8 @@ import com.yh.saas.plugin.yiliangyiyun.exception.AppServiceException;
 import com.yh.saas.plugin.yiliangyiyun.exception.ExceptionDefinition;
 import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import com.yh.saas.plugin.yiliangyiyun.mapper.CommonUserMapper;
-import com.yh.saas.plugin.yiliangyiyun.notify.SMSClient;
-import com.yh.saas.plugin.yiliangyiyun.notify.SMSResult;
+import com.yh.saas.plugin.yiliangyiyun.util.SMSClient;
+import com.yh.saas.plugin.yiliangyiyun.util.SMSResult;
 import com.yh.saas.plugin.yiliangyiyun.service.ICommonUserService;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.yh.saas.plugin.yiliangyiyun.util.Const;
@@ -26,7 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.sql.*;
-import java.util.Date;
 
 /**
  * <p>
@@ -42,8 +41,8 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     @Autowired
     private CacheComponent cacheComponent;
 
-    @Autowired
-    private SMSClient smsClient;
+//    @Autowired
+//    private SMSClient smsClient;
 
     @Autowired
     private CommonUserMapper commonUserMapper;
@@ -65,7 +64,7 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
     private String gzhAppId;
     @Value("122059c777309ff3efc7448ec8794fd5")
     private String gzhAppSecret;
-    @Value("${spring.liangxin.url1}jdbc:mysql://47.100.3.209:3306/talk-core?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true")
+    @Value("jdbc:mysql://47.100.3.209:3306/talk-core?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true")
     private String url1;
     @Value("root")
     private String username1;
@@ -107,15 +106,15 @@ public class CommonUserServiceImpl extends ServiceImpl<CommonUserMapper, CommonU
      */
     @Override
     public String sendVerifyCode(String phone) throws ServiceException {
-        String verifyCode = GeneratorUtil.genSixVerifyCode();
-        System.out.println("verifyCode:"+verifyCode);
-        SMSResult res = smsClient.sendRegisterVerify(phone, verifyCode);
-        if (res.isSucc()) {
-            cacheComponent.putRaw(VERIFY_CODE_PREFIX + phone, verifyCode, 300);
+//        String verifyCode = GeneratorUtil.genSixVerifyCode();
+//        System.out.println("verifyCode:"+verifyCode);
+//        SMSResult res = smsClient.sendRegisterVerify(phone, verifyCode);
+//        if (res.isSucc()) {
+//            cacheComponent.putRaw(VERIFY_CODE_PREFIX + phone, verifyCode, 300);
             return "ok";
-        } else {
-            throw new AppServiceException(res.getMsg(), ExceptionDefinition.USER_SEND_VERIFY_FAILED.getCode());
-        }
+//        } else {
+//            throw new AppServiceException(res.getMsg(), ExceptionDefinition.USER_SEND_VERIFY_FAILED.getCode());
+//        }
 
     }
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/notify/AliyunSMSClient.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/AliyunSMSClient.java

@@ -1,4 +1,4 @@
-package com.yh.saas.plugin.yiliangyiyun.notify;
+package com.yh.saas.plugin.yiliangyiyun.util;
 
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.CommonRequest;
@@ -8,9 +8,9 @@ import com.aliyuncs.IAcsClient;
 import com.aliyuncs.exceptions.ClientException;
 import com.aliyuncs.http.MethodType;
 import com.aliyuncs.profile.DefaultProfile;
-import com.iotechn.unimall.core.exception.ExceptionDefinition;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.core.exception.ThirdPartServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ExceptionDefinition;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ThirdPartServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/notify/MockSMSClient.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/MockSMSClient.java

@@ -1,6 +1,6 @@
-package com.yh.saas.plugin.yiliangyiyun.notify;
+package com.yh.saas.plugin.yiliangyiyun.util;
 
-import com.iotechn.unimall.core.exception.ServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/notify/QCloudSMSClient.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/QCloudSMSClient.java

@@ -1,10 +1,10 @@
-package com.yh.saas.plugin.yiliangyiyun.notify;
+package com.yh.saas.plugin.yiliangyiyun.util;
 
 import com.github.qcloudsms.SmsSingleSender;
 import com.github.qcloudsms.SmsSingleSenderResult;
-import com.iotechn.unimall.core.exception.ExceptionDefinition;
-import com.iotechn.unimall.core.exception.ServiceException;
-import com.iotechn.unimall.core.exception.ThirdPartServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ExceptionDefinition;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ThirdPartServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.InitializingBean;

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/notify/SMSClient.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/SMSClient.java

@@ -1,6 +1,6 @@
-package com.yh.saas.plugin.yiliangyiyun.notify;
+package com.yh.saas.plugin.yiliangyiyun.util;
 
-import com.iotechn.unimall.core.exception.ServiceException;
+import com.yh.saas.plugin.yiliangyiyun.exception.ServiceException;
 
 /**
  * Created by rize on 2019/7/1.
@@ -13,7 +13,7 @@ public interface SMSClient {
 
     SMSResult sendResetPasswordVerify(String phone, String verifyCode) throws ServiceException;
 
-    SMSResult sendAdminLoginVerify(String phone, String verifyCode) throws ServiceException;
+    SMSResult sendAdminLoginVerify(String phone, String verifyCode) throws ServiceException, ServiceException;
 
 
 }

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/notify/SMSResult.java → winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/util/SMSResult.java

@@ -1,4 +1,4 @@
-package com.yh.saas.plugin.yiliangyiyun.notify;
+package com.yh.saas.plugin.yiliangyiyun.util;
 
 import lombok.Data;