diff --git a/docker/run.sh b/docker/run.sh index 5a250ba..66cd005 100644 --- a/docker/run.sh +++ b/docker/run.sh @@ -1,16 +1,16 @@ #!/bin/bash -# # 将代码中的nginx复制到nginx配置文件中 -# cp /var/www/html/docker/nginx.conf /etc/nginx/sites-available/default -# ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default +# 将代码中的nginx复制到nginx配置文件中 +cp /var/www/html/docker/nginx.conf /etc/nginx/sites-available/default +ln -s /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default -# # 将代码中的php配置文件复制到php配置文件中 -# cp /var/www/html/docker/phprun.ini /usr/local/etc/php/conf.d +# 将代码中的php配置文件复制到php配置文件中 +cp /var/www/html/docker/phprun.ini /usr/local/etc/php/conf.d -# # 运行redis -# nohup redis-server --requirepass "" & -# # 运行定时任务 -# nohup php /var/www/html/think timer --local & +# 运行redis +nohup redis-server --requirepass "" & +# 运行定时任务 +nohup php /var/www/html/think timer --local --quit & # 输出参数 echo "参数为:$@" diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php index f547545..21091aa 100644 --- a/extend/base/common/command/admin/VersionBase.php +++ b/extend/base/common/command/admin/VersionBase.php @@ -12,14 +12,12 @@ use think\console\Output; class VersionBase extends Command { - public const VERSION = 'v2.0.94'; + public const VERSION = 'v2.0.95'; public const LAYUI_VERSION = '2.8.17'; public const COMMENT = [ - '新增docker用法和说明', - '优化timer指定本地地址', - '修复重置密码命令错误', + '修正docker的run.sh', '发布新版本', ];