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 2020-07-06 13:59:18 +08:00
parent 429bc624af
commit 3f5fc57c55
7 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/admin/controller/Oplog.php
View File

@ -56,9 +56,8 @@ class Oplog extends Controller
{ {
$ip = new \Ip2Region(); $ip = new \Ip2Region();
foreach ($data as &$vo) { foreach ($data as &$vo) {
$result = $ip->btreeSearch($vo['geoip']); $isp = $ip->btreeSearch($vo['geoip']);
$vo['isp'] = isset($result['region']) ? $result['region'] : ''; $vo['isp'] = str_replace(['内网IP', '0', '|'], '', $isp['region'] ?? '');
$vo['isp'] = str_replace(['内网IP', '0', '|'], '', $vo['isp']);
} }
} }

18
composer.lock generated
View File

@ -878,16 +878,16 @@
}, },
{ {
"name": "zoujingli/ip2region", "name": "zoujingli/ip2region",
"version": "v1.0.7", "version": "v1.0.8",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ip2region.git", "url": "https://github.com/zoujingli/ip2region.git",
"reference": "f898a7d90cfacd54433de4028190c336164f2ae4" "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ip2region/zipball/f898a7d90cfacd54433de4028190c336164f2ae4", "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
"reference": "f898a7d90cfacd54433de4028190c336164f2ae4", "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -921,7 +921,7 @@
"keywords": [ "keywords": [
"Ip2Region" "Ip2Region"
], ],
"time": "2019-10-29T09:03:57+00:00" "time": "2020-07-06T05:33:26+00:00"
}, },
{ {
"name": "zoujingli/think-library", "name": "zoujingli/think-library",
@ -929,12 +929,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07" "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/25f945ee112d0177cfb75942901fdd4b3bed2f07", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
"reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07", "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -978,7 +978,7 @@
], ],
"description": "ThinkPHP v6.0 Development Library", "description": "ThinkPHP v6.0 Development Library",
"homepage": "http://framework.thinkadmin.top", "homepage": "http://framework.thinkadmin.top",
"time": "2020-07-04T11:52:45+00:00" "time": "2020-07-05T06:30:42+00:00"
}, },
{ {
"name": "zoujingli/wechat-developer", "name": "zoujingli/wechat-developer",

20
vendor/composer/installed.json vendored
View File

@ -901,17 +901,17 @@
}, },
{ {
"name": "zoujingli/ip2region", "name": "zoujingli/ip2region",
"version": "v1.0.7", "version": "v1.0.8",
"version_normalized": "1.0.7.0", "version_normalized": "1.0.8.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ip2region.git", "url": "https://github.com/zoujingli/ip2region.git",
"reference": "f898a7d90cfacd54433de4028190c336164f2ae4" "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ip2region/zipball/f898a7d90cfacd54433de4028190c336164f2ae4", "url": "https://api.github.com/repos/zoujingli/ip2region/zipball/d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
"reference": "f898a7d90cfacd54433de4028190c336164f2ae4", "reference": "d6be3ab9da1a1ab7e3cd51c4aa634a34de358ce6",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -923,7 +923,7 @@
"require": { "require": {
"php": ">=5.3" "php": ">=5.3"
}, },
"time": "2019-10-29T09:03:57+00:00", "time": "2020-07-06T05:33:26+00:00",
"type": "library", "type": "library",
"installation-source": "dist", "installation-source": "dist",
"autoload": { "autoload": {
@ -955,12 +955,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07" "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/25f945ee112d0177cfb75942901fdd4b3bed2f07", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
"reference": "25f945ee112d0177cfb75942901fdd4b3bed2f07", "reference": "ad82946e618337bcf51eeadf29c0aa72b5ecac5b",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -976,7 +976,7 @@
"ext-json": "*", "ext-json": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2020-07-04T11:52:45+00:00", "time": "2020-07-05T06:30:42+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:2020-07-05 12:36:34 // This file is automatically generated at:2020-07-06 13:55:11
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\app\\Service', 0 => 'think\\app\\Service',

BIN
vendor/zoujingli/ip2region/ip2region.db vendored
View File

Binary file not shown.

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

@ -26,7 +26,7 @@ use think\console\Output;
* Class Command * Class Command
* @package think\admin * @package think\admin
*/ */
class Command extends ThinkCommand abstract class Command extends ThinkCommand
{ {
/** /**
* 任务控制服务 * 任务控制服务

4
vendor/zoujingli/think-library/src/command/Queue.php vendored
View File

@ -233,7 +233,7 @@ class Queue extends Command
$this->output->writeln("\tYou can exit with <info>`CTRL-C`</info>"); $this->output->writeln("\tYou can exit with <info>`CTRL-C`</info>");
$this->output->writeln('============== LISTENING =============='); $this->output->writeln('============== LISTENING ==============');
while (true) { while (true) {
list($last, $where) = [microtime(true), [['status', '=', 1], ['exec_time', '<=', time()]]]; [$start, $where] = [microtime(true), [['status', '=', 1], ['exec_time', '<=', time()]]];
$this->app->db->name($this->table)->where($where)->order('exec_time asc')->chunk(100, function (Collection $result) { $this->app->db->name($this->table)->where($where)->order('exec_time asc')->chunk(100, function (Collection $result) {
foreach ($result->toArray() as $vo) try { foreach ($result->toArray() as $vo) try {
$command = $this->process->think("xadmin:queue dorun {$vo['code']} -"); $command = $this->process->think("xadmin:queue dorun {$vo['code']} -");
@ -250,7 +250,7 @@ class Queue extends Command
$this->output->error("Execution failed -> [{$vo['code']}] {$vo['title']}，{$exception->getMessage()}"); $this->output->error("Execution failed -> [{$vo['code']}] {$vo['title']}，{$exception->getMessage()}");
} }
}); });
if (microtime(true) - $last < 0.5000) { if (microtime(true) - $start < 0.5000) {
usleep(500000); usleep(500000);
} }
} }