no message
This commit is contained in:
hellcat
parent
e3b6a17b1a
commit
537c9d9af4
@ -24,7 +24,6 @@ class Article extends Base {
|
||||
}
|
||||
|
||||
return $aTmp;
|
||||
// $this->oHttp::response(200, 'ok');
|
||||
}
|
||||
|
||||
public function Find($aParam)
|
||||
@ -36,7 +35,6 @@ class Article extends Base {
|
||||
unset($aSingle['updated_at']);
|
||||
unset($aSingle['created_at']);
|
||||
|
||||
// return json_encode($aSingle, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
|
||||
return $this->toJson($aSingle);
|
||||
}
|
||||
|
||||
@ -56,13 +54,11 @@ class Article extends Base {
|
||||
foreach ($aArticleList as &$row) { // 使用引用来修改原数组
|
||||
unset($row['updated_at']); // 移除 updated_at 字段
|
||||
unset($row['created_at']); // 移除 created_at 字段
|
||||
// $this->oTGHttp->sendToTG(json_encode($row, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||
$aTmp[] = $this->toJson($row);
|
||||
}
|
||||
}
|
||||
|
||||
return $aTmp;
|
||||
// $this->oHttp::response(200, 'ok');
|
||||
}
|
||||
|
||||
public function Clone($aParam)
|
||||
@ -106,10 +102,6 @@ class Article extends Base {
|
||||
|
||||
return $r;
|
||||
|
||||
// $this->oTGHttp->sendToTG(json_encode($r, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||
|
||||
// $this->oHttp::response(200, 'ok');
|
||||
|
||||
}
|
||||
|
||||
public function Del($aParams)
|
||||
@ -125,10 +117,6 @@ class Article extends Base {
|
||||
|
||||
return $r;
|
||||
|
||||
// $this->oTGHttp->sendToTG(json_encode($r, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||
|
||||
// $this->oHttp::response(200, 'ok');
|
||||
|
||||
}
|
||||
|
||||
// /ArticleSet__id__user_name xxx
|
||||
@ -149,11 +137,8 @@ class Article extends Base {
|
||||
throw new \Exception("Article not found");
|
||||
}
|
||||
|
||||
return $r;
|
||||
return $article;
|
||||
|
||||
// $this->oTGHttp->sendToTG(json_encode($r, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT));
|
||||
|
||||
// $this->oHttp::response(200, 'ok');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -1,13 +1,15 @@
|
||||
path_ssh = /var/www/.ssh
|
||||
|
||||
www_master = master.diaodu.us
|
||||
|
||||
is_loc = false
|
||||
|
||||
api_url_freenode_base = https://clashfreenode.com
|
||||
api_url_freenode_base = https://v2rayclashfree.com
|
||||
api_url_jichang_base = https://fuuuu.cloud
|
||||
|
||||
github_url_base = git@github.com
|
||||
|
||||
BASE_DIR = /www/wwwroot/github-1.diaodu.us/
|
||||
BASE_DIR = /www/wwwroot/github-2.diaodu.us/
|
||||
|
||||
telegram_token = 7838947958:AAGFNHcKWCJDvj3JBrS58PO3QW65X5h01ng
|
||||
telegram_chatid = -4605806556
|
||||
@ -17,8 +19,8 @@ APP_ENV=local
|
||||
APP_KEY=base64:pboCUmKSUHIPvRgkPZhs37Vlk/x8kPUD9EtqfKdPaqQ=
|
||||
APP_DEBUG=true
|
||||
APP_TIMEZONE=Asia/Shanghai
|
||||
APP_URL=https://github-1.diaodu.us
|
||||
APP_WWW=github-1.diaodu.us
|
||||
APP_URL=https://github-2.diaodu.us
|
||||
APP_WWW=github-2.diaodu.us
|
||||
|
||||
APP_LOCALE=en
|
||||
APP_FALLBACK_LOCALE=en
|
||||
@ -40,8 +42,8 @@ DB_CONNECTION=mariadb
|
||||
DB_HOST=127.0.0.1
|
||||
DB_PORT=3306
|
||||
DB_DATABASE=github
|
||||
DB_USERNAME=
|
||||
DB_PASSWORD=
|
||||
DB_USERNAME=github
|
||||
DB_PASSWORD=hotshotgg
|
||||
|
||||
SESSION_DRIVER=database
|
||||
SESSION_LIFETIME=120
|
||||
@ -1,9 +1,12 @@
|
||||
|
||||
===========无脑按顺序执行===============
|
||||
|
||||
安装环境先
|
||||
安装环境先 https://nextpanel.dev/docs/installation/debian
|
||||
|
||||
mkdir /var/www/.ssh
|
||||
chown -R www-data:www-data /var/www/.ssh
|
||||
chmod 700 /var/www/.ssh
|
||||
chmod 600 /var/www/.ssh/\*
|
||||
|
||||
sudo apt update
|
||||
sudo apt install openssh-client
|
||||
@ -21,8 +24,7 @@ mv github github-x.diaodu.us
|
||||
|
||||
cd进去
|
||||
|
||||
chmod -R 777 # 第一遍需要777权限（未必，先不用他）
|
||||
chmod -R 755 * # 然后改成这个
|
||||
chmod -R 755 *
|
||||
chown -R www-data:www-data *
|
||||
|
||||
mkdir github
|
||||
@ -48,12 +50,16 @@ systemctl restart nginx
|
||||
测试：https://github-x.diaodu.us/test/hello
|
||||
|
||||
去tg上配置他
|
||||
测试 /test#cron__i 11
|
||||
|
||||
==========执行结束==================
|
||||
|
||||
测试 %test#cron__rand 1
|
||||
到SSH config updated successfully.
|
||||
到git push -u origin main错误，就基本ok了，到linux上提交确认kownhost
|
||||
|
||||
sudo -u www-data git add .
|
||||
sudo -u www-data git push -u origin main
|
||||
提交成功就ok,通了
|
||||
|
||||
最后挂上cron：* * * * * curl -s https://github-2.diaodu.us/cron > /dev/null
|
||||
别忘了把inday_count调到正常
|
||||
|
||||
==========安装证书流程==============
|
||||
|
||||
@ -66,11 +72,6 @@ sudo ln -s /snap/bin/certbot /usr/bin/certbot
|
||||
|
||||
sudo certbot --nginx
|
||||
|
||||
==========安装证书流程结束=============
|
||||
|
||||
|
||||
|
||||
|
||||
========nginx配置================
|
||||
|
||||
server {
|
||||
@ -97,4 +98,8 @@ server {
|
||||
}
|
||||
}
|
||||
|
||||
========nginx配置结束=============
|
||||
=========杂货===========
|
||||
|
||||
git config --global --add safe.directory /www/wwwroot/github-2.diaodu.us
|
||||
|
||||
可一次运行可能需要777权限
|
||||
|
||||
Loading…
Reference in New Issue
Block a user