diff --git a/.gitignore b/.gitignore index a83d813..7dc39e4 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ build/ ### VS Code ### .vscode/ +/logs/ diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/IotBoxUserApiApplication.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/IotBoxUserApiApplication.java index 98ee98b..13cd50b 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/IotBoxUserApiApplication.java +++ b/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) { diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java index 38396b3..8244ac9 100644 --- a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/controller/device/DeviceController.java +++ b/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 getByid() { + Object byid = deviceConnector.getByid("6c4a153095be2b7f8baofp"); + System.out.println("byid = " + byid); + return Mono.empty(); + } private static Long timeOut = 120000l;//2分钟 @GetMapping("/init") diff --git a/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/DeviceConnector.java b/iot-modules/iot-box-user-api/src/main/java/com/qiuguo/iot/user/api/service/DeviceConnector.java new file mode 100644 index 0000000..58100dd --- /dev/null +++ b/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); + + +} diff --git a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml b/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml index fc67ed4..f421af7 100644 --- a/iot-modules/iot-box-user-api/src/main/resources/bootstrap.yml +++ b/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' \ No newline at end of file + editUserInfoUrl: 'https://qiuguo-app.pre.qiuguojihua.com/pre-api/user/user/box/edit/userInfo' +connector: + ak: 'xj5d8a9jjg8dsnd9pr7x' + sk: 'fbcf5495b3b04d5e9f0195bf9ed9ded8' + region: 'CN' \ No newline at end of file diff --git a/iot-modules/iot-box-user-api/src/test/java/UserTest.java b/iot-modules/iot-box-user-api/src/test/java/UserTest.java index 8eebfbe..ea30686 100644 --- a/iot-modules/iot-box-user-api/src/test/java/UserTest.java +++ b/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) { diff --git a/pom.xml b/pom.xml index e11bfd4..0d89c26 100644 --- a/pom.xml +++ b/pom.xml @@ -103,6 +103,10 @@ aliyun https://maven.aliyun.com/nexus/content/groups/public/ + + tuya-maven + https://maven-other.tuya.com/repository/maven-public/ +