Skip to content

GitLab

S
schbrain-parent
Commit e9835533 authored by liaozan's avatar liaozan 🏀
Browse files
Options

Merge branch 'main' into docker-image 

# Conflicts:
#	pom.xml
parents 7a017e4b 2c69a212
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 26 deletions
pom.xml
View file @ e9835533
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
<schbrain-apollo.version>1.0.1-SNAPSHOT</schbrain-apollo.version> <schbrain-apollo.version>1.0.1-SNAPSHOT</schbrain-apollo.version>
<schbrain-logger.version>1.0.1-SNAPSHOT</schbrain-logger.version> <schbrain-logger.version>1.0.1-SNAPSHOT</schbrain-logger.version>
<schbrain-oss.version>1.0.1-SNAPSHOT</schbrain-oss.version> <schbrain-oss.version>1.0.1-SNAPSHOT</schbrain-oss.version>
<schbrain-xxl.version>1.0.0-SNAPSHOT</schbrain-xxl.version>
<schbrain-common.version>1.0.1-SNAPSHOT</schbrain-common.version> <schbrain-common.version>1.0.1-SNAPSHOT</schbrain-common.version>
<schbrain-web-common.version>1.0.1-SNAPSHOT</schbrain-web-common.version> <schbrain-web-common.version>1.0.1-SNAPSHOT</schbrain-web-common.version>
...@@ -52,28 +54,27 @@ ...@@ -52,28 +54,27 @@
<guava.version>31.0.1-jre</guava.version> <guava.version>31.0.1-jre</guava.version>
<!-- used for apollo --> <!-- used for apollo -->
<guice.version>5.0.1</guice.version> <guice.version>5.0.1</guice.version>
<hutool.version>5.7.18</hutool.version> <hutool.version>5.7.19</hutool.version>
<commons-collections4.version>4.4</commons-collections4.version> <commons-collections4.version>4.4</commons-collections4.version>
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<!-- excel -->
<easyexcel.version>3.0.5</easyexcel.version>
<!-- database related --> <!-- database related -->
<mybatis-plus.version>3.5.0</mybatis-plus.version> <mybatis-plus.version>3.5.0</mybatis-plus.version>
<dynamic-datasource.version>3.5.0</dynamic-datasource.version> <dynamic-datasource.version>3.5.0</dynamic-datasource.version>
<druid.version>1.2.8</druid.version> <druid.version>1.2.8</druid.version>
<!-- dubbo related --> <!-- dubbo related -->
<dubbo.version>3.0.5</dubbo.version> <dubbo.version>3.0.5</dubbo.version>
<curator.version>4.2.0</curator.version> <curator.version>4.2.0</curator.version>
<zookeeper.version>3.4.14</zookeeper.version> <zookeeper.version>3.4.14</zookeeper.version>
<!-- apollo --> <!-- apollo -->
<apollo.version>1.9.2</apollo.version> <apollo.version>1.9.2</apollo.version>
<!-- aliyun --> <!-- aliyun -->
<aliyun.oss.version>3.13.2</aliyun.oss.version> <aliyun.oss.version>3.13.2</aliyun.oss.version>
<!-- logstash-logback-encoder --> <!-- logstash-logback-encoder -->
<logstash-logback-encoder.version>7.0.1</logstash-logback-encoder.version> <logstash-logback-encoder.version>7.0.1</logstash-logback-encoder.version>
<!-- xxl-job -->
<xxl-job.version>2.0.2</xxl-job.version>
<!-- maven plugins --> <!-- maven plugins -->
<flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version> <flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
...@@ -112,6 +113,11 @@ ...@@ -112,6 +113,11 @@
<artifactId>oss-spring-boot-starter</artifactId> <artifactId>oss-spring-boot-starter</artifactId>
<version>${schbrain-oss.version}</version> <version>${schbrain-oss.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.schbrain.framework</groupId>
<artifactId>xxl-job-spring-boot-starter</artifactId>
<version>${schbrain-xxl.version}</version>
</dependency>
<dependency> <dependency>
<groupId>com.schbrain.common</groupId> <groupId>com.schbrain.common</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
...@@ -155,6 +161,11 @@ ...@@ -155,6 +161,11 @@
<artifactId>fastjson</artifactId> <artifactId>fastjson</artifactId>
<version>${fastjson.version}</version> <version>${fastjson.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
<version>${easyexcel.version}</version>
</dependency>
<!-- dubbo related --> <!-- dubbo related -->
<!-- user single dependency instead of dubbo-bom,because dubbo-bom set the spring version--> <!-- user single dependency instead of dubbo-bom,because dubbo-bom set the spring version-->
<dependency> <dependency>
...@@ -241,6 +252,10 @@ ...@@ -241,6 +252,10 @@
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
</exclusion> </exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -275,6 +290,11 @@ ...@@ -275,6 +290,11 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!-- apollo --> <!-- apollo -->
<dependency> <dependency>
...@@ -305,6 +325,11 @@ ...@@ -305,6 +325,11 @@
<artifactId>logstash-logback-encoder</artifactId> <artifactId>logstash-logback-encoder</artifactId>
<version>${logstash-logback-encoder.version}</version> <version>${logstash-logback-encoder.version}</version>
</dependency> </dependency>
<dependency>
<groupId>com.xuxueli</groupId>
<artifactId>xxl-job-core</artifactId>
<version>${xxl-job.version}</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -313,6 +338,15 @@ ...@@ -313,6 +338,15 @@
<plugin> <plugin>
<groupId>pl.project13.maven</groupId> <groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId> <artifactId>git-commit-id-plugin</artifactId>
<executions>
<execution>
<id>commitInfo</id>
<phase>compile</phase>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration> <configuration>
<verbose>false</verbose> <verbose>false</verbose>
<failOnNoGitDirectory>false</failOnNoGitDirectory> <failOnNoGitDirectory>false</failOnNoGitDirectory>
...@@ -389,24 +423,15 @@ ...@@ -389,24 +423,15 @@
<id>repackage</id> <id>repackage</id>
<phase>package</phase> <phase>package</phase>
<goals> <goals>
<goal>build-info</goal>
<goal>repackage</goal> <goal>repackage</goal>
<goal>build-image</goal>
</goals> </goals>
<configuration> </execution>
<imageName>${docker.repository}/${project.parent.artifactId}:${project.parent.version}</imageName> <execution>
<cleanCache>true</cleanCache> <id>buildInfo</id>
<pullPolicy>IF_NOT_PRESENT</pullPolicy> <phase>compile</phase>
<publish>false</publish> <goals>
<docker> <goal>build-info</goal>
<publishRegistry> </goals>
<username>liwu@1890587021077463</username>
<!--suppress UnresolvedMavenProperty -->
<password><![CDATA[9H7ny!QPW@!L6@n ]]> </password>
<url>registry.cn-hangzhou.aliyuncs.com</url>
</publishRegistry>
</docker>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
...@@ -420,7 +445,6 @@ ...@@ -420,7 +445,6 @@
<id>dev</id> <id>dev</id>
<properties> <properties>
<spring.profile>dev</spring.profile> <spring.profile>dev</spring.profile>
<docker.repository>registry.cn-hangzhou.aliyuncs.com/schoolbrain</docker.repository>
</properties> </properties>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
...@@ -431,7 +455,6 @@ ...@@ -431,7 +455,6 @@
<id>test</id> <id>test</id>
<properties> <properties>
<spring.profile>test</spring.profile> <spring.profile>test</spring.profile>
<docker.repository>registry.cn-hangzhou.aliyuncs.com/schoolbrain</docker.repository>
</properties> </properties>
</profile> </profile>
<!-- 预发布环境 --> <!-- 预发布环境 -->
...@@ -439,7 +462,6 @@ ...@@ -439,7 +462,6 @@
<id>pre</id> <id>pre</id>
<properties> <properties>
<spring.profile>pre</spring.profile> <spring.profile>pre</spring.profile>
<docker.repository>registry.cn-hangzhou.aliyuncs.com/schoolbrain</docker.repository>
</properties> </properties>
</profile> </profile>
<!-- 生产环境 --> <!-- 生产环境 -->
...@@ -447,7 +469,6 @@ ...@@ -447,7 +469,6 @@
<id>prod</id> <id>prod</id>
<properties> <properties>
<spring.profile>prod</spring.profile> <spring.profile>prod</spring.profile>
<docker.repository>registry-vpc.cn-hangzhou.aliyuncs.com/schbrain</docker.repository>
</properties> </properties>
</profile> </profile>
<!-- Java8 --> <!-- Java8 -->
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment