diff --git a/jeecg-boot/docker-compose-server.yml b/jeecg-boot/docker-compose-server.yml
deleted file mode 100644
index c45a6a5..0000000
--- a/jeecg-boot/docker-compose-server.yml
+++ /dev/null
@@ -1,51 +0,0 @@
-#### 镜像上传
-# 仓库私服： 81.70.17.111:5000
-# 第一步：上传镜像到docker仓库
-#docker tag jeecg-boot-mysql 81.70.17.111:5000/jeecg-boot-mysql:1.1
-#docker tag jeecg-boot-system 81.70.17.111:5000/jeecg-boot-system:1.0
-#docker tag nginxhtml:jeecgboot 81.70.17.111:5000/nginxhtml:1.2
-
-#docker push 81.70.17.111:5000/jeecg-boot-mysql:1.1
-#docker push 81.70.17.111:5000/jeecg-boot-system:1.0
-#docker push 81.70.17.111:5000/nginxhtml:1.2
-
-# 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-server.yml up
-version: '2'
-services:
- jeecg-boot-mysql:
- image: 81.70.17.111:5000/jeecg-boot-mysql:1.0
- environment:
- MYSQL_ROOT_PASSWORD: root
- restart: always
- container_name: jeecg-boot-mysql
- command:
- --character-set-server=utf8mb4
- --collation-server=utf8mb4_general_ci
- --explicit_defaults_for_timestamp=true
- --lower_case_table_names=1
- --max_allowed_packet=128M
- ports:
- - 3306:3306
-
- jeecg-boot-redis:
- image: redis:5.0
- ports:
- - 6379:6379
- restart: always
- container_name: jeecg-boot-redis
-
- jeecg-boot-system:
- image: 81.70.17.111:5000/jeecg-boot-system:1.0
- restart: always
- container_name: jeecg-boot-system
- volumes:
- - /data/config:/jeecg-boot/config
- ports:
- - 8080:8080
-
- jeecg-boot-nginx:
- image: 81.70.17.111:5000/nginxhtml
- restart: always
- container_name: jeecg-boot-nginx
- ports:
- - 80:80
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-boot-module-system/pom.xml b/jeecg-boot/jeecg-boot-module-system/pom.xml
index 6e55c8d..9b4addd 100644
--- a/jeecg-boot/jeecg-boot-module-system/pom.xml
+++ b/jeecg-boot/jeecg-boot-module-system/pom.xml
@@ -10,25 +10,6 @@
<artifactId>jeecg-boot-module-system</artifactId>
- <repositories>
- <repository>
- <id>aliyun</id>
- <name>aliyun Repository</name>
- <url>https://maven.aliyun.com/repository/public</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>jeecg</id>
- <name>jeecg Repository</name>
- <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
<dependencies>
<dependency>
<groupId>org.jeecgframework.boot</groupId>
@@ -74,32 +55,4 @@
</plugin>
</plugins>
</build>
-
- <profiles>
- <!-- SpringCloud运行环境 -->
- <profile>
- <id>SpringCloud</id>
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <!-- SpringCloud运行环境的配置，排除system模块jar里的yaml -->
- <excludes>
- <exclude>application.yml</exclude>
- <exclude>application-*.yml</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- <include>**/*.json</include>
- <include>**/*.ftl</include>
- </includes>
- </resource>
- </resources>
- </build>
- </profile>
- </profiles>
</project>
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 8ecee4c..ba46333 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -18,10 +18,10 @@
<java.version>1.8</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <!-- 微服务属性 -->
+ <!-- 微服务 -->
<skip.springboot.maven>false</skip.springboot.maven>
<spring-cloud.version>2021.0.3</spring-cloud.version>
- <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
+ <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
<alibaba.nacos.version>2.0.4</alibaba.nacos.version>
<xxl-job-core.version>2.2.0</xxl-job-core.version>
@@ -70,18 +70,6 @@
<module>jeecg-boot-module-system</module>
</modules>
- <distributionManagement>
- <repository>
- <id>jeecg</id>
- <name>jeecg Repository</name>
- <url>http://maven.jeecg.com:8090/nexus/content/repositories/jeecg</url>
- </repository>
- <snapshotRepository>
- <id>jeecg-snapshots</id>
- <name>jeecg Snapshot Repository</name>
- <url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
<repositories>
<repository>
<id>aliyun</id>
@@ -99,6 +87,17 @@
<enabled>false</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>jeecg-snapshots</id>
+ <name>jeecg-snapshots Repository</name>
+ <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<dependencies>
@@ -154,7 +153,7 @@
<!-- jeecg tools -->
<dependency>
<groupId>org.jeecgframework.boot</groupId>
- <artifactId>jeecg-boot-base-tools</artifactId>
+ <artifactId>jeecg-boot-common</artifactId>
<version>${jeecgboot.version}</version>
</dependency>
<!-- jeecg core -->
@@ -241,39 +240,7 @@
<artifactId>dom4j</artifactId>
<version>${dom4j.version}</version>
</dependency>
- <!-- redisson -->
- <dependency>
- <groupId>org.redisson</groupId>
- <artifactId>redisson</artifactId>
- <version>${redisson.version}</version>
- </dependency>
-
- <!-- guava工具类 -->
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <!-- hutool工具类-->
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-core</artifactId>
- <version>${hutool.version}</version>
- </dependency>
- <dependency>
- <groupId>cn.hutool</groupId>
- <artifactId>hutool-crypto</artifactId>
- <version>${hutool.version}</version>
- </dependency>
-
- <!-- commons-beanutils -->
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
- </dependency>
-
+ <!-- fileupload -->
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -307,7 +274,7 @@
<artifactId>okhttp</artifactId>
<version>4.4.1</version>
</dependency>
-
+ <!--minio-->
<dependency>
<groupId>io.minio</groupId>
<artifactId>minio</artifactId>
@@ -417,20 +384,8 @@
<properties>
<!--当前环境-->
<profile.name>dev</profile.name>
- <!--配置文件前缀-->
- <prefix.name>jeecg</prefix.name>
- <!--Nacos配置中心地址-->
+ <!--Nacos服务地址-->
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
- <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
- <config.namespace></config.namespace>
- <!--Nacos用户名-->
- <config.username>nacos</config.username>
- <!--Nacos密码-->
- <config.password>nacos</config.password>
- <!--Nacos配置分组名称-->
- <config.group>DEFAULT_GROUP</config.group>
- <!--Nacos服务发现地址-->
- <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
</properties>
</profile>
<!-- 测试 -->
@@ -439,42 +394,18 @@
<properties>
<!--当前环境-->
<profile.name>test</profile.name>
- <!--配置文件前缀-->
- <prefix.name>jeecg</prefix.name>
- <!--Nacos配置中心地址-->
+ <!--Nacos服务地址-->
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
- <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
- <config.namespace></config.namespace>
- <!--Nacos用户名-->
- <config.username>nacos</config.username>
- <!--Nacos密码-->
- <config.password>nacos</config.password>
- <!--Nacos配置分组名称-->
- <config.group>DEFAULT_GROUP</config.group>
- <!--Nacos服务发现地址-->
- <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
</properties>
</profile>
<!-- 生产 -->
<profile>
<id>prod</id>
<properties>
- <!--当前环境,生产环境为空-->
+ <!--当前环境-->
<profile.name>prod</profile.name>
- <!--配置文件前缀-->
- <prefix.name>jeecg</prefix.name>
- <!--Nacos配置中心地址-->
+ <!--Nacos服务地址-->
<config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
- <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
- <config.namespace></config.namespace>
- <!--Nacos用户名-->
- <config.username>nacos</config.username>
- <!--Nacos密码-->
- <config.password>nacos</config.password>
- <!--Nacos配置分组名称-->
- <config.group>DEFAULT_GROUP</config.group>
- <!--Nacos服务发现地址-->
- <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
</properties>
</profile>
<!-- SpringCloud运行环境 -->
@@ -485,8 +416,7 @@
<skip.springboot.maven>true</skip.springboot.maven>
</properties>
<modules>
- <!-- 微服务模块 -->
- <module>jeecg-boot-starter</module>
+ <!-- 微服务模块-->
<module>jeecg-cloud-module</module>
</modules>
</profile>