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-21 18:09:32 +08:00
parent 5369596cdd
commit 3560e1cc14
13 changed files with 115 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/admin/sys.php
View File

@ -1,54 +0,0 @@
<?php
// +----------------------------------------------------------------------
// | ThinkAdmin
// +----------------------------------------------------------------------
// | 版权所有 2014~2019 广州楚才信息科技有限公司 [ http://www.cuci.cc ]
// +----------------------------------------------------------------------
// | 官方网站: http://demo.thinkadmin.top
// +----------------------------------------------------------------------
// | 开源协议 ( https://mit-license.org )
// +----------------------------------------------------------------------
// | gitee 代码仓库：https://gitee.com/zoujingli/ThinkAdmin
// | github 代码仓库：https://github.com/zoujingli/ThinkAdmin
// +----------------------------------------------------------------------
if (!function_exists('sysdata')) {
/**
* JSON 数据读取与存储
* @param string $name 数据名称
* @param array|null $value 数据内容
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
function sysdata($name, array $value = null)
{
if (is_null($value)) {
$data = json_decode(app()->db->name('SystemData')->where(['name' => $name])->value('value'), true);
return empty($data) ? [] : $data;
} else {
return data_save('SystemData', ['name' => $name, 'value' => json_encode($value, JSON_UNESCAPED_UNICODE)], 'name');
}
}
}
if (!function_exists('sysoplog')) {
/**
* 写入系统日志
* @param string $action 日志行为
* @param string $content 日志内容
* @return boolean
*/
function sysoplog($action, $content)
{
$app = app();
return $app->db->name('SystemOplog')->insert([
'node' => \think\admin\service\NodeService::instance()->getCurrent(),
'geoip' => $app->request->isCli() ? '127.0.0.1' : $app->request->ip(),
'action' => $action, 'content' => $content,
'username' => $app->request->isCli() ? 'cli' : $app->session->get('user.username', ''),
]);
}
}

8
composer.lock generated
View File

@ -699,12 +699,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "a8aec7398659c885312a59aff4b4eca1c9c48697"
"reference": "35a0122215949195abc4754f461f502052fe7bc3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a8aec7398659c885312a59aff4b4eca1c9c48697",
"reference": "a8aec7398659c885312a59aff4b4eca1c9c48697",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/35a0122215949195abc4754f461f502052fe7bc3",
"reference": "35a0122215949195abc4754f461f502052fe7bc3",
"shasum": ""
},
"require": {
@ -742,7 +742,7 @@
],
"description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top",
"time": "2019-11-21T03:18:49+00:00"
"time": "2019-11-21T06:31:36+00:00"
}
],
"packages-dev": [],

2
vendor/composer/autoload_classmap.php vendored
View File

@ -146,8 +146,8 @@ return array(
'think\\admin\\Storage' => $vendorDir . '/zoujingli/think-library/src/Storage.php',
'think\\admin\\command\\Install' => $vendorDir . '/zoujingli/think-library/src/command/Install.php',
'think\\admin\\extend\\CodeExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CodeExtend.php',
'think\\admin\\extend\\CsvExtend' => $vendorDir . '/zoujingli/think-library/src/extend/CsvExtend.php',
'think\\admin\\extend\\DataExtend' => $vendorDir . '/zoujingli/think-library/src/extend/DataExtend.php',
'think\\admin\\extend\\ExcelExtend' => $vendorDir . '/zoujingli/think-library/src/extend/ExcelExtend.php',
'think\\admin\\extend\\HttpExtend' => $vendorDir . '/zoujingli/think-library/src/extend/HttpExtend.php',
'think\\admin\\helper\\DeleteHelper' => $vendorDir . '/zoujingli/think-library/src/helper/DeleteHelper.php',
'think\\admin\\helper\\FormHelper' => $vendorDir . '/zoujingli/think-library/src/helper/FormHelper.php',

2
vendor/composer/autoload_static.php vendored
View File

@ -237,8 +237,8 @@ class ComposerStaticInit41e48da7c236026fbb8265abc69af9d9
'think\\admin\\Storage' => __DIR__ . '/..' . '/zoujingli/think-library/src/Storage.php',
'think\\admin\\command\\Install' => __DIR__ . '/..' . '/zoujingli/think-library/src/command/Install.php',
'think\\admin\\extend\\CodeExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CodeExtend.php',
'think\\admin\\extend\\CsvExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/CsvExtend.php',
'think\\admin\\extend\\DataExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/DataExtend.php',
'think\\admin\\extend\\ExcelExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/ExcelExtend.php',
'think\\admin\\extend\\HttpExtend' => __DIR__ . '/..' . '/zoujingli/think-library/src/extend/HttpExtend.php',
'think\\admin\\helper\\DeleteHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/DeleteHelper.php',
'think\\admin\\helper\\FormHelper' => __DIR__ . '/..' . '/zoujingli/think-library/src/helper/FormHelper.php',

8
vendor/composer/installed.json vendored
View File

@ -721,12 +721,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "a8aec7398659c885312a59aff4b4eca1c9c48697"
"reference": "35a0122215949195abc4754f461f502052fe7bc3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/a8aec7398659c885312a59aff4b4eca1c9c48697",
"reference": "a8aec7398659c885312a59aff4b4eca1c9c48697",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/35a0122215949195abc4754f461f502052fe7bc3",
"reference": "35a0122215949195abc4754f461f502052fe7bc3",
"shasum": ""
},
"require": {
@ -736,7 +736,7 @@
"ext-json": "*",
"topthink/framework": "^6.0"
},
"time": "2019-11-21T03:18:49+00:00",
"time": "2019-11-21T06:31:36+00:00",
"type": "library",
"extra": {
"think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php
// This file is automatically generated at:2019-11-21 11:41:04
// This file is automatically generated at:2019-11-21 18:03:55
declare (strict_types = 1);
return array (
0 => 'think\\app\\Service',

5
vendor/zoujingli/think-library/src/command/Install.php vendored
View File

@ -78,12 +78,11 @@ class Install extends Command
if (empty($this->name)) {
$this->output->error('在线安装的模块名称不能为空！');
} else {
if (isset($this->bind[$this->name])) {
$this->rules = empty($this->bind[$this->name]['rules']) ? [] : $this->bind[$this->name]['rules'];
$this->ignore = empty($this->bind[$this->name]['ignore']) ? [] : $this->bind[$this->name]['ignore'];
$this->installFile();
$this->installDatabase();
$this->installData();
} else {
$this->output->error("指定模块 {$this->name} 未配置安装规则！");
}
@ -108,7 +107,7 @@ class Install extends Command
}
}
protected function installDatabase()
protected function installData()
{
}

44
vendor/zoujingli/think-library/src/common.php vendored
View File

@ -23,14 +23,12 @@ if (!function_exists('p')) {
/**
* 打印输出数据到文件
* @param mixed $data 输出的数据
* @param boolean $replace 强制替换
* @param string|null $file 文件名称
* @param boolean $new 强制替换文件
* @param string $file 保存文件名称
*/
function p($data, $replace = false, $file = null)
function p($data, $new = false, $file = null)
{
if (is_null($file)) $file = 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;
$replace ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND);
SystemService::instance()->putDebug($data, $new, $file);
}
}
@ -67,6 +65,40 @@ if (!function_exists('sysconf')) {
}
}
if (!function_exists('sysdata')) {
/**
* JSON 数据读取与存储
* @param string $name 数据名称
* @param mixed $value 数据内容
* @return mixed
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
function sysdata($name, $value = null)
{
if (is_null($value)) {
return SystemService::instance()->get($name);
} else {
return SystemService::instance()->set($name, $value);
}
}
}
if (!function_exists('sysoplog')) {
/**
* 写入系统日志
* @param string $action 日志行为
* @param string $content 日志内容
* @return boolean
*/
function sysoplog($action, $content)
{
return SystemService::instance()->setOplog($action, $content);
}
}
if (!function_exists('systoken')) {
/**
* 生成 CSRF-TOKEN 参数

4
vendor/zoujingli/think-library/src/extend/CsvExtend.php → vendor/zoujingli/think-library/src/extend/ExcelExtend.php vendored
View File

@ -17,10 +17,10 @@ namespace think\admin\extend;
/**
* 转出CSV文件扩展
* Class CsvExtend
* Class ExcelExtend
* @package think\admin\extend
*/
class CsvExtend
class ExcelExtend
{
/**

8
vendor/zoujingli/think-library/src/extend/HttpExtend.php vendored
View File

@ -125,8 +125,10 @@ class HttpExtend
*/
private static function getUserAgent()
{
if (!empty($_SERVER['HTTP_USER_AGENT'])) return $_SERVER['HTTP_USER_AGENT'];
$userAgents = [
if (!empty($_SERVER['HTTP_USER_AGENT'])) {
return $_SERVER['HTTP_USER_AGENT'];
}
$agents = [
"Mozilla/5.0 (Windows NT 6.1; rv:2.0.1) Gecko/20100101 Firefox/4.0.1",
"Mozilla/5.0 (Windows NT 6.1) AppleWebKit/536.11 (KHTML, like Gecko) Chrome/20.0.1132.57 Safari/536.11",
"Mozilla/5.0 (Windows NT 10.0; WOW64; rv:38.0) Gecko/20100101 Firefox/38.0",
@ -137,6 +139,6 @@ class HttpExtend
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.6; rv:2.0.1) Gecko/20100101 Firefox/4.0.1",
"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_7_0) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.56 Safari/535.11",
];
return $userAgents[array_rand($userAgents, 1)];
return $agents[array_rand($agents, 1)];
}
}

2
vendor/zoujingli/think-library/src/helper/SaveHelper.php vendored
View File

@ -62,8 +62,8 @@ class SaveHelper extends Helper
{
$this->where = $where;
$this->query = $this->buildQuery($dbQuery);
$this->pkField = empty($field) ? $this->query->getPk() : $field;
$this->data = empty($data) ? $this->app->request->post() : $data;
$this->pkField = empty($field) ? $this->query->getPk() : $field;
$this->pkValue = $this->app->request->post($this->pkField, null);
// 主键限制处理
if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) {

2
vendor/zoujingli/think-library/src/queue/StopQueue.php vendored
View File

@ -49,7 +49,7 @@ class StopQueue extends Command
$output->writeln("没有需要结束的任务进程哦！");
} else foreach ($result as $item) {
$process->close($item['pid']);
$output->writeln("发送结束任务进程{$item['pid']}指令成功！");
$output->writeln("发送结束进程{$item['pid']}信号成功！");
}
}
}

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

@ -121,4 +121,59 @@ class SystemService extends Service
return [$type, $field, strtolower($outer)];
}
/**
* 保存数据内容
* @param string $name
* @param array $value
* @return boolean
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
*/
public function setData($name, $value)
{
$data = ['name' => $name, 'value' => json_encode($value, 256)];
return $this->save('SystemData', $data, 'name');
}
/**
* 读取数据内容
* @param string $name
* @return mixed
*/
public function getData($name)
{
$value = $this->app->db->name('SystemData')->where(['name' => $name])->value('value');
return empty($value) ? '' : json_encode($value, true);
}
/**
* 写入系统日志
* @param string $action
* @param string $content
* @return integer
*/
public function setOplog($action, $content)
{
return $this->app->db->name('SystemOplog')->insert([
'node' => NodeService::instance()->getCurrent(),
'action' => $action, 'content' => $content,
'geoip' => $this->app->request->isCli() ? '127.0.0.1' : $this->app->request->ip(),
'username' => $this->app->request->isCli() ? 'cli' : $this->app->session->get('user.username', ''),
]);
}
/**
* 打印输出数据到文件
* @param mixed $data 输出的数据
* @param boolean $new 强制替换文件
* @param string|null $file 文件名称
*/
public function putDebug($data, $new = false, $file = null)
{
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;
$new ? file_put_contents($file, $str) : file_put_contents($file, $str, FILE_APPEND);
}
}