Merge branch 'feature-BOX一期' of http://47.99.132.106:10081/wulin/qiuguo-iot into feature-BOX一期

.gitignore

@@ -31,3 +31,4 @@ build/
 
 ### VS Code ###
 .vscode/
+/logs/

iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/IotBoxUserApiApplication.java

@@ -1,11 +1,13 @@
 package com.qiuguo.iot.user.api;
 
+import com.tuya.connector.spring.annotations.ConnectorScan;
 import org.hswebframework.web.crud.annotation.EnableEasyormRepository;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication(scanBasePackages = {"com.qiuguo.iot.user.api", "com.qiuguo.iot.data.service"})
 @EnableEasyormRepository(value = "com.qiuguo.iot.data.entity.*")
+@ConnectorScan(basePackages = "com.qiuguo.iot.user.api.service")
 public class IotBoxUserApiApplication {
 
     public static void main(String[] args) {

iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java

@@ -9,6 +9,7 @@ import com.qiuguo.iot.data.resp.device.DeviceInfoResp;
 import com.qiuguo.iot.data.service.device.DeviceBatchService;
 import com.qiuguo.iot.data.service.device.DeviceInfoService;
 import com.qiuguo.iot.user.api.resp.device.DeviceInitResp;
+import com.qiuguo.iot.user.api.service.DeviceConnector;
 import lombok.extern.slf4j.Slf4j;
 import org.hswebframework.web.exception.BusinessException;
 import org.springframework.beans.factory.annotation.Value;
@@ -35,6 +36,16 @@ public class DeviceController {
 
     @Resource
     private DeviceBatchService deviceBatchService;
+    
+    @Resource
+    private DeviceConnector deviceConnector;
+    
+    @GetMapping("/getByid")
+    public Mono<Void> getByid() {
+        Object byid = deviceConnector.getByid("6c4a153095be2b7f8baofp");
+        System.out.println("byid = " + byid);
+        return Mono.empty();
+    }
 
     private static Long timeOut = 120000l;//2分钟
     @GetMapping("/init")

iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/DeviceConnector.java

@@ -0,0 +1,18 @@
+package com.qiuguo.iot.user.api.service;
+
+import com.tuya.connector.api.annotations.GET;
+import com.tuya.connector.api.annotations.Path;
+
+/**
+ * XXX
+ *
+ * @author weiyachao
+ * @since 2023/9/18 16:41
+ */
+public interface DeviceConnector {
+    
+    @GET("/v2.0/cloud/thing/{device_id}")
+    Object getByid(@Path("device_id") String deviceId);
+    
+
+}

iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml

@@ -61,4 +61,8 @@ userUrl:
   userCancelUrl: '/data/api.auth.center/userCancel'
   userInfoUrl: 'https://qiuguo-app.pre.qiuguojihua.com/pre-api/user/user/box/userInfo'
   firstPasswordUrl: 'https://qiuguo-app.pre.qiuguojihua.com/pre-api/user/user/box/first/password'
-  editUserInfoUrl: 'https://qiuguo-app.pre.qiuguojihua.com/pre-api/user/user/box/edit/userInfo'
+  editUserInfoUrl: 'https://qiuguo-app.pre.qiuguojihua.com/pre-api/user/user/box/edit/userInfo'
+connector:
+  ak: 'xj5d8a9jjg8dsnd9pr7x'
+  sk: 'fbcf5495b3b04d5e9f0195bf9ed9ded8'
+  region: 'CN'

iot-modules/iot-box-user-api/src/test/java/UserTest.java

@@ -7,7 +7,6 @@ import com.tuya.connector.api.annotations.Path;
  * @since 2023/9/5 16:03
  */
 
-
 public class UserTest {
     
     public static void main(String[] args) {

pom.xml

@@ -103,6 +103,10 @@
             <name>aliyun</name>
             <url>https://maven.aliyun.com/nexus/content/groups/public/</url>
         </repository>
+        <repository>
+            <id>tuya-maven</id>
+            <url>https://maven-other.tuya.com/repository/maven-public/</url>
+        </repository>
     </repositories>
     <pluginRepositories>
         <pluginRepository>