wms / wms4_hunanhongwang · Commits

Commit 7311ffa4b468383fe228aa366a73e8867a855c47

Authored by zhangdaiscott
1 parent 0c7e2603

- 升级Spring Cloud Alibaba 2021.0.1.0，使用 spring.config.import 方式引入nacos配置

Inline Side-by-side
Showing 3 changed files with 21 additions and 189 deletions
jeecg-boot/docker-compose-server.yml deleted
View file @0c7e260
1   -#### 镜像上传
2   -# 仓库私服： 81.70.17.111:5000
3   -# 第一步：上传镜像到docker仓库
4   -#docker tag jeecg-boot-mysql 81.70.17.111:5000/jeecg-boot-mysql:1.1
5   -#docker tag jeecg-boot-system 81.70.17.111:5000/jeecg-boot-system:1.0
6   -#docker tag nginxhtml:jeecgboot 81.70.17.111:5000/nginxhtml:1.2
7   -
8   -#docker push 81.70.17.111:5000/jeecg-boot-mysql:1.1
9   -#docker push 81.70.17.111:5000/jeecg-boot-system:1.0
10   -#docker push 81.70.17.111:5000/nginxhtml:1.2
11   -
12   -# 第二步：将此yml文件上传服务器，执行启动命令 docker-compose -f ./docker-compose-server.yml up
13   -version: '2'
14   -services:
15   - jeecg-boot-mysql:
16   - image: 81.70.17.111:5000/jeecg-boot-mysql:1.0
17   - environment:
18   - MYSQL_ROOT_PASSWORD: root
19   - restart: always
20   - container_name: jeecg-boot-mysql
21   - command:
22   - --character-set-server=utf8mb4
23   - --collation-server=utf8mb4_general_ci
24   - --explicit_defaults_for_timestamp=true
25   - --lower_case_table_names=1
26   - --max_allowed_packet=128M
27   - ports:
28   - - 3306:3306
29   -
30   - jeecg-boot-redis:
31   - image: redis:5.0
32   - ports:
33   - - 6379:6379
34   - restart: always
35   - container_name: jeecg-boot-redis
36   -
37   - jeecg-boot-system:
38   - image: 81.70.17.111:5000/jeecg-boot-system:1.0
39   - restart: always
40   - container_name: jeecg-boot-system
41   - volumes:
42   - - /data/config:/jeecg-boot/config
43   - ports:
44   - - 8080:8080
45   -
46   - jeecg-boot-nginx:
47   - image: 81.70.17.111:5000/nginxhtml
48   - restart: always
49   - container_name: jeecg-boot-nginx
50   - ports:
51   - - 80:80
52 0 \ No newline at end of file
jeecg-boot/jeecg-boot-module-system/pom.xml
  View file @7311ffa
... ... @@ -10,25 +10,6 @@
10 10  
11 11 <artifactId>jeecg-boot-module-system</artifactId>
12 12  
13   - <repositories>
14   - <repository>
15   - <id>aliyun</id>
16   - <name>aliyun Repository</name>
17   - <url>https://maven.aliyun.com/repository/public</url>
18   - <snapshots>
19   - <enabled>false</enabled>
20   - </snapshots>
21   - </repository>
22   - <repository>
23   - <id>jeecg</id>
24   - <name>jeecg Repository</name>
25   - <url>https://maven.jeecg.org/nexus/content/repositories/jeecg</url>
26   - <snapshots>
27   - <enabled>false</enabled>
28   - </snapshots>
29   - </repository>
30   - </repositories>
31   -
32 13 <dependencies>
33 14 <dependency>
34 15 <groupId>org.jeecgframework.boot</groupId>
... ... @@ -74,32 +55,4 @@
74 55 </plugin>
75 56 </plugins>
76 57 </build>
77   -
78   - <profiles>
79   - <!-- SpringCloud运行环境 -->
80   - <profile>
81   - <id>SpringCloud</id>
82   - <build>
83   - <resources>
84   - <resource>
85   - <directory>src/main/resources</directory>
86   - <filtering>true</filtering>
87   - <!-- SpringCloud运行环境的配置，排除system模块jar里的yaml -->
88   - <excludes>
89   - <exclude>application.yml</exclude>
90   - <exclude>application-*.yml</exclude>
91   - </excludes>
92   - </resource>
93   - <resource>
94   - <directory>src/main/java</directory>
95   - <includes>
96   - <include>**/*.xml</include>
97   - <include>**/*.json</include>
98   - <include>**/*.ftl</include>
99   - </includes>
100   - </resource>
101   - </resources>
102   - </build>
103   - </profile>
104   - </profiles>
105 58 </project>
... ...
jeecg-boot/pom.xml
  View file @7311ffa
... ... @@ -18,10 +18,10 @@
18 18 <java.version>1.8</java.version>
19 19 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
20 20  
21   - <!-- 微服务属性 -->
  21 + <!-- 微服务 -->
22 22 <skip.springboot.maven>false</skip.springboot.maven>
23 23 <spring-cloud.version>2021.0.3</spring-cloud.version>
24   - <spring-cloud-alibaba.version>2021.1</spring-cloud-alibaba.version>
  24 + <spring-cloud-alibaba.version>2021.0.1.0</spring-cloud-alibaba.version>
25 25 <alibaba.nacos.version>2.0.4</alibaba.nacos.version>
26 26  
27 27 <xxl-job-core.version>2.2.0</xxl-job-core.version>
... ... @@ -70,18 +70,6 @@
70 70 <module>jeecg-boot-module-system</module>
71 71 </modules>
72 72  
73   - <distributionManagement>
74   - <repository>
75   - <id>jeecg</id>
76   - <name>jeecg Repository</name>
77   - <url>http://maven.jeecg.com:8090/nexus/content/repositories/jeecg</url>
78   - </repository>
79   - <snapshotRepository>
80   - <id>jeecg-snapshots</id>
81   - <name>jeecg Snapshot Repository</name>
82   - <url>http://maven.jeecg.com:8090/nexus/content/repositories/snapshots/</url>
83   - </snapshotRepository>
84   - </distributionManagement>
85 73 <repositories>
86 74 <repository>
87 75 <id>aliyun</id>
... ... @@ -99,6 +87,17 @@
99 87 <enabled>false</enabled>
100 88 </snapshots>
101 89 </repository>
  90 + <repository>
  91 + <id>jeecg-snapshots</id>
  92 + <name>jeecg-snapshots Repository</name>
  93 + <url>https://oss.sonatype.org/content/repositories/snapshots</url>
  94 + <releases>
  95 + <enabled>false</enabled>
  96 + </releases>
  97 + <snapshots>
  98 + <enabled>true</enabled>
  99 + </snapshots>
  100 + </repository>
102 101 </repositories>
103 102  
104 103 <dependencies>
... ... @@ -154,7 +153,7 @@
154 153 <!-- jeecg tools -->
155 154 <dependency>
156 155 <groupId>org.jeecgframework.boot</groupId>
157   - <artifactId>jeecg-boot-base-tools</artifactId>
  156 + <artifactId>jeecg-boot-common</artifactId>
158 157 <version>${jeecgboot.version}</version>
159 158 </dependency>
160 159 <!-- jeecg core -->
... ... @@ -241,39 +240,7 @@
241 240 <artifactId>dom4j</artifactId>
242 241 <version>${dom4j.version}</version>
243 242 </dependency>
244   - <!-- redisson -->
245   - <dependency>
246   - <groupId>org.redisson</groupId>
247   - <artifactId>redisson</artifactId>
248   - <version>${redisson.version}</version>
249   - </dependency>
250   -
251   - <!-- guava工具类 -->
252   - <dependency>
253   - <groupId>com.google.guava</groupId>
254   - <artifactId>guava</artifactId>
255   - <version>${guava.version}</version>
256   - </dependency>
257   -
258   - <!-- hutool工具类-->
259   - <dependency>
260   - <groupId>cn.hutool</groupId>
261   - <artifactId>hutool-core</artifactId>
262   - <version>${hutool.version}</version>
263   - </dependency>
264   - <dependency>
265   - <groupId>cn.hutool</groupId>
266   - <artifactId>hutool-crypto</artifactId>
267   - <version>${hutool.version}</version>
268   - </dependency>
269   -
270   - <!-- commons-beanutils -->
271   - <dependency>
272   - <groupId>commons-beanutils</groupId>
273   - <artifactId>commons-beanutils</artifactId>
274   - <version>${commons-beanutils.version}</version>
275   - </dependency>
276   -
  243 + <!-- fileupload -->
277 244 <dependency>
278 245 <groupId>commons-fileupload</groupId>
279 246 <artifactId>commons-fileupload</artifactId>
... ... @@ -307,7 +274,7 @@
307 274 <artifactId>okhttp</artifactId>
308 275 <version>4.4.1</version>
309 276 </dependency>
310   -
  277 + <!--minio-->
311 278 <dependency>
312 279 <groupId>io.minio</groupId>
313 280 <artifactId>minio</artifactId>
... ... @@ -417,20 +384,8 @@
417 384 <properties>
418 385 <!--当前环境-->
419 386 <profile.name>dev</profile.name>
420   - <!--配置文件前缀-->
421   - <prefix.name>jeecg</prefix.name>
422   - <!--Nacos配置中心地址-->
  387 + <!--Nacos服务地址-->
423 388 <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
424   - <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
425   - <config.namespace></config.namespace>
426   - <!--Nacos用户名-->
427   - <config.username>nacos</config.username>
428   - <!--Nacos密码-->
429   - <config.password>nacos</config.password>
430   - <!--Nacos配置分组名称-->
431   - <config.group>DEFAULT_GROUP</config.group>
432   - <!--Nacos服务发现地址-->
433   - <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
434 389 </properties>
435 390 </profile>
436 391 <!-- 测试 -->
... ... @@ -439,42 +394,18 @@
439 394 <properties>
440 395 <!--当前环境-->
441 396 <profile.name>test</profile.name>
442   - <!--配置文件前缀-->
443   - <prefix.name>jeecg</prefix.name>
444   - <!--Nacos配置中心地址-->
  397 + <!--Nacos服务地址-->
445 398 <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
446   - <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
447   - <config.namespace></config.namespace>
448   - <!--Nacos用户名-->
449   - <config.username>nacos</config.username>
450   - <!--Nacos密码-->
451   - <config.password>nacos</config.password>
452   - <!--Nacos配置分组名称-->
453   - <config.group>DEFAULT_GROUP</config.group>
454   - <!--Nacos服务发现地址-->
455   - <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
456 399 </properties>
457 400 </profile>
458 401 <!-- 生产 -->
459 402 <profile>
460 403 <id>prod</id>
461 404 <properties>
462   - <!--当前环境,生产环境为空-->
  405 + <!--当前环境-->
463 406 <profile.name>prod</profile.name>
464   - <!--配置文件前缀-->
465   - <prefix.name>jeecg</prefix.name>
466   - <!--Nacos配置中心地址-->
  407 + <!--Nacos服务地址-->
467 408 <config.server-addr>jeecg-boot-nacos:8848</config.server-addr>
468   - <!--Nacos配置中心命名空间,用于支持多环境.这里必须使用ID，不能使用名称,默认为空-->
469   - <config.namespace></config.namespace>
470   - <!--Nacos用户名-->
471   - <config.username>nacos</config.username>
472   - <!--Nacos密码-->
473   - <config.password>nacos</config.password>
474   - <!--Nacos配置分组名称-->
475   - <config.group>DEFAULT_GROUP</config.group>
476   - <!--Nacos服务发现地址-->
477   - <discovery.server-addr>jeecg-boot-nacos:8848</discovery.server-addr>
478 409 </properties>
479 410 </profile>
480 411 <!-- SpringCloud运行环境 -->
... ... @@ -485,8 +416,7 @@
485 416 <skip.springboot.maven>true</skip.springboot.maven>
486 417 </properties>
487 418 <modules>
488   - <!-- 微服务模块 -->
489   - <module>jeecg-boot-starter</module>
  419 + <!-- 微服务模块-->
490 420 <module>jeecg-cloud-module</module>
491 421 </modules>
492 422 </profile>
... ...