diff --git a/app/Http/Controllers/TestsController.php b/app/Http/Controllers/TestsController.php index 8549e25..b3d96b6 100755 --- a/app/Http/Controllers/TestsController.php +++ b/app/Http/Controllers/TestsController.php @@ -12,7 +12,9 @@ class TestsController public function hello() { + $s = $_ENV["APP_NAME"]; echo "is ok !"; + echo "\n\n{$s}" } public function hook($sHostName = 'ssssss') diff --git a/just/env b/just/env index c07e4d5..b3a0b18 100644 --- a/just/env +++ b/just/env @@ -4,23 +4,23 @@ www_master = master.diaodu.us is_loc = false -api_url_freenode_base = https://v2rayclashfree.com -api_url_jichang_base = https://fuuuu.cloud +api_url_freenode_base = https://clashfreenode.com +api_url_jichang_base = https://fuuu.cloud github_url_base = git@github.com -BASE_DIR = /www/wwwroot/github-2.diaodu.us/ +BASE_DIR = /www/wwwroot/github-5.diaodu.us/ telegram_token = 7838947958:AAGFNHcKWCJDvj3JBrS58PO3QW65X5h01ng telegram_chatid = -4605806556 -APP_NAME=github-1 +APP_NAME=github-5 APP_ENV=local APP_KEY=base64:pboCUmKSUHIPvRgkPZhs37Vlk/x8kPUD9EtqfKdPaqQ= APP_DEBUG=true APP_TIMEZONE=Asia/Shanghai -APP_URL=https://github-2.diaodu.us -APP_WWW=github-2.diaodu.us +APP_URL=https://github-5.diaodu.us +APP_WWW=github-5.diaodu.us APP_LOCALE=en APP_FALLBACK_LOCALE=en @@ -42,7 +42,7 @@ DB_CONNECTION=mariadb DB_HOST=127.0.0.1 DB_PORT=3306 DB_DATABASE=github -DB_USERNAME=github +DB_USERNAME=hotdog DB_PASSWORD=hotshotgg SESSION_DRIVER=database diff --git a/just/tom无脑流程.text b/just/tom无脑流程.text index 8bf1a5e..9db1f78 100644 --- a/just/tom无脑流程.text +++ b/just/tom无脑流程.text @@ -19,8 +19,8 @@ ssh目录 ssh安装 sudo apt update && sudo apt install openssh-client && - ssh-keygen -t rsa -b 4096 -C "xibanyahu@outlook.com" - 提示生成地址写 /var/www/.ssh/id_rsa_xibanyahu + ssh-keygen -t rsa -b 4096 -C "clashfreenodecom@proton.me" + 提示生成地址写 /var/www/.ssh/id_rsa_clashfreenodecom (邮箱不要后缀) 别忘了权限 @@ -38,7 +38,7 @@ www创建 项目文件 git clone https://gitea.diaodu.us/tom/github - mv github github-sg01.diaodu.us + mv github github-5.diaodu.us cd进去 mkdir github chmod -R 755 * @@ -51,32 +51,34 @@ www创建 数据库 - 直接连招 mysql 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'; + CREATE USER 'hotdog'@'localhost'; + GRANT ALL PRIVILEGES ON github.* TO 'hotdog'@'localhost' IDENTIFIED BY 'hotshotgg'; FLUSH PRIVILEGES; 数据库导入 just里有sql,导入 - mysql -ugithub -p github < github.sql + mysql -uhotdog -p github < github.sql 导出的话:mysqldump -uroot -p --no-data github > github.sql nginx配置 vim /etc/nginx/nginx.conf 用户改为www-data 添加nginx域名配置(.conf后缀别忘了)(下面有nginx配置,复制就行) - vim /etc/nginx/conf.d/github-sg01.diaodu.us.conf + vim /etc/nginx/conf.d/github-5.diaodu.us.conf systemctl restart nginx 安装证书 - sudo apt update - sudo apt install -y snapd - sudo snap install --classic certbot - sudo ln -s /snap/bin/certbot /usr/bin/certbot + sudo apt update && + sudo apt install -y snapd && + sudo snap install --classic certbot && + sudo ln -s /snap/bin/certbot /usr/bin/certbot && sudo certbot --nginx + systemctl restart nginx -测试:https://github-sg01.diaodu.us/test/hello +测试:https://github-5.diaodu.us/test/hello 去tg上配置他 - /hub#list + github-6 -- /hub#list + 先在dove里添加github-6的dove tg测试 测试 /test#cron__id 1 @@ -123,9 +125,9 @@ server { listen 80; listen [::]:80; - root /www/wwwroot/github-sg01.diaodu.us/public; + root /www/wwwroot/github-5.diaodu.us/public; index index.php; - server_name github-sg01.diaodu.us; + server_name github-5.diaodu.us; location / { try_files $uri /index.php$is_args$args;