Browse Source

【代码评审】IoT:整体实现

YunaiV 1 year ago
parent
commit
7c84ab9919

File diff suppressed because it is too large
+ 255 - 68
sql/mysql/ruoyi-vue-pro.sql


+ 7 - 0
yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/framework/sms/core/client/impl/AliyunSmsClientTest.java

@@ -12,6 +12,7 @@ import com.google.common.collect.Lists;
 import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.MockedStatic;
+import org.mockito.stubbing.Answer;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -50,6 +51,8 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest {
             // mock 方法
             httpUtilsMockedStatic.when(() -> HttpUtils.post(anyString(), anyMap(), anyString()))
                     .thenReturn("{\"Message\":\"OK\",\"RequestId\":\"30067CE9-3710-5984-8881-909B21D8DB28\",\"Code\":\"OK\",\"BizId\":\"800025323183427988\"}");
+            httpUtilsMockedStatic.when(() -> HttpUtils.encodeUtf8(anyString()))
+                    .then((Answer<String>) invocationOnMock -> (String) invocationOnMock.getArguments()[0]);
 
             // 调用
             SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile,
@@ -75,6 +78,8 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest {
             // mock 方法
             httpUtilsMockedStatic.when(() -> HttpUtils.post(anyString(), anyMap(), anyString()))
                     .thenReturn("{\"Message\":\"手机号码格式错误\",\"RequestId\":\"B7700B8E-227E-5886-9564-26036172F01F\",\"Code\":\"isv.MOBILE_NUMBER_ILLEGAL\"}");
+            httpUtilsMockedStatic.when(() -> HttpUtils.encodeUtf8(anyString()))
+                    .then((Answer<String>) invocationOnMock -> (String) invocationOnMock.getArguments()[0]);
 
             // 调用
             SmsSendRespDTO result = smsClient.sendSms(sendLogId, mobile, apiTemplateId, templateParams);
@@ -127,6 +132,8 @@ public class AliyunSmsClientTest extends BaseMockitoUnitTest {
             // mock 方法
             httpUtilsMockedStatic.when(() -> HttpUtils.post(anyString(), anyMap(), anyString()))
                     .thenReturn("{\"TemplateCode\":\"SMS_207945135\",\"RequestId\":\"6F4CC077-29C8-5BA5-AB62-5FF95068A5AC\",\"Message\":\"OK\",\"TemplateContent\":\"您的验证码${code},该验证码5分钟内有效,请勿泄漏于他人!\",\"TemplateName\":\"公告通知\",\"TemplateType\":0,\"Code\":\"OK\",\"CreateDate\":\"2020-12-23 17:34:42\",\"Reason\":\"无审批备注\",\"TemplateStatus\":1}");
+            httpUtilsMockedStatic.when(() -> HttpUtils.encodeUtf8(anyString()))
+                    .then((Answer<String>) invocationOnMock -> (String) invocationOnMock.getArguments()[0]);
 
             // 调用
             SmsTemplateRespDTO result = smsClient.getSmsTemplate(apiTemplateId);

+ 13 - 13
yudao-server/src/main/resources/application-local.yaml

@@ -68,21 +68,21 @@ spring:
           url: jdbc:mysql://127.0.0.1:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
           username: root
           password: 123456
-        tdengine: # IoT 数据库
-          lazy: true # 开启懒加载,保证启动速度
-          url: jdbc:TAOS-RS://chaojiniu.top:6041/ruoyi_vue_pro
-          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
-          username: root
-          password: taosdata
-          druid:
-            validation-query: SELECT SERVER_STATUS() # TDengine 数据源的有效性检查 SQL
+#        tdengine: # IoT 数据库(需要 IoT 物联网再开启噢!)
+#          url: jdbc:TAOS-RS://127.0.0.1:6041/ruoyi_vue_pro
+#          driver-class-name: com.taosdata.jdbc.rs.RestfulDriver
+#          username: root
+#          password: taosdata
+#          druid:
+#            validation-query: SELECT SERVER_STATUS() # TDengine 数据源的有效性检查 SQL
 
   # Redis 配置。Redisson 默认的配置足够使用,一般不需要进行调优
-  redis:
-    host: 127.0.0.1 # 地址
-    port: 6379 # 端口
-    database: 0 # 数据库索引
-#    password: dev # 密码,建议生产环境开启
+  data:
+    redis:
+      host: 127.0.0.1 # 地址
+      port: 6379 # 端口
+      database: 0 # 数据库索引
+  #    password: dev # 密码,建议生产环境开启
 
 --- #################### 定时任务相关配置 ####################