spring boot 2.3.3

build-and-push-docker.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
 
-./mvnw clean package -Dmaven.test.skip=true
+dockerImage=registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone:$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)
+./mvnw clean install -Dmaven.test.skip=true
 if [ $? -ne 0 ];then
     echo "构建失败!"
 else
   cd ./jetlinks-standalone || exit
-  ../mvnw docker:build && docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-standalone
+  docker build -t "$dockerImage" . && docker push "$dockerImage"
 fi

jetlinks-components/timeseries-component/src/main/java/org/jetlinks/community/timeseries/micrometer/TimeSeriesPropertiesPropertiesConfigAdapter.java

@@ -10,6 +10,8 @@ class TimeSeriesPropertiesPropertiesConfigAdapter extends StepRegistryProperties
       super(properties);
   }
 
-
-
+    @Override
+    public String prefix() {
+        return "management.metrics.export.time-series";
+    }
 }

jetlinks-manager/authentication-manager/pom.xml

@@ -32,7 +32,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.springframework.boot.experimental</groupId>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-r2dbc</artifactId>
         </dependency>
 

jetlinks-manager/logging-manager/pom.xml

@@ -24,11 +24,6 @@
             <version>${hsweb.framework.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot.experimental</groupId>
-            <artifactId>spring-boot-starter-data-r2dbc</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.jetlinks.community</groupId>
             <artifactId>logging-component</artifactId>

jetlinks-standalone/Dockerfile

@@ -0,0 +1,14 @@
+FROM openjdk:8 as builder
+WORKDIR application
+ARG JAR_FILE=target/jetlinks-standalone.jar
+COPY ${JAR_FILE} application.jar
+RUN java -Djarmode=layertools -jar application.jar extract
+
+FROM openjdk:8
+WORKDIR application
+COPY --from=builder application/dependencies/ ./
+COPY --from=builder application/snapshot-dependencies/ ./
+COPY --from=builder application/spring-boot-loader/ ./
+COPY --from=builder application/application/ ./
+COPY docker-entrypoint.sh ./
+ENTRYPOINT ["sh","docker-entrypoint.sh"]

jetlinks-standalone/docker-entrypoint.sh

@@ -4,4 +4,4 @@ java $JAVA_OPTS -server \
 -XX:+UseCGroupMemoryLimitForHeap \
 -XX:-OmitStackTraceInFastThrow \
 -Djava.security.egd=file:/dev/./urandom \
--jar /$APP_JAR
+org.springframework.boot.loader.JarLauncher

jetlinks-standalone/pom.xml

@@ -35,6 +35,9 @@
                 <configuration>
                     <mainClass>${project.groupId}.standalone.JetLinksApplication</mainClass>
                     <layout>ZIP</layout>
+                    <layers>
+                        <enabled>true</enabled>
+                    </layers>
                 </configuration>
                 <executions>
                     <execution>
@@ -182,7 +185,7 @@
 <!--        </dependency>-->
 
         <dependency>
-            <groupId>org.springframework.boot.experimental</groupId>
+            <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-r2dbc</artifactId>
         </dependency>
 

jetlinks-standalone/src/main/java/org/jetlinks/community/standalone/JetLinksApplication.java

@@ -8,7 +8,7 @@ import org.hswebframework.web.loggin.aop.EnableAccessLogger;
 import org.hswebframework.web.logging.events.AccessLoggerAfterEvent;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.elasticsearch.rest.RestClientAutoConfiguration;
+import org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Profile;
@@ -20,7 +20,7 @@ import javax.annotation.PostConstruct;
 
 @SpringBootApplication(scanBasePackages = "org.jetlinks.community", exclude = {
     DataSourceAutoConfiguration.class,
-    RestClientAutoConfiguration.class
+    ElasticsearchRestClientAutoConfiguration.class
 })
 @EnableCaching
 @EnableEasyormRepository("org.jetlinks.community.**.entity")

pom.xml

@@ -16,11 +16,11 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.locales>zh_CN</project.build.locales>
-        <spring.boot.version>2.2.8.RELEASE</spring.boot.version>
+        <spring.boot.version>2.3.3.RELEASE</spring.boot.version>
         <java.version>1.8</java.version>
         <project.build.jdk>${java.version}</project.build.jdk>
-        <hsweb.framework.version>4.0.4</hsweb.framework.version>
-        <easyorm.version>4.0.4</easyorm.version>
+        <hsweb.framework.version>4.0.6-SNAPSHOT</hsweb.framework.version>
+        <easyorm.version>4.0.6-SNAPSHOT</easyorm.version>
         <hsweb.expands.version>3.0.2</hsweb.expands.version>
         <jetlinks.version>1.1.1-SNAPSHOT</jetlinks.version>
         <r2dbc.version>Arabba-SR6</r2dbc.version>
@@ -28,7 +28,7 @@
         <netty.version>4.1.50.Final</netty.version>
         <elasticsearch.version>6.8.11</elasticsearch.version>
         <reactor.excel.version>1.0-RC</reactor.excel.version>
-        <reactor.ql.version>1.0.4</reactor.ql.version>
+        <reactor.ql.version>1.0.5-SNAPSHOT</reactor.ql.version>
         <fastjson.version>1.2.70</fastjson.version>
     </properties>