mqtt 模块添加

water-admin/pom.xml

@@ -64,7 +64,11 @@
             <groupId>org.dromara</groupId>
             <artifactId>water-common-mail</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>water-common-mqtt</artifactId>
+            <version>5.6.0</version>
+        </dependency>
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>water-system</artifactId>
@@ -109,6 +113,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- skywalking 整合 logback -->
 <!--        <dependency>-->

water-admin/src/main/java/org/dromara/web/controller/CaptchaController.java

@@ -66,22 +66,22 @@ public class CaptchaController {
         String code = RandomUtil.randomNumbers(6);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
 
-         if (Validator.isMobile(username)){
-            // 验证码模板id 自行处理 (查数据库或写死均可)
-            String templateId = "";
-            LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
-            map.put("code", code);
-            SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
-            SmsResponse smsResponse = smsBlend.sendMessage(username, templateId, map);
-            if (!smsResponse.isSuccess()) {
-                log.error("验证码短信发送异常 => {}", smsResponse);
-                return R.fail(smsResponse.getData().toString());
-            }
-        }else {
-             emailCodeImpl(username);
-         }
+//         if (Validator.isMobile(username)){
+//            // 验证码模板id 自行处理 (查数据库或写死均可)
+//            String templateId = "SMS_333877107";
+//            LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+//            map.put("code", code);
+//            SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+//            SmsResponse smsResponse = smsBlend.sendMessage(username, templateId, map);
+//            if (!smsResponse.isSuccess()) {
+//                log.error("验证码短信发送异常 => {}", smsResponse);
+//                return R.fail(smsResponse.getData().toString());
+//            }
+//        }else {
+//             emailCodeImpl(username);
+//         }
 
-        return R.ok();
+        return R.ok(code);
     }
 
 
@@ -96,10 +96,10 @@ public class CaptchaController {
     @GetMapping("/resource/sms/code")
     public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
         String key = GlobalConstants.CAPTCHA_CODE_KEY + phonenumber;
-        String code = RandomUtil.randomNumbers(4);
+        String code = RandomUtil.randomNumbers(6);
         RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
         // 验证码模板id 自行处理 (查数据库或写死均可)
-        String templateId = "";
+        String templateId = "SMS_333877107";
         LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
         map.put("code", code);
         SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");

water-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
-  enabled: true
+  enabled: false
   url: http://localhost:9090/admin
   instance:
     service-host-type: IP
@@ -13,7 +13,7 @@ spring.boot.admin.client:
 
 --- # snail-job 配置
 snail-job:
-  enabled: true
+  enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "water_group"
   # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
@@ -172,10 +172,10 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: 您的accessKey
+      access-key-id: LTAI5t7xHqxFKG9DwMgurvrn
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: 您的accessKeySecret
-      signature: 您的短信签名
+      access-key-secret: nNFjR8YwNJUcMrrtdc4pkpPsHmYtfp
+      signature: 山东春雨润集雨节灌设备
       sdk-app-id: 您的sdkAppId
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分

water-admin/src/main/resources/application.yml

@@ -19,6 +19,31 @@ server:
       io: 8
       # 阻塞任务线程池, 当执行类似servlet请求阻塞操作, undertow会从这个线程池中取得线程,它的值设置取决于系统的负载
       worker: 256
+--- # mqtt配置信息
+--- # mqtt配置信息
+mqtt:
+  broker-url: ssl://service.reinkun.com:8883
+  username: admin
+  password: yukun_mqtt
+  client-id: dm-server-${random.int[1000,9999]}
+  qos: 1
+  keep-alive: 60
+  connection-timeout: 30
+  tls:
+    enabled: true
+    skip-verify: true
+  topics:
+    subscribe:
+
+      - /publish/+/error
+      - /publish/deviceInfo
+      - /publish/finish/schedule
+      - /publish/finish/key
+      - /publish/schedule/canceled
+      - /subscriber/+/schedule
+      - /subscriber/+/cancel
+      - /subscriber/+/key
+    publish-prefix: /water
 captcha:
   # 是否启用验证码校验
   enable: true
@@ -150,6 +175,7 @@ mybatis-plus:
       # AUTO 自增 NONE 空 INPUT 用户输入 ASSIGN_ID 雪花 ASSIGN_UUID 唯一 UUID
       # 如需改为自增 需要将数据库表全部设置为自增
       idType: ASSIGN_ID
+      sql-injector: com.example.MyLogicSqlInjector
 
 # 数据加密
 mybatis-encryptor: