Merge branch 'future/strokeList' into 'master'

Future/stroke list

See merge request hewei/Jumeirah!74

common/pom.xml

@@ -48,13 +48,18 @@
             <version>3.4.7</version>
             <version>3.4.7</version>
         </dependency>
         </dependency>
         <!--        极光 end -->
         <!--        极光 end -->
-
         <!-- wecloud短信 start-->
         <!-- wecloud短信 start-->
-<!--        <dependency>-->
-<!--            <groupId>cn.wecloud</groupId>-->
-<!--            <artifactId>we-cloud-sdk-sms</artifactId>-->
-<!--            <version>0.0.1</version>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.wecloud</groupId>
+            <artifactId>we-cloud-sdk-sms</artifactId>
+            <version>1.0.0</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-simple</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- wecloud短信 end-->
         <!-- wecloud短信 end-->
 
 
     </dependencies>
     </dependencies>

common/src/main/java/com/jumeirah/common/sms/SmsUtil.java

+package com.jumeirah.common.sms;
+
+import cn.wecloud.sdk.common.exception.WeCloudApiException;
+import cn.wecloud.sdk.sms.client.WeCloudSmsClient;
+import cn.wecloud.sdk.sms.data.WeCloudSmsSingleSendResult;
+import cn.wecloud.sdk.sms.model.WeCloudSmsAbroadModel;
+import cn.wecloud.sdk.sms.request.WeCloudSmsDomesticSingleSendRequest;
+import cn.wecloud.sdk.sms.response.WeCloudSmsDomesticSingleSendResponse;
+
+
+//@Slf4j
+public class SmsUtil {
+
+    public static void main(String[] args) throws WeCloudApiException {
+
+        // 创建连接对象
+        final WeCloudSmsClient client = new WeCloudSmsClient("9XPgCY9rAb1GG2yg");
+        // 创建请求信息对象
+        final WeCloudSmsAbroadModel model = new WeCloudSmsAbroadModel("855", "081612642", "1323474417736716290", "888888");
+        // 创建请求对象
+        final WeCloudSmsDomesticSingleSendRequest request = new WeCloudSmsDomesticSingleSendRequest(model);
+        // 执行请求
+        final WeCloudSmsDomesticSingleSendResponse execute = client.execute(request);
+        // 判断是否请求成功
+        if (execute.isSuccess()) {
+            // 获取返回业务对象
+            final WeCloudSmsSingleSendResult result = execute.getData();
+        } else {
+            // 输出请求失败信息
+//            log.error(execute.getMsg());
+        }
+
+    }
+
+
+    public static void send(String areaCode, String phone, String verificationCode) throws WeCloudApiException {
+
+        // 创建连接对象
+        final WeCloudSmsClient client = new WeCloudSmsClient("9XPgCY9rAb1GG2yg");
+        // 创建请求信息对象
+        String templateId = "1323474417736716290";
+        final WeCloudSmsAbroadModel model = new WeCloudSmsAbroadModel(areaCode, phone, templateId, verificationCode);
+        // 创建请求对象
+        final WeCloudSmsDomesticSingleSendRequest request = new WeCloudSmsDomesticSingleSendRequest(model);
+        // 执行请求
+        final WeCloudSmsDomesticSingleSendResponse execute = client.execute(request);
+        // 判断是否请求成功
+        if (execute.isSuccess()) {
+            // 获取返回业务对象
+            final WeCloudSmsSingleSendResult result = execute.getData();
+        } else {
+            // 输出请求失败信息
+//            log.error(execute.getMsg());
+        }
+
+    }
+}

common/src/main/resources/mapper/StrokeMapper.xml

@@ -12,7 +12,7 @@
         plain_type_id,
         plain_type_id,
         outset_time,
         outset_time,
         return_time,
         return_time,
-        type,zuo
+        type,
         STATUS,
         STATUS,
         money,
         money,
         user_id,
         user_id,

config/src/main/resources/config/application-dev.yml

@@ -14,9 +14,9 @@ spring-boot-plus:
 
 
 spring:
 spring:
   datasource:
   datasource:
-    url: jdbc:mysql://122.9.51.93:3306/jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: web
-    password: wBT7bC9BeUkE
+    url: jdbc:mysql://47.99.47.225:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: root
+    password: temple123456
 
 
   # Redis配置
   # Redis配置
   redis:
   redis:

config/src/main/resources/config/application-test.yml

@@ -15,15 +15,15 @@ spring-boot-plus:
 
 
 spring:
 spring:
   datasource:
   datasource:
-    url: jdbc:mysql://122.9.51.93:3306/jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: web
-    password: wBT7bC9BeUkE
+    url: jdbc:mysql://47.99.47.225:3306/Jumeirah?serverTimezone=UTC&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: root
+    password: temple123456
 
 
   # Redis配置
   # Redis配置
   redis:
   redis:
     database: 0
     database: 0
     host: 127.0.0.1
     host: 127.0.0.1
-    password: LSlX0JKkD34U3oY3hwI5
+    password: temple123456
     port: 6379
     port: 6379
 
 
   rabbitmq:
   rabbitmq: