diff --git a/.gitignore b/.gitignore
index 4df77e62ce8160c095a853210a637192bc3e8224..467a5430a7c909d7167fbefb2dc0e328f4f80274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,3 @@ logs/
Thumbs.db
*.class
-
diff --git a/README.md b/README.md
index ce435a39ab300c62ea15c7c937ae92a3a3634150..ab3157259a15e34da4f17c6e29432f73d1342ac5 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
-
+
@@ -31,11 +31,14 @@
* 维多多培训考试系统:[https://www.mindskip.net/wdd.html](https://www.mindskip.net/wdd.html)
* 思多多智能考试系统:[https://www.mindskip.net/sdd.html](https://www.mindskip.net/sdd.html)
-### 学之思交流群(加群获取数据库脚本)
+### 文档视频教程
-* QQ交流群16:`556522923`
+* 数据库脚本下载地址:[https://www.mindskip.net:999](https://www.mindskip.net:999)
+* 文档教程:[https://www.mindskip.net:999](https://www.mindskip.net:999)
+* 视频教程:[https://ke.qq.com/course/3614230](https://ke.qq.com/course/3614230)
+* QQ交流群17:`624825080`
* 商务QQ:`2732007709`
-* 商务微信:`mind_skip`
+* 商务微信:`whmindskip`
* 商务邮箱:`mindskip@qq.com`
### 学之思仓库版本地址
@@ -45,10 +48,7 @@
* github - postgresql :[https://github.com/mindskip/xzs](https://github.com/mindskip/xzs)
* github - mysql :[https://github.com/mindskip/xzs-mysql](https://github.com/mindskip/xzs-mysql)
-### 开发部署教程
-* 文档教程:[https://www.mindskip.net:999](https://www.mindskip.net:999)
-* 视频教程:[https://ke.qq.com/course/3614230](https://ke.qq.com/course/3614230)
### 学生系统功能
@@ -111,24 +111,24 @@
* 学生考试系统
* 小程序考试系统
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
-  |
-  |
-  |
-  |
+  |
+  |
+  |
+  |
@@ -136,7 +136,7 @@
\ No newline at end of file
diff --git a/docker/README.md b/docker/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..204708505b7819cc488a8cad5a8189b8cfbee8f7
--- /dev/null
+++ b/docker/README.md
@@ -0,0 +1,30 @@
+### 6.3 docker部署
+
+* 打开网站,找到docker目录,里面有已配置好的文件
+* 下载sql脚本,下载教程,然后解压sql压缩包,找到xzs-mysql.sql文件,编辑此文件,在文件开头加如下代码:
+
+```xzs-mysql
+CREATE DATABASE `xzs` CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci;
+USE xzs;
+```
+
+* sql文件改好后,将文件移动到 docker/sql 目录下
+* 将整个docker目录中的文件,复制到/usr/local/xzs下面
+* 进入到install目录,执行下面命令,安装docker-compose
+
+```docker-compose
+cd /usr/local/xzs/install
+mv docker-compose-linux-x86_64 /usr/local/bin/docker-compose
+chmod +x /usr/local/bin/docker-compose
+docker-compose --version
+```
+
+* 执行下面命令,启动学之思网站,有问题可以看下/usr/local/xzs/log中的日志
+
+```docker-xzs
+cd /usr/local/xzs
+docker-compose up -d
+```
+
+* 学生端访问地址为:
+* 管理员端访问地址为:
\ No newline at end of file
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
new file mode 100644
index 0000000000000000000000000000000000000000..55572a4ca653320e26f6b73daa973e6d1e660010
--- /dev/null
+++ b/docker/docker-compose.yml
@@ -0,0 +1,27 @@
+version: '3.9'
+services:
+ mysql:
+ image: registry.cn-hangzhou.aliyuncs.com/mindskip/mysql:8.0.33
+ restart: always
+ ports:
+ - 127.0.0.1:3306:3306
+ privileged: true
+ container_name: xzs-mysql
+ environment:
+ MYSQL_ROOT_PASSWORD: "123456"
+ TZ: "Asia/Shanghai"
+ volumes:
+ - "./sql:/docker-entrypoint-initdb.d/"
+ java:
+ image: registry.cn-hangzhou.aliyuncs.com/mindskip/java:1.8.0
+ container_name: xzs-java
+ privileged: true
+ network_mode: host
+ restart: always
+ command:
+ /bin/bash -c "java -Duser.timezone=Asia/Shanghai -jar -Dspring.profiles.active=prod /usr/local/xzs/release/xzs-3.9.0.jar"
+ ports:
+ - 8000:8000
+ volumes:
+ - "./release:/usr/local/xzs/release/"
+ - "./log:/usr/log/xzs/"
\ No newline at end of file
diff --git a/docker/install/docker-compose-linux-x86_64 b/docker/install/docker-compose-linux-x86_64
new file mode 100644
index 0000000000000000000000000000000000000000..51e985b84846333a3ac9baa7ce5a2e76e6dde432
Binary files /dev/null and b/docker/install/docker-compose-linux-x86_64 differ
diff --git a/source/xzs/target/xzs-3.8.0.jar b/docker/release/xzs-3.9.0.jar
similarity index 97%
rename from source/xzs/target/xzs-3.8.0.jar
rename to docker/release/xzs-3.9.0.jar
index 87141607a3bcd4c4302edb0b6a1fd1a23ca61506..033402de2934c9b28b55a15663311b11b0fd842f 100644
Binary files a/source/xzs/target/xzs-3.8.0.jar and b/docker/release/xzs-3.9.0.jar differ
diff --git a/docs/404.html b/docs/404.html
index a023124ad09685a6b4d8966fe6805a2db12d8dbb..22229ec055e5e24bdad5d7a60d39fd95b806e47b 100644
--- a/docs/404.html
+++ b/docs/404.html
@@ -3,13 +3,31 @@
-
- 学之思教程
-
-
+
+
+
+ | 学之思教程
+
+
-
-
+
+