去掉无用引用包

iot-common/iot-base/pom.xml

@@ -30,6 +30,13 @@
             <version>5.8.21</version>
         </dependency>
 
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/NlpKey.java

@@ -1,7 +1,6 @@
 package com.qiuguo.iot.base.nlp;
 
 import com.qiuguo.iot.base.enums.ChinesePartSpeechEnum;
-import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.math.BigDecimal;

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/nlp/lac/LacNlp.java

@@ -38,7 +38,8 @@ public class LacNlp implements INlp {
                     if (!Objects.equals(res.getInteger("status"), 0)) {
                         throw new RuntimeException(res.getString("info"));
                     }
-                    log.info("res{}", res);
+                    //log.info("", res);
+                    //log.info("res{}", res.toString());
                 });
     }
 

iot-common/iot-base/src/main/java/com/qiuguo/iot/base/utils/StringUtils.java

@@ -2,7 +2,7 @@ package com.qiuguo.iot.base.utils;
 
 import java.util.Random;
 
-public class StringUtils{
+public class StringUtils extends cn.hutool.core.util.StrUtil{
     private static final String chars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
     /**
      * 获取随机字符串 0-9, a-z, A-Z

iot-common/iot-data/pom.xml

@@ -42,16 +42,19 @@
             </exclusions>
             <scope>compile</scope>
         </dependency>
-        <dependency>
+
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.hswebframework</groupId>
             <artifactId>hsweb-easy-orm-core</artifactId>
             <version>4.1.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.qiuguo.iot</groupId>
+            <artifactId>iot-base</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
     <build>
         <finalName>${project.artifactId}</finalName>

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceAlarmClockRecordService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.device;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceAlarmClockRecordEntity;
 import com.qiuguo.iot.data.request.device.DeviceAlarmClockRecordRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceBatchService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.device;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceBatchEntity;
 import com.qiuguo.iot.data.request.device.DeviceBatchRequest;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.slf4j.Slf4j;;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceInfoService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.device;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceInfoEntity;
 import com.qiuguo.iot.data.request.device.DeviceInfoRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceProductFactoryInfoService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.device;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceProductFactoryInfoEntity;
 import com.qiuguo.iot.data.request.device.DeviceProductFactoryInfoRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserBindService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.device;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceUserBindEntity;
 import com.qiuguo.iot.data.request.device.DeviceUserBindRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/device/DeviceUserTalkRecordService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.device;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.device.DeviceUserTalkRecordEntity;
 import com.qiuguo.iot.data.request.device.DeviceUserTalkRecordRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinActionService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.operation.OperatinActionEntity;
 import com.qiuguo.iot.data.request.operation.OperatinActionRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinConditionService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.operation.OperatinConditionEntity;
 import com.qiuguo.iot.data.request.operation.OperatinConditionRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinEventConfigService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.operation.OperatinEventConfigEntity;
 import com.qiuguo.iot.data.request.operation.OperatinEventConfigRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinModeService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.operation.OperatinModeEntity;
 import com.qiuguo.iot.data.request.operation.OperatinModeRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/operation/OperatinSceneService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.operation;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.operation.OperatinSceneEntity;
 import com.qiuguo.iot.data.request.operation.OperatinSceneRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaRecordService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.ota;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.ota.OtaRecordEntity;
 import com.qiuguo.iot.data.request.ota.OtaRecordRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/ota/OtaVersionInfoService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.ota;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.ota.OtaVersionInfoEntity;
 import com.qiuguo.iot.data.request.ota.OtaVersionInfoRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/system/SystemTalkAnswerConfigService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.system;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.system.SystemTalkAnswerConfigEntity;
 import com.qiuguo.iot.data.request.system.SystemTalkAnswerConfigRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdConfigInfoService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.third;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.third.ThirdConfigInfoEntity;
 import com.qiuguo.iot.data.request.third.ThirdConfigInfoRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/third/ThirdUserBindService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.third;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.third.ThirdUserBindEntity;
 import com.qiuguo.iot.data.request.third.ThirdUserBindRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/u3d/U3dActionService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.u3d;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.u3d.U3dActionEntity;
 import com.qiuguo.iot.data.request.u3d.U3dActionRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserHomeService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.user;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.user.UserHomeEntity;
 import com.qiuguo.iot.data.request.user.UserHomeRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import java.util.Date;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserRoomService.java

@@ -2,10 +2,10 @@ package com.qiuguo.iot.data.service.user;
 
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.user.UserRoomEntity;
 import com.qiuguo.iot.data.request.user.UserRoomRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import java.util.Date;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;

iot-common/iot-data/src/main/java/com/qiuguo/iot/data/service/user/UserSuggestionRecordService.java

@@ -1,10 +1,10 @@
 package com.qiuguo.iot.data.service.user;
 
 
+import com.qiuguo.iot.base.utils.StringUtils;
 import com.qiuguo.iot.data.entity.user.UserSuggestionRecordEntity;
 import com.qiuguo.iot.data.request.user.UserSuggestionRecordRequest;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveQuery;
 import org.hswebframework.ezorm.rdb.mapping.ReactiveUpdate;
 import org.hswebframework.ezorm.rdb.operator.dml.query.SortOrder;

iot-common/pom.xml

@@ -22,13 +22,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <hsweb.framework.version>${hswebframework.version}</hsweb.framework.version>
     </properties>
-    <dependencies>
+
-        <dependency>
-            <groupId>cn.123tool.chen</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-    </dependencies>
 
 
 </project>

iot-modules/iot-box-user-api/pom.xml

@@ -83,11 +83,7 @@
             <artifactId>reactor-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
+
-            <groupId>cn.123tool.chen</groupId>
-            <artifactId>commons</artifactId>
-            <version>1.0.0</version>
-        </dependency>
         <dependency>
             <groupId>com.qiuguo.iot</groupId>
             <artifactId>iot-data</artifactId>

iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BoxWebSocketHandler.java

@@ -2,7 +2,6 @@ package com.qiuguo.iot.box.websocket.api.handler;
 
 import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson.JSONObject;
-import com.chen.tools.util.StringUtils;
 import com.qiuguo.iot.base.annotation.WebSocketMapping;
 import com.qiuguo.iot.base.constans.RedisConstans;
 import com.qiuguo.iot.box.websocket.api.domain.box.BoxSession;
@@ -60,7 +59,7 @@ public class BoxWebSocketHandler implements WebSocketHandler {
         ReactiveValueOperations<String, String> operations = reactiveStringRedisTemplate.opsForValue();
         //
        operations.get(RedisConstans.DEVICE_INFO + sn).defaultIfEmpty("").flatMap(s -> {
-            if(StringUtils.isNotBlank(s)){
+            if(com.qiuguo.iot.base.utils.StringUtils.isNotBlank(s)){
                 try{
                     DeviceInfoEntity dv = JSONObject.parseObject(s, DeviceInfoEntity.class);
                     return Mono.just(dv);

iot-modules/pom.xml

@@ -39,12 +39,13 @@
             <version>${redis.boot.reactor.version}</version>
         </dependency>
 
-
+        <!-- SpringBoot Actuator -->
         <dependency>
-            <groupId>org.projectlombok</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>lombok</artifactId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
-            <version>${lombok.version}</version>
-            <scope>provided</scope>
         </dependency>
+
+
+
     </dependencies>
 </project>

pom.xml

@@ -77,7 +77,11 @@
                 <version>3.1.2</version>
                 <scope>test</scope>
             </dependency>
-
+            <dependency>
+                <groupId>org.projectlombok</groupId>
+                <artifactId>lombok</artifactId>
+                <version>${lombok.version}</version>
+            </dependency>
 
         </dependencies>
     </dependencyManagement>