lishuangjiang@potevio.com 1 anno fa
parent
commit
febc90437b

+ 3 - 0
soulcall-http-plugin/src/main/java/cc/iotkit/plugins/soulcall/Application.java

@@ -1,8 +1,11 @@
 package cc.iotkit.plugins.soulcall;
 
+import cc.iotkit.common.satoken.config.SaTokenConfig;
 import com.gitee.starblues.bootstrap.SpringPluginBootstrap;
 import com.gitee.starblues.bootstrap.annotation.OneselfConfig;
+import org.redisson.spring.starter.RedissonAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 
 /**

+ 1 - 1
soulcall-http-plugin/src/main/java/cc/iotkit/plugins/soulcall/conf/SoulcallConfig.java

@@ -44,7 +44,7 @@ public class SoulcallConfig {
 
     private String healthHost = "123.56.193.26";
 
-    private String healthTestHost = "123.56.196.46";
+    private String healthTestHost = "123.56.193.26";
 
     private Integer mode = 0;
 

+ 0 - 7
soulcall-http-plugin/src/main/java/cc/iotkit/plugins/soulcall/service/SoulcallProxyVerticle.java

@@ -96,18 +96,13 @@ public class SoulcallProxyVerticle extends AbstractVerticle{
         healthProxy = HttpProxy.reverseProxy(proxyClient);
         healthProxy.origin(config.getMode()==0?config.getHealthTestPort():config.getHealthPort(),
                 config.getMode()==0?config.getHealthTestHost():config.getHealthHost());
-
-
         proxyClient2 = vertx.createHttpClient();
         linxiHttpProxy = HttpProxy.reverseProxy(proxyClient2);
         linxiHttpProxy.origin(config.getMode()==0?config.getLinxiTestPort():config.getLinxiPort(),
                 config.getMode()==0?config.getLinxiTestHost():config.getLinxiHost());
-        log.info("*********************"+linxiHttpProxy.toString());
-
         //代理设置
         proxyRouter.post(LinxiSignHelper.ALARM_PATH).handler(ProxyHandler.create(healthProxy));
         proxyRouter.post(LinxiSignHelper.EVENT_PATH).handler(ProxyHandler.create(healthProxy));
-
         proxyRouter.post(LinxiSignHelper.ADD_DEVICE).handler(ProxyHandler.create(linxiHttpProxy));
         proxyRouter.post(LinxiSignHelper.DEL_DEVICE).handler(res->{
             log.info(res.request().absoluteURI());
@@ -115,8 +110,6 @@ public class SoulcallProxyVerticle extends AbstractVerticle{
 
         })
                 .handler(ProxyHandler.create(linxiHttpProxy));
-
-
     }
 
     @Override

+ 2 - 2
soulcall-http-plugin/src/main/java/cc/iotkit/plugins/soulcall/service/SoulcallVerticle.java

@@ -117,7 +117,7 @@ public class SoulcallVerticle extends AbstractVerticle{
 //        ctr.response().setStatusCode(200).end("成功!!!!!!");
         log.info("设备注销-------------deviceId:"+ deviceId);
         }
-        webClient.post(80, "adminapi.demo3.vodaiot.com", LinxiSignHelper.DEL_DEVICE).sendJson(ctr.getBodyAsJson(),ar->{
+        webClient.post(80, "adminapi.lingxi.vodaiot.com", LinxiSignHelper.DEL_DEVICE).sendJson(ctr.getBodyAsJson(),ar->{
             if(ar.succeeded()){
                 log.info(ar.toString());
                 ctr.response().setStatusCode(ar.result().statusCode()).end(ar.result().bodyAsBuffer());
@@ -147,7 +147,7 @@ public class SoulcallVerticle extends AbstractVerticle{
 //            ctr.response().setStatusCode(200).end("成功!!!!!!");
             log.info("设备注册-------------deviceId:"+ deviceId);
         }
-        webClient.post(80, "adminapi.demo3.vodaiot.com", LinxiSignHelper.ADD_DEVICE).sendJson(ctr.getBodyAsJson(),ar->{
+        webClient.post(80, "adminapi.lingxi.vodaiot.com", LinxiSignHelper.ADD_DEVICE).sendJson(ctr.getBodyAsJson(),ar->{
             if(ar.succeeded()){
                 ctr.response().setStatusCode(ar.result().statusCode()).end(ar.result().bodyAsBuffer());
             }else{