diff --git a/app/Services/Github/Github.php b/app/Services/Github/Github.php index ba2d226..eab4307 100644 --- a/app/Services/Github/Github.php +++ b/app/Services/Github/Github.php @@ -42,7 +42,7 @@ class Github { $aShip["youhui_str"] = "购买套餐时输入【".$aArticle['sale_code']."】优惠码,可享".$aArticle['sale_rate']."折优惠,折后低至8元/月。"; - if ($aShip["huodong"]["str"]) { + if (isset($aShip["huodong"]["str"]) && !empty($aShip["huodong"]["str"])) { $aShip["youhui_str"] .= " ".$aShip["huodong"]["str"]; diff --git a/just/tom无脑流程.text b/just/tom无脑流程.text index a833f55..7a1c71b 100644 --- a/just/tom无脑流程.text +++ b/just/tom无脑流程.text @@ -1,5 +1,5 @@ -#无脑按顺序执行 +===========无脑按顺序执行=============== 安装环境先 @@ -21,7 +21,7 @@ mv github github-x.diaodu.us cd进去 -chmod -R 777 # 第一遍需要777权限 +chmod -R 777 # 第一遍需要777权限(未必,先不用他) chmod -R 755 * # 然后改成这个 chown -R www-data:www-data * @@ -29,7 +29,7 @@ mkdir github chmod -R 777 github -just里取出env,配置一下 +just里取出env,配置一下(github,hotshotgg) /etc/nginx/nginx.conf 用户改为www-data @@ -40,30 +40,46 @@ FLUSH PRIVILEGES; just里有sql,导入 +mysql -u -p github < github.sql + +添加nginx域名配置(.conf后缀别忘了) +systemctl restart nginx + +测试:https://github-x.diaodu.us/test/hello + +去tg上配置他 +测试 /test#cron__i 11 + +==========执行结束================== +==========安装证书流程============== + +sudo apt update +sudo apt install snapd + +sudo snap install --classic certbot + +sudo ln -s /snap/bin/certbot /usr/bin/certbot + +sudo certbot --nginx + +==========安装证书流程结束============= -CREATE DATABASE github CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; -CREATE USER 'github'@'localhost'; -GRANT ALL PRIVILEGES ON github.* TO 'github'@'localhost' IDENTIFIED BY 'hotshotgg'; -FLUSH PRIVILEGES; - - -chmod -R 755 * -chown -R www-data:www-data * +========nginx配置================ server { listen 80; listen [::]:80; - root /www/wwwroot/github-x.diaodu.us/public; + root /www/wwwroot/github-2.diaodu.us/public; index index.php; - server_name github-x.diaodu.us; + server_name github-2.diaodu.us; location / { try_files $uri /index.php$is_args$args; @@ -80,3 +96,5 @@ server { fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; } } + +========nginx配置结束============= diff --git a/routes/web.php b/routes/web.php index e6f9b34..4ce5af9 100755 --- a/routes/web.php +++ b/routes/web.php @@ -9,7 +9,7 @@ use App\Http\Controllers\Api\TG\HookController; Route::get('/cron', [CronController::class, 'index']); -Route::get('/tests/hello', [TestsController::class, 'hello']); +Route::get('/test/hello', [TestsController::class, 'hello']); Route::get('/tests/hook', [TestsController::class, 'hook']);