blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

ComposerUpdate

Browse Source
This commit is contained in:
Anyon 2019-11-29 10:18:22 +08:00
parent 4d6860663b
commit 7dd1b66583
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
composer.lock generated
View File

@ -783,12 +783,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "8d5bb74a4956debf5a37fa1e04d81723910cb889" "reference": "ba4fe10a27cff9fb5bbd2a4673e0c65fb3040e62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/8d5bb74a4956debf5a37fa1e04d81723910cb889", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ba4fe10a27cff9fb5bbd2a4673e0c65fb3040e62",
"reference": "8d5bb74a4956debf5a37fa1e04d81723910cb889", "reference": "ba4fe10a27cff9fb5bbd2a4673e0c65fb3040e62",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -832,7 +832,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2019-11-28T09:07:59+00:00" "time": "2019-11-29T01:31:35+00:00"
} }
], ],
"packages-dev": [], "packages-dev": [],

8
vendor/composer/installed.json vendored
View File

@ -805,12 +805,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "ceaf13318bc180c168f3a993018d5bf634848a0a" "reference": "ba4fe10a27cff9fb5bbd2a4673e0c65fb3040e62"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ceaf13318bc180c168f3a993018d5bf634848a0a", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ba4fe10a27cff9fb5bbd2a4673e0c65fb3040e62",
"reference": "ceaf13318bc180c168f3a993018d5bf634848a0a", "reference": "ba4fe10a27cff9fb5bbd2a4673e0c65fb3040e62",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -826,7 +826,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2019-11-28T10:18:05+00:00", "time": "2019-11-29T01:31:35+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2019-11-28 18:21:02 // This file is automatically generated at:2019-11-29 10:17:52
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

2
vendor/zoujingli/think-library/src/service/AdminService.php vendored
View File

@ -96,7 +96,7 @@ class AdminService extends Service
if (($uid = $this->app->session->get('user.id'))) { if (($uid = $this->app->session->get('user.id'))) {
$user = $this->app->db->name('SystemUser')->where(['id' => $uid])->find(); $user = $this->app->db->name('SystemUser')->where(['id' => $uid])->find();
if (($aids = $user['authorize'])) { if (($aids = $user['authorize'])) {
$where = [['status', 'eq', '1'], ['id', 'in', explode(',', $aids)]]; $where = [['status', '=', '1'], ['id', 'in', explode(',', $aids)]];
$subsql = $this->app->db->name('SystemAuth')->field('id')->where($where)->buildSql(); $subsql = $this->app->db->name('SystemAuth')->field('id')->where($where)->buildSql();
$user['nodes'] = array_unique($this->app->db->name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node')); $user['nodes'] = array_unique($this->app->db->name('SystemAuthNode')->whereRaw("auth in {$subsql}")->column('node'));
$this->app->session->set('user', $user); $this->app->session->set('user', $user);

2
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -177,7 +177,7 @@ class SystemService extends Service
public function putDebug($data, $new = false, $file = null) public function putDebug($data, $new = false, $file = null)
{ {
if (is_null($file)) $file = $this->app->getRuntimePath() . date('Ymd') . '.txt'; if (is_null($file)) $file = $this->app->getRuntimePath() . date('Ymd') . '.txt';
$str = (is_string($data) ? $data : (is_array($data) || is_object($data)) ? print_r($data, true) : var_export($data, true)) . PHP_EOL; $str = (is_string($data) ? $data : ((is_array($data) || is_object($data)) ? print_r($data, true) : var_export($data, true))) . PHP_EOL;
$new ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND); $new ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND);
} }