diff --git a/jeecg-boot/README.md b/jeecg-boot/README.md
index fdc47e81..ae620bf5 100644
--- a/jeecg-boot/README.md
+++ b/jeecg-boot/README.md
@@ -46,6 +46,44 @@ Jeecg-Boot 低代码开发平台
- QQ交流群 : ⑤860162132、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)
+## Docker镜像用法
+
+
+文档: http://doc.jeecg.com/2043889
+
+ ```
+注意: 如果本地安装了mysql和redis,启动容器前先停掉本地服务,不然会端口冲突。
+ net stop redis
+ net stop mysql
+
+ # 1.配置host
+
+ # jeecgboot
+ 127.0.0.1 jeecg-boot-redis
+ 127.0.0.1 jeecg-boot-mysql
+ 127.0.0.1 jeecg-boot-system
+
+# 2.修改application-dev.yml文件的数据库和redis链接
+ 修改数据库连接和redis连接,将连接改成host方式
+
+
+# 3.进jeecg-boot根路径 maven打包
+ mvn clean package
+
+
+# 4.启动镜像组
+ docker-compose up -d
+
+
+# 5.访问后台项目(等待2分钟左右后)
+ http://localhost:8080/jeecg-boot/doc.html
+```
+
+其他: 重新构建镜像组(当你改变本地代码,也可重新构建镜像)
+ docker-compose build
+
+
+
## 专项文档
#### 一、查询过滤器用法
@@ -158,38 +196,3 @@ code: {
```
-## docker镜像用法
- 文档: http://doc.jeecg.com/2043889
-
- ```
-注意: 如果本地安装了mysql和redis,启动容器前先停掉本地服务,不然会端口冲突。
- net stop redis
- net stop mysql
-
- # 1.配置host
-
- # jeecgboot
- 127.0.0.1 jeecg-boot-redis
- 127.0.0.1 jeecg-boot-mysql
- 127.0.0.1 jeecg-boot-system
-
-# 2.修改项目配置文件 application.yml
- active: dev
-
-# 3.修改application-dev.yml文件的数据库和redis链接
- 修改数据库连接和redis连接,将连接改成host方式
-
-# 4.先进JAVA项目jeecg-boot根路径 maven打包
- mvn clean package
-
-
-# 5.构建镜像__容器组(当你改变本地代码,也可重新构建镜像)
- docker-compose build
-
-
-# 6.启动镜像__容器组(也可取代运行中的镜像)
- docker-compose up -d
-
-# 7.访问后台项目(注意要开启swagger)
- http://localhost:8080/jeecg-boot/doc.html
-```
\ No newline at end of file
diff --git a/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml b/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml
index 587fd364..b2682017 100644
--- a/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml
+++ b/jeecg-boot/jeecg-cloud-module/docker-compose-base.yml
@@ -17,7 +17,7 @@ services:
--max_allowed_packet=128M
--default-authentication-plugin=caching_sha2_password
ports:
- - 3305:3306
+ - 3306:3306
jeecg-boot-redis:
image: redis:5.0
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
index f8f44595..a82925f1 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/pom.xml
@@ -5,6 +5,7 @@
jeecg-cloud-nacos
jeecg-cloud-nacos
nacos启动模块
+ 3.3.0
diff --git a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application.yml b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application.yml
index 4327b4df..74cceb2f 100644
--- a/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application.yml
+++ b/jeecg-boot/jeecg-cloud-module/jeecg-cloud-nacos/src/main/resources/application.yml
@@ -14,7 +14,7 @@ db:
password:
'0': ${MYSQL-PWD:root}
url:
- '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos-os}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
+ '0': jdbc:mysql://${MYSQL-HOST:jeecg-boot-mysql}:${MYSQL-PORT:3306}/${MYSQL-DB:nacos}?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=UTC&allowPublicKeyRetrieval=true
user:
'0': ${MYSQL-USER:root}
management: