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-26 10:26:50 +08:00
parent ec8d5b602d
commit 006dd93b8d
15 changed files with 73 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
application/admin/controller/Auth.php
View File

@ -36,6 +36,11 @@ class Auth extends Controller
* 系统权限管理
* @auth true
* @menu true
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function index()
{
@ -76,6 +81,11 @@ class Auth extends Controller
/**
* 添加系统权限
* @auth true
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function add()
{
@ -141,6 +151,8 @@ class Auth extends Controller
/**
* 删除系统权限
* @auth true
* @throws \think\Exception
* @throws \think\exception\PDOException
*/
public function remove()
{

3
application/admin/controller/Index.php
View File

@ -114,8 +114,11 @@ class Index extends Controller
* 修改用户资料
* @login true
* @param integer $id 会员ID
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function info($id = 0)
{

3
application/admin/sys.php
View File

@ -41,8 +41,11 @@ if (!function_exists('sysdata')) {
* @param string $name 数据名称
* @param mixed $value 数据内容
* @return mixed
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
function sysdata($name, $value = null)
{

5
application/service/controller/Fans.php
View File

@ -63,11 +63,6 @@ class Fans extends Controller
* 微信粉丝管理
* @auth true
* @menu true
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function index()
{

3
application/service/queue/WechatQueue.php
View File

@ -15,7 +15,6 @@
namespace app\service\queue;
use app\admin\queue\Queue;
use app\service\service\WechatService;
use app\wechat\service\FansService;
use think\console\Input;
@ -26,7 +25,7 @@ use think\Db;
* Class Jobs
* @package app\wechat
*/
class WechatQueue extends Queue
class WechatQueue
{
/**
* 当前类名

1
application/wechat/controller/Config.php
View File

@ -71,6 +71,7 @@ class Config extends Controller
* 微信支付配置
* @auth true
* @menu true
* @throws \OSS\Core\OssException
* @throws \think\Exception
* @throws \think\exception\PDOException
*/

2
application/wechat/controller/Index.php
View File

@ -42,7 +42,7 @@ class Index extends Controller
$this->totalJson = ['xs' => [], 'ys' => []];
for ($i = 5; $i >= 0; $i--) {
$time = strtotime("-{$i} months");
$where = [['subscribe_at', '<', date('Y-m-32 00:00:00', $time)]];
$where = [['subscribe_at', '<=', date('Y-m-t 23:59:59', $time)]];
$this->totalJson['xs'][] = date('Y年m月', $time);
$item = ['_0' => 0, '_1' => 0];
$list = Db::name('WechatFans')->field('count(1) count,is_black black')->where($map)->where($where)->group('is_black')->select();

3
application/wechat/queue/WechatQueue.php
View File

@ -15,7 +15,6 @@
namespace app\wechat\queue;
use app\admin\queue\Queue;
use app\wechat\service\FansService;
use app\wechat\service\WechatService;
use think\console\Input;
@ -26,7 +25,7 @@ use think\Db;
* Class Jobs
* @package app\wechat
*/
class WechatQueue extends Queue
class WechatQueue
{
/**

8
vendor/composer/installed.json vendored
View File

@ -401,12 +401,12 @@
"source": {
"type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "c76003332a6c0277186507429baca6dfea6f9d15"
"reference": "10b94d3b9dc3b0bea5e5c759b7f00a3fc057280b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/c76003332a6c0277186507429baca6dfea6f9d15",
"reference": "c76003332a6c0277186507429baca6dfea6f9d15",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/10b94d3b9dc3b0bea5e5c759b7f00a3fc057280b",
"reference": "10b94d3b9dc3b0bea5e5c759b7f00a3fc057280b",
"shasum": "",
"mirrors": [
{
@ -426,7 +426,7 @@
"qiniu/php-sdk": "^7.2",
"topthink/framework": "5.1.*"
},
"time": "2019-11-25T10:59:35+00:00",
"time": "2019-11-26T02:19:03+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {

6
vendor/zoujingli/think-library/composer.json vendored
View File

@ -22,5 +22,11 @@
"psr-4": {
"library\\": "src"
}
},
"repositories": {
"packagist": {
"type": "composer",
"url": "https://mirrors.aliyun.com/composer"
}
}
}

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

@ -238,9 +238,11 @@ abstract class Controller extends \stdClass
* @param array $where 额外更新条件
* @param array $data 表单扩展数据
* @return array|boolean
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
protected function _form($dbQuery, $tpl = '', $pkField = '', $where = [], $data = [])
{

7
vendor/zoujingli/think-library/src/Helper.php vendored
View File

@ -67,12 +67,11 @@ abstract class Helper
/**
* 实例对象反射
* @param array $args 额外参数
* @return $this
* @return static
*/
public static function instance(array $args = [])
public static function instance()
{
return Container::getInstance()->invokeClass(static::class, $args);
return Container::getInstance()->invokeClass(static::class);
}
}

30
vendor/zoujingli/think-library/src/helper/FormHelper.php vendored
View File

@ -35,13 +35,25 @@ class FormHelper extends Helper
* 数据对象主键名称
* @var string
*/
protected $pkField;
protected $field;
/**
* 数据对象主键值
* @var string
*/
protected $pkValue;
protected $value;
/**
* 模板数据
* @var array
*/
protected $data;
/**
* 模板名称
* @var string
*/
protected $template;
/**
* 逻辑器初始化
@ -51,20 +63,22 @@ class FormHelper extends Helper
* @param array $where 额外更新条件
* @param array $data 表单扩展数据
* @return array|boolean
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function init($dbQuery, $template = '', $field = '', $where = [], $data = [])
{
$this->query = $this->buildQuery($dbQuery);
list($this->template, $this->where, $this->data) = [$template, $where, $data];
$this->pkField = empty($field) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $field;;
$this->pkValue = input($this->pkField, isset($data[$this->pkField]) ? $data[$this->pkField] : null);
$this->field = empty($field) ? ($this->query->getPk() ? $this->query->getPk() : 'id') : $field;;
$this->value = input($this->field, isset($data[$this->field]) ? $data[$this->field] : null);
// GET请求, 获取数据并显示表单页面
if ($this->app->request->isGet()) {
if ($this->pkValue !== null) {
$where = [$this->pkField => $this->pkValue];
if ($this->value !== null) {
$where = [$this->field => $this->value];
$data = (array)$this->query->where($where)->where($this->where)->find();
}
$data = array_merge($data, $this->data);
@ -77,7 +91,7 @@ class FormHelper extends Helper
if ($this->app->request->isPost()) {
$data = array_merge($this->app->request->post(), $this->data);
if (false !== $this->controller->callback('_form_filter', $data, $this->where)) {
$result = data_save($this->query, $data, $this->pkField, $this->where);
$result = data_save($this->query, $data, $this->field, $this->where);
if (false !== $this->controller->callback('_form_result', $result, $data)) {
if ($result !== false) $this->controller->success('恭喜, 数据保存成功!', '');
$this->controller->error('数据保存失败, 请稍候再试!');

12
vendor/zoujingli/think-library/src/helper/QueryHelper.php vendored
View File

@ -21,8 +21,8 @@ use think\db\Query;
/**
* Class QueryHelper
* @package library\helper
* @see think\db\Query
* @mixin think\db\Query
* @see \think\db\Query
* @mixin \think\db\Query
*/
class QueryHelper extends Helper
{
@ -209,8 +209,8 @@ class QueryHelper extends Helper
/**
* 实例化分页管理器
* @param boolean $isPage 是否启用分页
* @param boolean $isDisplay 是否渲染模板
* @param boolean $page 是否启用分页
* @param boolean $display 是否渲染模板
* @param boolean $total 集合分页记录数
* @param integer $limit 集合每页记录数
* @return mixed
@ -220,8 +220,8 @@ class QueryHelper extends Helper
* @throws \think\exception\DbException
* @throws \think\exception\PDOException
*/
public function page($isPage = true, $isDisplay = true, $total = false, $limit = 0)
public function page($page = true, $display = true, $total = false, $limit = 0)
{
return PageHelper::instance()->init($this->query, $isPage, $isDisplay, $total, $limit);
return PageHelper::instance()->init($this->query, $page, $display, $total, $limit);
}
}

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

@ -40,13 +40,13 @@ class SaveHelper extends Helper
* 数据对象主键名称
* @var array|string
*/
protected $pkField;
protected $field;
/**
* 数据对象主键值
* @var string
*/
protected $pkValue;
protected $value;
/**
* 逻辑器初始化
@ -63,12 +63,12 @@ class SaveHelper extends Helper
$this->where = $where;
$this->query = $this->buildQuery($dbQuery);
$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);
$this->field = empty($field) ? $this->query->getPk() : $field;
$this->value = $this->app->request->post($this->field, null);
// 主键限制处理
if (!isset($this->where[$this->pkField]) && is_string($this->pkValue)) {
$this->query->whereIn($this->pkField, explode(',', $this->pkValue));
if (isset($this->data)) unset($this->data[$this->pkField]);
if (!isset($this->where[$this->field]) && is_string($this->value)) {
$this->query->whereIn($this->field, explode(',', $this->value));
if (isset($this->data)) unset($this->data[$this->field]);
}
// 前置回调处理
if (false === $this->controller->callback('_save_filter', $this->query, $this->data)) {