Y_ANXI 2 лет назад
Родитель
Сommit
4af3d6b278

+ 6 - 6
jetlinks-components/network-component/http-component/src/main/java/org/jetlinks/community/network/http/server/vertx/DefaultHttpServerProvider.java

@@ -96,11 +96,11 @@ public class DefaultHttpServerProvider implements NetworkProvider<HttpServerConf
     @Override
     public Mono<HttpServerConfig> createConfig(@Nonnull NetworkProperties properties) {
         return Mono.defer(() -> {
-            HttpServerConfig config = FastBeanCopier.copy(properties.getConfigurations(), new HttpServerConfig());
-            config.setId(properties.getId());
-            config.validate();
-            return Mono.just(config);
-        })
+                HttpServerConfig config = FastBeanCopier.copy(properties.getConfigurations(), new HttpServerConfig());
+                config.setId(properties.getId());
+                config.validate();
+                return Mono.just(config);
+            })
             .as(LocaleUtils::transform);
     }
 
@@ -117,7 +117,7 @@ public class DefaultHttpServerProvider implements NetworkProvider<HttpServerConf
                 server.setHttpServers(instances);
                 for (HttpServer httpServer : instances) {
                     vertx.nettyEventLoopGroup()
-                        .execute(()->{
+                        .execute(() -> {
                             httpServer.listen(result -> {
                                 if (result.succeeded()) {
                                     log.debug("startup http server on [{}]", server.getBindAddress());

+ 0 - 3
jetlinks-components/network-component/network-core/src/main/java/org/jetlinks/community/network/DefaultNetworkManager.java

@@ -3,8 +3,6 @@ package org.jetlinks.community.network;
 import lombok.*;
 import lombok.extern.slf4j.Slf4j;
 import org.jetlinks.core.cache.ReactiveCacheContainer;
-import org.jetlinks.core.event.EventBus;
-import org.jetlinks.core.event.Subscription;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.boot.CommandLineRunner;
@@ -14,7 +12,6 @@ import reactor.core.publisher.Mono;
 import reactor.function.Function3;
 
 import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
 import java.io.Serializable;
 import java.time.Duration;
 import java.util.ArrayList;

+ 1 - 1
jetlinks-manager/notify-manager/src/main/java/org/jetlinks/community/notify/manager/entity/NotificationEntity.java

@@ -69,7 +69,7 @@ public class NotificationEntity extends GenericEntity<String> {
     @ColumnType(jdbcType = JDBCType.CLOB, javaType = String.class)
     private String detailJson;
 
-
+ 
     @Column(length = 32)
     @EnumCodec
     @DefaultValue("unread")

+ 4 - 2
jetlinks-standalone/src/main/resources/application-embedded.yml

@@ -2,8 +2,10 @@ spring:
   resources:
     static-locations: file:./index/, file:./static/,/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/, classpath:/public/
   redis:
-    host: 127.0.0.1
+    host: 47.96.123.180
     port: 6379
+    password: Qq123321
+    database: 2
     lettuce:
       pool:
         max-active: 1024
@@ -15,7 +17,7 @@ spring:
     pool:
       max-size: 32
   elasticsearch:
-    uris: localhost:9201
+    uris: 121.41.170.171:9200
     socket-timeout: 10s
     connection-timeout: 15s
     webclient:

+ 8 - 8
jetlinks-standalone/src/main/resources/application.yml

@@ -16,8 +16,10 @@ spring:
     resources:
       static-locations: file:./static/,/,classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/, classpath:/public/
   redis:
-    host: 127.0.0.1
+    host: 47.96.123.180
     port: 6379
+    password: Qq123321
+    database: 2
     lettuce:
       pool:
         max-active: 1024
@@ -25,11 +27,9 @@ spring:
   #    database: 3
   #        max-wait: 10s
   r2dbc:
-    # 需要手动创建数据库,启动会自动创建表,修改了配置easyorm相关配置也要修改
-    url: r2dbc:postgresql://127.0.0.1:5432/jetlinks
-    #    url: r2dbc:mysql://127.0.0.1:3306/jetlinks?ssl=false&serverZoneId=Asia/Shanghai # 修改了配置easyorm相关配置也要修改
-    username: postgres
-    password: jetlinks
+    url: r2dbc:postgresql://47.96.123.180:5432/jetlinks
+    username: jetlinks
+    password: xJw5xkHecJ6r
     pool:
       max-size: 32
       max-idle-time: 2m # 值不能大于mysql server的wait_timeout配置
@@ -39,7 +39,7 @@ spring:
     debug-agent:
       enabled: false
   elasticsearch:
-    uris: 127.0.0.1:9200
+    uris: 192.168.196.2:9200
     socket-timeout: 10s
     connection-timeout: 15s
     webclient:
@@ -52,7 +52,7 @@ tdengine:
   database: jetlinks
   restful:
     endpoints:
-      - http://127.0.0.1:6041/
+      - http://47.96.123.180:6041/
     username: root
     password: taosdata
 elasticsearch: