From 0242ce4188b919b633e4685e42e02e749e4e5986 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Mon, 26 Sep 2022 17:28:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../redis/ObjectRedisSerializer.java | 67 ++++++ .../RedisSerializationConfiguration.java | 24 +- .../main/resources/META-INF/spring.factories | 3 +- jetlinks-components/pom.xml | 2 + .../configuration/JetLinksConfiguration.java | 40 ---- .../LazyInitManagementProtocolSupports.java | 87 -------- .../configuration/RenameProtocolSupport.java | 208 ------------------ .../SpringProtocolSupportLoader.java | 41 ---- .../configuration/SpringProtocolSupports.java | 25 --- .../configuration/SpringServiceContext.java | 70 ------ .../doc/SwaggerConfiguration.java | 50 ----- .../fst/FstSerializationRedisSerializer.java | 48 ---- .../AutoDownloadJarProtocolSupportLoader.java | 163 -------------- pom.xml | 16 +- 14 files changed, 87 insertions(+), 757 deletions(-) create mode 100755 jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/ObjectRedisSerializer.java rename jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksRedisConfiguration.java => jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/RedisSerializationConfiguration.java (57%) mode change 100644 => 100755 delete mode 100644 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/LazyInitManagementProtocolSupports.java delete mode 100755 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/RenameProtocolSupport.java delete mode 100644 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupportLoader.java delete mode 100644 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupports.java delete mode 100644 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringServiceContext.java delete mode 100644 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/doc/SwaggerConfiguration.java delete mode 100644 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/fst/FstSerializationRedisSerializer.java delete mode 100755 jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/protocol/AutoDownloadJarProtocolSupportLoader.java diff --git a/jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/ObjectRedisSerializer.java b/jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/ObjectRedisSerializer.java new file mode 100755 index 00000000..4b474b91 --- /dev/null +++ b/jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/ObjectRedisSerializer.java @@ -0,0 +1,67 @@ +package org.jetlinks.community.configure.redis; + +import io.netty.util.concurrent.FastThreadLocal; +import lombok.AllArgsConstructor; +import lombok.SneakyThrows; +import lombok.extern.slf4j.Slf4j; +import org.jetlinks.core.utils.SerializeUtils; +import org.jetlinks.community.codec.Serializers; +import org.springframework.data.redis.serializer.RedisSerializer; +import org.springframework.data.redis.serializer.SerializationException; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.ObjectInput; +import java.io.ObjectOutput; + +@Slf4j +@AllArgsConstructor +public class ObjectRedisSerializer implements RedisSerializer { + + static final FastThreadLocal STREAM_LOCAL = new FastThreadLocal() { + @Override + protected ByteArrayOutputStream initialValue() { + return new ByteArrayOutputStream(1024) { + @Override + public void close() { + reset(); + } + }; + } + }; + + @Override + @SneakyThrows + public byte[] serialize(Object o) throws SerializationException { + if (o == null) { + return null; + } + ByteArrayOutputStream arr = STREAM_LOCAL.get(); + try (ObjectOutput output = Serializers.getDefault().createOutput(arr)) { + + SerializeUtils.writeObject(o, output); + output.flush(); + + return arr.toByteArray(); + } catch (Throwable e) { + log.error(e.getMessage(), e); + throw e; + } + } + + @Override + @SneakyThrows + public Object deserialize(byte[] bytes) throws SerializationException { + if (bytes == null) { + return null; + } + try (ObjectInput input = Serializers + .getDefault() + .createInput(new ByteArrayInputStream(bytes))) { + return SerializeUtils.readObject(input); + } catch (Throwable e) { + log.error(e.getMessage(), e); + throw e; + } + } +} diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksRedisConfiguration.java b/jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/RedisSerializationConfiguration.java old mode 100644 new mode 100755 similarity index 57% rename from jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksRedisConfiguration.java rename to jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/RedisSerializationConfiguration.java index 9b399f35..a01322d0 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksRedisConfiguration.java +++ b/jetlinks-components/configure-component/src/main/java/org/jetlinks/community/configure/redis/RedisSerializationConfiguration.java @@ -1,11 +1,9 @@ -package org.jetlinks.community.standalone.configuration; +package org.jetlinks.community.configure.redis; -import org.jetlinks.community.standalone.configuration.fst.FstSerializationRedisSerializer; -import org.nustaq.serialization.FSTConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.io.ResourceLoader; +import org.springframework.context.annotation.Primary; import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory; import org.springframework.data.redis.core.ReactiveRedisTemplate; import org.springframework.data.redis.serializer.RedisSerializationContext; @@ -13,23 +11,17 @@ import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; @Configuration -@ConditionalOnProperty(prefix = "spring.redis",name = "serializer",havingValue = "fst") -public class JetLinksRedisConfiguration { +@ConditionalOnProperty(prefix = "spring.redis",name = "serializer",havingValue = "obj",matchIfMissing = true) +public class RedisSerializationConfiguration { @Bean - public ReactiveRedisTemplate reactiveRedisTemplate( - ReactiveRedisConnectionFactory reactiveRedisConnectionFactory, ResourceLoader resourceLoader) { - - FstSerializationRedisSerializer serializer = new FstSerializationRedisSerializer(() -> { - FSTConfiguration configuration = FSTConfiguration.createDefaultConfiguration() - .setForceSerializable(true); - configuration.setClassLoader(resourceLoader.getClassLoader()); - return configuration; - }); + @Primary + public ReactiveRedisTemplate reactiveRedisTemplate(ReactiveRedisConnectionFactory reactiveRedisConnectionFactory) { + ObjectRedisSerializer serializer = new ObjectRedisSerializer(); @SuppressWarnings("all") RedisSerializationContext serializationContext = RedisSerializationContext .newSerializationContext() - .key((RedisSerializer)new StringRedisSerializer()) + .key((RedisSerializer) StringRedisSerializer.UTF_8) .value(serializer) .hashKey(StringRedisSerializer.UTF_8) .hashValue(serializer) diff --git a/jetlinks-components/configure-component/src/main/resources/META-INF/spring.factories b/jetlinks-components/configure-component/src/main/resources/META-INF/spring.factories index 0e5cc8f5..4c0a58ed 100644 --- a/jetlinks-components/configure-component/src/main/resources/META-INF/spring.factories +++ b/jetlinks-components/configure-component/src/main/resources/META-INF/spring.factories @@ -2,4 +2,5 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ org.jetlinks.community.configure.cluster.ClusterConfiguration,\ org.jetlinks.community.configure.doc.SpringDocCustomizerConfiguration,\ org.jetlinks.community.configure.trace.TraceConfiguration,\ -org.jetlinks.community.configure.device.DeviceClusterConfiguration \ No newline at end of file +org.jetlinks.community.configure.device.DeviceClusterConfiguration,\ +org.jetlinks.community.configure.redis.RedisSerializationConfiguration \ No newline at end of file diff --git a/jetlinks-components/pom.xml b/jetlinks-components/pom.xml index 90585015..7af8c9f6 100644 --- a/jetlinks-components/pom.xml +++ b/jetlinks-components/pom.xml @@ -23,6 +23,8 @@ logging-component rule-engine-component configure-component + things-component + script-component jetlinks-components diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksConfiguration.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksConfiguration.java index fb885c42..f8c3f01e 100644 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksConfiguration.java +++ b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/JetLinksConfiguration.java @@ -3,22 +3,12 @@ package org.jetlinks.community.standalone.configuration; import io.vertx.core.Vertx; import io.vertx.core.VertxOptions; import lombok.extern.slf4j.Slf4j; -import org.hswebframework.web.authorization.token.UserTokenManager; -import org.hswebframework.web.authorization.token.redis.RedisUserTokenManager; -import org.jetlinks.core.cluster.ClusterManager; -import org.jetlinks.core.spi.ServiceContext; -import org.jetlinks.supports.protocol.ServiceLoaderProtocolSupports; -import org.jetlinks.supports.protocol.management.ClusterProtocolSupportManager; -import org.jetlinks.supports.protocol.management.ProtocolSupportLoader; -import org.jetlinks.supports.protocol.management.ProtocolSupportManager; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.web.embedded.netty.NettyReactiveWebServerFactory; import org.springframework.boot.web.server.WebServerFactoryCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.data.redis.core.ReactiveRedisOperations; @Configuration @EnableConfigurationProperties(JetLinksProperties.class) @@ -46,35 +36,5 @@ public class JetLinksConfiguration { return Vertx.vertx(vertxOptions); } - @Bean(initMethod = "init") - @ConditionalOnProperty(prefix = "jetlinks.protocol.spi", name = "enabled", havingValue = "true") - public ServiceLoaderProtocolSupports serviceLoaderProtocolSupports(ServiceContext serviceContext) { - ServiceLoaderProtocolSupports supports = new ServiceLoaderProtocolSupports(); - supports.setServiceContext(serviceContext); - return supports; - } - - @Bean - @ConfigurationProperties(prefix = "hsweb.user-token") - public UserTokenManager userTokenManager(ReactiveRedisOperations template) { - return new RedisUserTokenManager(template); - } - - @Bean - public ProtocolSupportManager protocolSupportManager(ClusterManager clusterManager) { - return new ClusterProtocolSupportManager(clusterManager); - } - - @Bean - public LazyInitManagementProtocolSupports managementProtocolSupports(ProtocolSupportManager supportManager, - ProtocolSupportLoader loader, - ClusterManager clusterManager) { - LazyInitManagementProtocolSupports supports = new LazyInitManagementProtocolSupports(); - supports.setClusterManager(clusterManager); - supports.setManager(supportManager); - supports.setLoader(loader); - return supports; - } - } diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/LazyInitManagementProtocolSupports.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/LazyInitManagementProtocolSupports.java deleted file mode 100644 index e5cd55dc..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/LazyInitManagementProtocolSupports.java +++ /dev/null @@ -1,87 +0,0 @@ -package org.jetlinks.community.standalone.configuration; - -import lombok.AccessLevel; -import lombok.Getter; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.jetlinks.core.ProtocolSupport; -import org.jetlinks.core.cluster.ClusterManager; -import org.jetlinks.supports.protocol.StaticProtocolSupports; -import org.jetlinks.supports.protocol.management.ProtocolSupportDefinition; -import org.jetlinks.supports.protocol.management.ProtocolSupportLoader; -import org.jetlinks.supports.protocol.management.ProtocolSupportManager; -import org.springframework.boot.CommandLineRunner; -import reactor.core.publisher.Mono; - -import java.time.Duration; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.function.Consumer; - -@Slf4j -@Getter -@Setter -public class LazyInitManagementProtocolSupports extends StaticProtocolSupports implements CommandLineRunner { - - private ProtocolSupportManager manager; - - private ProtocolSupportLoader loader; - - private ClusterManager clusterManager; - - @Setter(AccessLevel.PRIVATE) - private Map configProtocolIdMapping = new ConcurrentHashMap<>(); - - private Duration loadTimeOut = Duration.ofSeconds(30); - - public void init() { - - clusterManager.getTopic("_protocol_changed") - .subscribe() - .subscribe(protocol -> this.init(protocol).subscribe()); - - try { - manager.loadAll() - .filter(de -> de.getState() == 1) - .flatMap(this::init) - .blockLast(loadTimeOut); - } catch (Throwable e) { - log.error("load protocol error", e); - } - - } - - public Mono init(ProtocolSupportDefinition definition) { - if (definition.getState() != 1) { - String protocol = configProtocolIdMapping.get(definition.getId()); - if (protocol != null) { - log.debug("uninstall protocol:{}", definition); - unRegister(protocol); - return Mono.empty(); - } - } - String operation = definition.getState() != 1 ? "uninstall" : "install"; - Consumer consumer = definition.getState() != 1 ? this::unRegister : this::register; - - log.debug("{} protocol:{}", operation, definition); - - return loader - .load(definition) - .doOnNext(e -> { - log.debug("{} protocol[{}] success: {}", operation, definition.getId(), e); - configProtocolIdMapping.put(definition.getId(), e.getId()); - consumer.accept(e); - }) - .onErrorResume((e) -> { - log.error("{} protocol[{}] error: {}", operation, definition.getId(), e); - return Mono.empty(); - }) - .then(); - - } - - @Override - public void run(String... args) { - init(); - } -} \ No newline at end of file diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/RenameProtocolSupport.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/RenameProtocolSupport.java deleted file mode 100755 index e74e5741..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/RenameProtocolSupport.java +++ /dev/null @@ -1,208 +0,0 @@ -package org.jetlinks.community.standalone.configuration; - -import lombok.AllArgsConstructor; -import lombok.Generated; -import lombok.Getter; -import org.jetlinks.core.ProtocolSupport; -import org.jetlinks.core.device.*; -import org.jetlinks.core.event.EventBus; -import org.jetlinks.core.message.codec.DeviceMessageCodec; -import org.jetlinks.core.message.codec.TraceDeviceMessageCodec; -import org.jetlinks.core.message.codec.Transport; -import org.jetlinks.core.message.interceptor.DeviceMessageSenderInterceptor; -import org.jetlinks.core.metadata.*; -import org.jetlinks.core.route.Route; -import org.jetlinks.core.server.ClientConnection; -import org.jetlinks.core.server.DeviceGatewayContext; -import org.jetlinks.supports.official.JetLinksDeviceMetadataCodec; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import javax.annotation.Nonnull; -import java.util.Map; - -/** - * 重命名协议，将协议包里的协议使用进行重命名 - * - * @author zhouhao - * @since 1.2 - */ -@AllArgsConstructor -@Generated -public class RenameProtocolSupport implements ProtocolSupport { - - public static final JetLinksDeviceMetadataCodec metadataCodec = new JetLinksDeviceMetadataCodec(); - @Getter - private final String id; - - @Getter - private final String name; - - @Getter - private final String description; - - private final ProtocolSupport target; - - @Override - public Flux getSupportedTransport() { - return target.getSupportedTransport(); - } - - @Nonnull - @Override - public Mono getMessageCodec(Transport transport) { - return target - .getMessageCodec(transport) - .map(codec-> new TraceDeviceMessageCodec(id,codec)); - } - - @Override - public Mono getSenderInterceptor() { - return target.getSenderInterceptor(); - } - - @Nonnull - @Override - @SuppressWarnings("all") - public DeviceMetadataCodec getMetadataCodec() { - return target.getMetadataCodec() == null ? metadataCodec : target.getMetadataCodec(); - } - - @Nonnull - @Override - public Mono authenticate(@Nonnull AuthenticationRequest request, - @Nonnull DeviceOperator deviceOperation) { - return target.authenticate(request, deviceOperation); - } - - @Nonnull - @Override - public Mono authenticate(@Nonnull AuthenticationRequest request, - @Nonnull DeviceRegistry registry) { - return target.authenticate(request, registry); - } - - @Override - public Mono getDefaultMetadata(Transport transport) { - return target.getDefaultMetadata(transport); - } - - @Override - public Flux getMetadataExpandsConfig(Transport transport, - DeviceMetadataType metadataType, - String metadataId, - String dataTypeId) { - return target.getMetadataExpandsConfig(transport, metadataType, metadataId, dataTypeId); - } - - @Override - public Flux getMetadataCodecs() { - return target.getMetadataCodecs(); - } - - @Override - public Mono getInitConfigMetadata() { - return target.getInitConfigMetadata(); - } - - @Nonnull - @Override - public Mono getStateChecker() { - return target.getStateChecker(); - } - - @Override - public Mono getConfigMetadata(Transport transport) { - return target.getConfigMetadata(transport); - } - - @Override - public void init(Map configuration) { - target.init(configuration); - } - - @Override - public void dispose() { - target.dispose(); - } - - @Override - public boolean isDisposed() { - return target.isDisposed(); - } - - @Override - public Mono onDeviceUnRegister(DeviceOperator operator) { - return target.onDeviceUnRegister(operator); - } - - @Override - public Mono onDeviceRegister(DeviceOperator operator) { - return target.onDeviceRegister(operator); - } - - @Override - public Mono onProductRegister(DeviceProductOperator operator) { - return target.onProductRegister(operator); - } - - @Override - public Mono onProductUnRegister(DeviceProductOperator operator) { - return target.onProductUnRegister(operator); - } - - @Override - public Mono onDeviceMetadataChanged(DeviceOperator operator) { - return target.onDeviceMetadataChanged(operator); - } - - @Override - public Mono onProductMetadataChanged(DeviceProductOperator operator) { - return target.onProductMetadataChanged(operator); - } - - @Override - public Mono onChildBind(DeviceOperator gateway, Flux child) { - return target.onChildBind(gateway, child); - } - - @Override - public Mono onChildUnbind(DeviceOperator gateway, Flux child) { - return target.onChildUnbind(gateway, child); - } - - @Override - public Mono onClientConnect(Transport transport, ClientConnection connection, DeviceGatewayContext context) { - return target.onClientConnect(transport, connection, context); - } - - @Override - public Flux getFeatures(Transport transport) { - return target.getFeatures(transport); - } - - @Override - public Mono doBeforeDeviceCreate(Transport transport, DeviceInfo deviceInfo) { - return target.doBeforeDeviceCreate(transport, deviceInfo); - } - - @Override - public int getOrder() { - return target.getOrder(); - } - - @Override - public int compareTo(ProtocolSupport o) { - return target.compareTo(o); - } - - @Override - public Flux getRoutes(Transport transport) { - return target.getRoutes(transport); - } - - @Override - public String getDocument(Transport transport) { - return target.getDocument(transport); - } -} diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupportLoader.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupportLoader.java deleted file mode 100644 index 89b0f81e..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupportLoader.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.jetlinks.community.standalone.configuration; - -import org.jetlinks.core.ProtocolSupport; -import org.jetlinks.supports.protocol.management.ProtocolSupportDefinition; -import org.jetlinks.supports.protocol.management.ProtocolSupportLoader; -import org.jetlinks.supports.protocol.management.ProtocolSupportLoaderProvider; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.stereotype.Component; -import reactor.core.publisher.Mono; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - - -@Component -public class SpringProtocolSupportLoader implements ProtocolSupportLoader,BeanPostProcessor { - - private final Map providers = new ConcurrentHashMap<>(); - - public void register(ProtocolSupportLoaderProvider provider) { - this.providers.put(provider.getProvider(), provider); - } - - @Override - public Mono load(ProtocolSupportDefinition definition) { - return Mono - .justOrEmpty(this.providers.get(definition.getProvider())) - .switchIfEmpty(Mono.error(() -> new UnsupportedOperationException("unsupported provider:" + definition.getProvider()))) - .flatMap((provider) -> provider.load(definition)) - .map(loaded -> new RenameProtocolSupport(definition.getId(), definition.getName(), definition.getDescription(), loaded)); - } - - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException { - if (bean instanceof ProtocolSupportLoaderProvider) { - register(((ProtocolSupportLoaderProvider) bean)); - } - return bean; - } -} \ No newline at end of file diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupports.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupports.java deleted file mode 100644 index ba42fe7d..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringProtocolSupports.java +++ /dev/null @@ -1,25 +0,0 @@ -package org.jetlinks.community.standalone.configuration; - -import org.jetlinks.core.ProtocolSupports; -import org.jetlinks.core.defaults.CompositeProtocolSupports; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; - - -@Component -@Primary -public class SpringProtocolSupports extends CompositeProtocolSupports implements BeanPostProcessor { - - @Override - public Object postProcessAfterInitialization(Object o, String s) throws BeansException { - if (o == this) { - return o; - } - if (o instanceof ProtocolSupports) { - register(((ProtocolSupports) o)); - } - return o; - } -} diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringServiceContext.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringServiceContext.java deleted file mode 100644 index c6e59c74..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/SpringServiceContext.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.jetlinks.community.standalone.configuration; - -import lombok.extern.slf4j.Slf4j; -import org.jetlinks.core.Value; -import org.jetlinks.core.config.ConfigKey; -import org.jetlinks.core.spi.ServiceContext; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -@Component -@Slf4j -public class SpringServiceContext implements ServiceContext { - - @Autowired - private ApplicationContext applicationContext; - - @Override - public Optional getConfig(ConfigKey key) { - return getConfig(key.getKey()); - } - - @Override - public Optional getConfig(String key) { - return Optional.ofNullable(applicationContext.getEnvironment() - .getProperty(key)) - .map(Value::simple) - ; - } - - @Override - public Optional getService(Class service) { - try { - return Optional.of(applicationContext.getBean(service)); - } catch (Exception e) { - log.error("load service [{}] error", service, e); - return Optional.empty(); - } - } - - @Override - public Optional getService(String service) { - try { - return Optional.of((T)applicationContext.getBean(service)); - } catch (Exception e) { - log.error("load service [{}] error", service, e); - return Optional.empty(); - } - } - - @Override - public List getServices(Class service) { - try { - return new ArrayList<>(applicationContext.getBeansOfType(service).values()); - }catch (Exception e){ - log.error("load service [{}] error", service, e); - return Collections.emptyList(); - } - } - - @Override - public List getServices(String service) { - return Collections.emptyList(); - } -} diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/doc/SwaggerConfiguration.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/doc/SwaggerConfiguration.java deleted file mode 100644 index cb592a37..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/doc/SwaggerConfiguration.java +++ /dev/null @@ -1,50 +0,0 @@ -package org.jetlinks.community.standalone.configuration.doc; - -import io.swagger.v3.oas.annotations.OpenAPIDefinition; -import io.swagger.v3.oas.annotations.enums.SecuritySchemeIn; -import io.swagger.v3.oas.annotations.enums.SecuritySchemeType; -import io.swagger.v3.oas.annotations.info.Contact; -import io.swagger.v3.oas.annotations.info.Info; -import io.swagger.v3.oas.annotations.security.SecurityScheme; -import io.swagger.v3.oas.annotations.security.SecuritySchemes; -import org.hswebframework.web.crud.web.ResponseMessage; -import org.reactivestreams.Publisher; -import org.springdoc.core.ReturnTypeParser; -import org.springdoc.webflux.core.SpringDocWebFluxConfiguration; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.MethodParameter; -import org.springframework.core.ResolvableType; -import org.springframework.http.ResponseEntity; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.util.List; - -@Configuration(proxyBeanMethods = false) -@OpenAPIDefinition( - info = @Info( - title = "物联网平台", - description = "物联网平台接口文档", - contact = @Contact(name = "admin",url = "https://github.com/jetlinks"), - version = "1.12.0" - ) -) -@SecuritySchemes( - { - @SecurityScheme( - type = SecuritySchemeType.APIKEY, - name = "Token", - paramName = "X-Access-Token", - in = SecuritySchemeIn.HEADER, - description = "认证token" - ) - } -) -@AutoConfigureBefore(SpringDocWebFluxConfiguration.class) -public class SwaggerConfiguration { - -} diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/fst/FstSerializationRedisSerializer.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/fst/FstSerializationRedisSerializer.java deleted file mode 100644 index 08eb9c4a..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/fst/FstSerializationRedisSerializer.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.jetlinks.community.standalone.configuration.fst; - -import io.netty.util.concurrent.FastThreadLocal; -import lombok.AllArgsConstructor; -import lombok.SneakyThrows; -import org.nustaq.serialization.FSTConfiguration; -import org.nustaq.serialization.FSTObjectInput; -import org.nustaq.serialization.FSTObjectOutput; -import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.data.redis.serializer.SerializationException; - -import java.io.ByteArrayOutputStream; -import java.util.function.Supplier; - -@AllArgsConstructor -public class FstSerializationRedisSerializer implements RedisSerializer { - - private final FastThreadLocal configuration; - - public FstSerializationRedisSerializer(Supplier supplier) { - - this(new FastThreadLocal() { - @Override - protected FSTConfiguration initialValue() { - return supplier.get(); - } - }); - } - - @Override - @SneakyThrows - public byte[] serialize(Object o) throws SerializationException { - ByteArrayOutputStream arr = new ByteArrayOutputStream(1024); - try (FSTObjectOutput output = configuration.get().getObjectOutput(arr)) { - output.writeObject(o); - } - return arr.toByteArray(); - } - - @Override - @SneakyThrows - public Object deserialize(byte[] bytes) throws SerializationException { - - try (FSTObjectInput input = configuration.get().getObjectInput(bytes)) { - return input.readObject(); - } - } -} diff --git a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/protocol/AutoDownloadJarProtocolSupportLoader.java b/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/protocol/AutoDownloadJarProtocolSupportLoader.java deleted file mode 100755 index 1ea7a2a2..00000000 --- a/jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/configuration/protocol/AutoDownloadJarProtocolSupportLoader.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.jetlinks.community.standalone.configuration.protocol; - -import lombok.Generated; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.codec.digest.DigestUtils; -import org.hswebframework.web.bean.FastBeanCopier; -import org.jetlinks.core.ProtocolSupport; -import org.jetlinks.core.spi.ServiceContext; -import org.jetlinks.community.io.file.FileManager; -import org.jetlinks.community.utils.TimeUtils; -import org.jetlinks.supports.protocol.management.ProtocolSupportDefinition; -import org.jetlinks.supports.protocol.management.jar.JarProtocolSupportLoader; -import org.jetlinks.supports.protocol.management.jar.ProtocolClassLoader; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.core.io.buffer.DataBuffer; -import org.springframework.core.io.buffer.DataBufferUtils; -import org.springframework.stereotype.Component; -import org.springframework.util.StringUtils; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Mono; -import reactor.core.scheduler.Schedulers; - -import javax.annotation.PreDestroy; -import java.io.File; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.time.Duration; -import java.util.Map; -import java.util.Optional; -import java.util.concurrent.TimeoutException; - -import static java.nio.file.StandardOpenOption.*; - -/** - * 自动下载并缓存协议包， - * 
- *     1. 下载的协议包报错在./data/protocols目录下，可通过启动参数-Djetlinks.protocol.temp.path进行配置
- *     2. 文件名规则: 协议ID+"_"+md5(文件地址)
- *     3. 如果文件不存在则下载协议
- *
- * - * @author zhouhao - * @since 1.3 - */ -@Component -@Slf4j -public class AutoDownloadJarProtocolSupportLoader extends JarProtocolSupportLoader { - - final WebClient webClient; - - final File tempPath; - - private final Duration loadTimeout = TimeUtils.parse(System.getProperty("jetlinks.protocol.load.timeout", "30s")); - - private final FileManager fileManager; - - public AutoDownloadJarProtocolSupportLoader(WebClient.Builder builder, - FileManager fileManager) { - this.webClient = builder.build(); - this.fileManager = fileManager; - tempPath = new File(System.getProperty("jetlinks.protocol.temp.path", "./data/protocols")); - tempPath.mkdirs(); - } - - @Override - @Autowired - @Generated - public void setServiceContext(ServiceContext serviceContext) { - super.setServiceContext(serviceContext); - } - - @Override - @PreDestroy - @Generated - protected void closeAll() { - super.closeAll(); - } - - @Override - protected void closeLoader(ProtocolClassLoader loader) { - super.closeLoader(loader); - } - - @Override - public Mono load(ProtocolSupportDefinition definition) { - - //复制新的配置信息 - ProtocolSupportDefinition newDef = FastBeanCopier.copy(definition, new ProtocolSupportDefinition()); - - Map config = newDef.getConfiguration(); - String location = Optional - .ofNullable(config.get("location")) - .map(String::valueOf) - .orElse(null); - //远程文件则先下载再加载 - if (StringUtils.hasText(location) && location.startsWith("http")) { - String urlMd5 = DigestUtils.md5Hex(location); - //地址没变则直接加载本地文件 - File file = new File(tempPath, (newDef.getId() + "_" + urlMd5) + ".jar"); - if (file.exists()) { - //设置文件地址文本地文件 - config.put("location", file.getAbsolutePath()); - return super - .load(newDef) - .subscribeOn(Schedulers.boundedElastic()) - //加载失败则删除文件,防止文件内容错误时,一直无法加载 - .doOnError(err -> file.delete()); - } - return webClient - .get() - .uri(location) - .retrieve() - .bodyToFlux(DataBuffer.class) - .as(dataStream -> { - log.debug("download protocol file {} to {}", location, file.getAbsolutePath()); - //写出文件 - return DataBufferUtils - .write(dataStream, file.toPath(), CREATE, WRITE) - .thenReturn(file.getAbsolutePath()); - }) - //使用弹性线程池来写出文件 - .subscribeOn(Schedulers.boundedElastic()) - //设置本地文件路径 - .doOnNext(path -> config.put("location", path)) - .then(super.load(newDef)) - .timeout(loadTimeout, Mono.error(() -> new TimeoutException("获取协议文件失败:" + location))) - //失败时删除文件 - .doOnError(err -> file.delete()) - ; - } - - //使用文件管理器获取文件 - String fileId = (String) config.getOrDefault("fileId", null); - if (!StringUtils.hasText(fileId)) { - return Mono.error(new IllegalArgumentException("location or fileId can not be empty")); - } - return loadFromFileManager(newDef.getId(), fileId) - .flatMap(file -> { - config.put("location", file.getAbsolutePath()); - return super - .load(newDef) - .subscribeOn(Schedulers.boundedElastic()) - //加载失败则删除文件,防止文件内容错误时,一直无法加载 - .doOnError(err -> file.delete()); - }); - - } - - private Mono loadFromFileManager(String protocolId, String fileId) { - Path path = Paths.get(tempPath.getPath(), (protocolId + "_" + fileId) + ".jar"); - - File file = path.toFile(); - if (file.exists()) { - return Mono.just(file); - } - - return DataBufferUtils - .write(fileManager.read(fileId), - path, CREATE_NEW, TRUNCATE_EXISTING, WRITE) - .thenReturn(file); - } - -} diff --git a/pom.xml b/pom.xml index b1f0f954..e2d8ed50 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 zh_CN - 2.5.13 + 2.7.1 1.8 ${java.version} 4.0.15-SNAPSHOT @@ -24,14 +24,14 @@ 3.0.2 1.2.0-SNAPSHOT Borca-SR1 - 4.1.77.Final - 7.11.2 - 1.0.3 - 1.0.14 - 3.3.1 + 4.1.79.Final + 7.17.5 + 1.0.3-SNAPSHOT + 1.0.14-SNAPSHOT + 3.6.0 1.2.83 - 2020.0.18 - 4.3.0 + 2020.0.20 + 4.3.1 2.17.1 1.2.9 1.6.6