diff --git a/app/Gdoo/User/Controllers/AuthController.php b/app/Gdoo/User/Controllers/AuthController.php index 3f828ac9..4d62e708 100644 --- a/app/Gdoo/User/Controllers/AuthController.php +++ b/app/Gdoo/User/Controllers/AuthController.php @@ -6,7 +6,7 @@ use Request; use App\Support\Totp; use App\Support\Captcha; - +use App\Support\License; use Gdoo\User\Models\UserLog; use Gdoo\User\Models\User; @@ -24,6 +24,9 @@ class AuthController extends Controller */ public function totp() { + // 关闭演示模式 + License::demoClose(); + // 时间验证密钥 $t = new Totp(); $gets = Request::all(); @@ -78,6 +81,10 @@ class AuthController extends Controller $this->ret->set('show_captcha', $this->setting['login_captcha'] <= $log->error_count); if (Request::method() == 'POST') { + + // 关闭演示模式 + License::demoClose(); + if (empty($gets['username'])) { return $this->ret->error('用户名不能为空,请重新填写。'); } @@ -169,6 +176,9 @@ class AuthController extends Controller */ public function logout() { + // 关闭演示模式 + License::demoClose(); + Auth::logout(); Session::flush(); diff --git a/app/Illuminate/Database/Query/Builder.php b/app/Illuminate/Database/Query/Builder.php index db667618..60da5549 100644 --- a/app/Illuminate/Database/Query/Builder.php +++ b/app/Illuminate/Database/Query/Builder.php @@ -18,7 +18,7 @@ class Builder extends BaseBuilder public function insert(array $values) { // 判断演示模式 - License::demoCheck($this->from); + License::demoCheck(); $values = $this->checkColumnsValues($values); @@ -40,7 +40,7 @@ class Builder extends BaseBuilder public function insertGetId(array $values, $sequence = null) { // 判断演示模式 - License::demoCheck($this->from); + License::demoCheck(); $values = $this->checkColumnsValues($values); // 空数据 @@ -60,7 +60,7 @@ class Builder extends BaseBuilder public function update(array $values) { // 判断演示模式 - License::demoCheck($this->from); + License::demoCheck(); $values = $this->checkColumnsValues($values, false); @@ -81,7 +81,7 @@ class Builder extends BaseBuilder public function delete($id = null) { // 判断演示模式 - License::demoCheck($this->from); + License::demoCheck(); return parent::delete($id); } diff --git a/app/Support/License.php b/app/Support/License.php index f6b68327..bc27e276 100644 --- a/app/Support/License.php +++ b/app/Support/License.php @@ -28,18 +28,19 @@ class License /** * 判断是否演示模式 */ - public static function demoCheck($table = null) + public static function demoCheck() { - if (env('DEMO_VERSION') == false) { + if ($_ENV['DEMO_VERSION'] == false) { return; } - - $demoDatas = ['user','system_log']; - - if (in_array($table, $demoDatas)) { - return; - } - abort_error('演示模式,不允许本操作。'); } + + /** + * 关闭演示模式检查 + */ + public static function demoClose() + { + $_ENV['DEMO_VERSION'] = false; + } }