From df258a89eb5a0351bd12ee96896d5ee75e7d676a Mon Sep 17 00:00:00 2001 From: Soul Dark <1012179378@qq.com> Date: Tue, 17 Jul 2018 11:40:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=E3=80=82=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E5=91=BD=E4=BB=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Command/XCat.php | 9 ++++++++- app/Utils/Update.php | 2 +- resources/views/material/user/shop.tpl | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Command/XCat.php b/app/Command/XCat.php index cbaebd6a..ad8c68b9 100644 --- a/app/Command/XCat.php +++ b/app/Command/XCat.php @@ -86,6 +86,8 @@ class XCat case("resetAllPort"): return $this->resetAllPort(); case("migrateConfig"): + return $this->migrateConfig(); + case("update"): return Update::update(); default: return $this->defaultAction(); @@ -104,7 +106,7 @@ class XCat echo(" initdownload - 下载 SSR 程序至服务器".PHP_EOL); echo(" initQQWry - 下载 IP 解析库".PHP_EOL); echo(" resetTraffic - 重置所有用户流量".PHP_EOL); - echo(" migrateConfig - 将配置迁移至新配置".PHP_EOL); + echo(" update - 更新并迁移配置".PHP_EOL); } public function resetPort() @@ -137,6 +139,11 @@ class XCat } } + public function migrateConfig() + { + echo("此命令已过时,请使用update命令。".PHP_EOL); + } + public function cleanRelayRule() { $rules = Relay::all(); diff --git a/app/Utils/Update.php b/app/Utils/Update.php index d51f29a6..e63b79a6 100644 --- a/app/Utils/Update.php +++ b/app/Utils/Update.php @@ -32,7 +32,7 @@ class Update //执行版本升级 $version_old=0; - if(isset(Config::get('version')){ + if(isset(Config::get('version'))){ $version_old=Config::get('version'); } Update::old_to_new($version_old); diff --git a/resources/views/material/user/shop.tpl b/resources/views/material/user/shop.tpl index 5c56d4dc..74383634 100644 --- a/resources/views/material/user/shop.tpl +++ b/resources/views/material/user/shop.tpl @@ -24,7 +24,7 @@

商品不可叠加,新购商品会覆盖旧商品的效果

-

当前余额:{$user->money} 元

+

当前余额:{$user->money} 元