路径调整

thinglinks-common/thinglinks-common-core/src/main/java/com/mqttsnet/thinglinks/common/core/constant/ServiceNameConstants.java

@@ -10,20 +10,20 @@ public class ServiceNameConstants
     /**
      * 认证服务的serviceid
      */
-    public static final String AUTH_SERVICE = "thinglink-auth";
+    public static final String AUTH_SERVICE = "thinglinks-auth";
 
     /**
      * 系统模块的serviceid
      */
-    public static final String SYSTEM_SERVICE = "thinglink-system";
+    public static final String SYSTEM_SERVICE = "thinglinks-system";
 
     /**
      * 文件服务的serviceid
      */
-    public static final String FILE_SERVICE = "thinglink-file";
+    public static final String FILE_SERVICE = "thinglinks-file";
 
     /**
      * Link服务
      */
-    public static final String THINGLINKS_LINK = "thinglink-link";
+    public static final String THINGLINKS_LINK = "thinglinks-link";
 }

thinglinks-common/thinglinks-common-job/src/main/java/com/mqttsnet/thinglinks/common/job/config/MqttsJobConfig.java

@@ -18,28 +18,28 @@ import org.springframework.context.annotation.Configuration;
 public class MqttsJobConfig {
     private Logger logger = LoggerFactory.getLogger(MqttsJobConfig.class);
 
-    @Value("${mqtts.link.job.admin.addresses}")
+    @Value("${thinglinks.link.job.admin.addresses}")
     private String adminAddresses;
 
-    @Value("${mqtts.link.job.accessToken}")
+    @Value("${thinglinks.link.job.accessToken}")
     private String accessToken;
 
-    @Value("${mqtts.link.job.executor.appname}")
+    @Value("${thinglinks.link.job.executor.appname}")
     private String appname;
 
-    @Value("${mqtts.link.job.executor.address}")
+    @Value("${thinglinks.link.job.executor.address}")
     private String address;
 
-    @Value("${mqtts.link.job.executor.ip}")
+    @Value("${thinglinks.link.job.executor.ip}")
     private String ip;
 
-    @Value("${mqtts.link.job.executor.port}")
+    @Value("${thinglinks.link.job.executor.port}")
     private int port;
 
-    @Value("${mqtts.link.job.executor.logpath}")
+    @Value("${thinglinks.link.job.executor.logpath}")
     private String logPath;
 
-    @Value("${mqtts.link.job.executor.logretentiondays}")
+    @Value("${thinglinks.link.job.executor.logretentiondays}")
     private int logRetentionDays;
 
     @Bean

thinglinks-common/thinglinks-common-security/src/main/java/com/mqttsnet/thinglinks/common/security/annotation/EnableCustomConfig.java

@@ -21,7 +21,7 @@ import com.mqttsnet.thinglinks.common.security.feign.FeignAutoConfiguration;
 // 表示通过aop框架暴露该代理对象,AopContext能够访问
 @EnableAspectJAutoProxy(exposeProxy = true)
 // 指定要扫描的Mapper类的包的路径
-@MapperScan("net.mqtts.**.mapper")
+@MapperScan("com.mqttsnet.thinglinks.**.mapper")
 // 开启线程异步执行
 @EnableAsync
 // 自动加载类

thinglinks-gateway/src/main/java/com/mqttsnet/thinglinks/gateway/config/CaptchaConfig.java

@@ -63,7 +63,7 @@ public class CaptchaConfig
         // KAPTCHA_SESSION_KEY
         properties.setProperty(KAPTCHA_SESSION_CONFIG_KEY, "kaptchaCodeMath");
         // 验证码文本生成器
-        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "net.mqtts.gateway.config.KaptchaTextCreator");
+        properties.setProperty(KAPTCHA_TEXTPRODUCER_IMPL, "com.mqttsnet.thinglinks.gateway.config.KaptchaTextCreator");
         // 验证码文本字符间距 默认为2
         properties.setProperty(KAPTCHA_TEXTPRODUCER_CHAR_SPACE, "3");
         // 验证码文本字符长度 默认为5

thinglinks-modules/thinglinks-modules-broker/pom.xml

@@ -69,7 +69,7 @@
             <version>${thinglinks.version}</version>
         </dependency>
 
-        <!--   https://github.com/quickmsg/smqtt  V1.1.0   -->
+        <!-- TODO  https://github.com/quickmsg/smqtt  V1.1.0   -->
         <dependency>
             <groupId>io.github.quickmsg</groupId>
             <artifactId>smqtt-spring-boot-starter</artifactId>
@@ -80,6 +80,10 @@
                     <groupId>io.github.quickmsg</groupId>
                     <artifactId>smqtt-ui</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>io.github.quickmsg</groupId>
+                    <artifactId>smqtt-metric-influxdb</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 

thinglinks-modules/thinglinks-modules-tdengine/src/main/java/com/mqttsnet/thinglinks/tdengine/ThingLinksTdengineApplication.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.CrossOrigin;
 //maxAge飞行前响应的缓存持续时间的最大年龄，简单来说就是Cookie的有效期 单位为秒
 //若maxAge是负数,则代表为临时Cookie,不会被持久化,Cookie信息保存在浏览器内存中,浏览器关闭Cookie就消失
 @CrossOrigin(origins = "*",maxAge = 3600)
-@MapperScan(basePackages = {"net.mqtts.tdengine"})
+@MapperScan(basePackages = {"com.mqttsnet.thinglinks.tdengine"})
 @SpringBootApplication
 public class ThingLinksTdengineApplication {
 

thinglinks-modules/thinglinks-modules-tdengine/src/main/java/com/mqttsnet/thinglinks/tdengine/util/TaosAspect.java

@@ -12,7 +12,7 @@ import java.util.Map;
 @Component
 public class TaosAspect {
 
-    @Around("execution(java.util.Map<String,Object> net.mqtts.tdengine.dao.*.*(..))")
+    @Around("execution(java.util.Map<String,Object> com.mqttsnet.thinglinks.tdengine.dao.*.*(..))")
     public Object handleType(ProceedingJoinPoint joinPoint) {
         Map<String, Object> result = null;
         try {