From ea6d096f177c01cfe885ed23c86820c6a9445205 Mon Sep 17 00:00:00 2001 From: taoser Date: Fri, 19 Mar 2021 17:21:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BA=94=E7=94=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/Upgrade.php | 5 +++-- config/taoler.php | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/Upgrade.php b/app/admin/controller/Upgrade.php index cc92bb4..c670548 100644 --- a/app/admin/controller/Upgrade.php +++ b/app/admin/controller/Upgrade.php @@ -36,6 +36,7 @@ class Upgrade extends AdminController public function __construct() { $this->sys_version = Config::get('taoler.version'); + $this->pn = Config::get('taoler.appname'); $this->sys = Db::name('system')->where('id',1)->find(); } @@ -94,7 +95,7 @@ class Upgrade extends AdminController //升级前的版本检测 public function check() { - $url = $this->sys['upcheck_url'].'?ver='.$this->sys_version; + $url = $this->sys['upcheck_url'].'?pn='.$this->pn.'&ver='.$this->sys_version; $versions = Api::urlGet($url); //判断服务器状态 @@ -136,7 +137,7 @@ class Upgrade extends AdminController */ public function upload() { - $url = $this->sys['upgrade_url'].'?url='.$this->sys['domain'].'&key='.$this->sys['key'].'&ver='.$this->sys_version; + $url = $this->sys['upgrade_url'].'?url='.$this->sys['domain'].'&key='.$this->sys['key'].'&pn='.$this->pn.'&ver='.$this->sys_version; $versions = Api::urlGet($url); Log::channel('update')->info('update:{type} {progress} {msg}',['type'=>'check','progress'=>'0%','msg'=>'===>升级检测开始===>']); //判断服务器状态 diff --git a/config/taoler.php b/config/taoler.php index d74a58a..acf2d9f 100644 --- a/config/taoler.php +++ b/config/taoler.php @@ -4,8 +4,10 @@ // +---------------------------------------------------------------------- return [ + //应用名,此项不可更改 + 'appname' => 'TaoLer', //版本配置 - 'version' => '1.6.10', + 'version' => '1.7.1', //加盐 'salt' => 'taoler', //数据库备份目录