From 7a5cf0b58d1cde869918b4e4d1cd7443322ea034 Mon Sep 17 00:00:00 2001
From: XanderYe <XanderYe@outlook.com>
Date: Fri, 28 Jan 2022 10:20:30 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=94=B9dp2=E6=8C=81?=
 =?UTF-8?q?=E4=B9=85=E5=8C=96=E8=B7=AF=E5=BE=84=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dnf-server/README.md            | 6 ++++++
 dnf-server/docker-entrypoint.sh | 4 +++-
 dnf-server/init/init.sh         | 5 +++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/dnf-server/README.md b/dnf-server/README.md
index 73dd77c..3e5f801 100644
--- a/dnf-server/README.md
+++ b/dnf-server/README.md
@@ -12,6 +12,12 @@
 
 详见[docker-compose.yml](docker-compose.yml)
 
+## DP2插件说明
+
+持久化 ./data/dp2/ ，映射到容器中 /dp2/ <br/>
+df_game_r.lua 中编写插件，调用到脚本就将脚本放入 script 中。<br/>
+容器集成了 mysql 客户端，脚本中需要执行sql命令时，命令为 `mysql -h127.0.0.1 -ugame -p$GAME_PASSWORD`。
+
 ## 环境变量
 
 AUTO_MYSQL_IP: 和dnfmysql使用统一自定义网桥使用，支持自动获取mysql的ip
diff --git a/dnf-server/docker-entrypoint.sh b/dnf-server/docker-entrypoint.sh
index a6a2458..1d93f29 100644
--- a/dnf-server/docker-entrypoint.sh
+++ b/dnf-server/docker-entrypoint.sh
@@ -100,8 +100,10 @@ rm -rf /home/template/root-tmp
 cp /data/privatekey.pem /root/
 # 构建配置文件软链[不能使用硬链接, 硬链接不可跨设备]
 ln -s /data/Config.ini /root/Config.ini
+
 # dp2脚本
-cp /data/df_game_r.lua /dp2/df_game_r.lua
+cp -rf /data/dp2/* /dp2/
+
 # 替换Config.ini中的GM用户名、密码、连接KEY、登录器版本[这里操作的对象是一个软链接不需要指定-type]
 sed -i --follow-symlinks "6c IP=$MYSQL_IP" `find /root -name "*.ini"`
 sed -i --follow-symlinks "7c Password=$GAME_PASSWORD" `find /root -name "*.ini"`
diff --git a/dnf-server/init/init.sh b/dnf-server/init/init.sh
index 0dfdb96..c115891 100644
--- a/dnf-server/init/init.sh
+++ b/dnf-server/init/init.sh
@@ -51,9 +51,10 @@ else
 fi
 
 # 判断Config.ini文件是否初始化过
-if [ ! -f "/data/df_game_r.lua" ];then
+if [ ! -d "/data/dp2" ];then
   # 拷贝版本文件到持久化目录
-  cp /home/template/init/df_game_r.lua /data/
+  mkdir -p /data/dp2/
+  cp /home/template/init/df_game_r.lua /data/dp2/
   echo "init df_game_r.lua success"
 else
   echo "df_game_r.lua has already initialized, do nothing!"