page_size读取不到的问题修复

2022-09-06 22:09:17 +08:00 · 2022-09-06 22:09:17 +08:00 · cb137323d8
commit cb137323d8
parent 1c95dd11ac
123 changed files with 153 additions and 147 deletions
--- a/app/adm/common.php
+++ b/app/adm/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/adm/controller/Car.php
+++ b/app/adm/controller/Car.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/adm/controller/Meeting.php
+++ b/app/adm/controller/Meeting.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/adm/controller/Seal.php
+++ b/app/adm/controller/Seal.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/adm/middleware.php
+++ b/app/adm/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/adm/validate/CarCateCheck.php
+++ b/app/adm/validate/CarCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/adm/validate/MeetingCateCheck.php
+++ b/app/adm/validate/MeetingCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/adm/validate/SealCateCheck.php
+++ b/app/adm/validate/SealCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/api/BaseController.php
+++ b/app/api/BaseController.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/api/common.php
+++ b/app/api/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 //读取文章分类列表
--- a/app/api/controller/Index.php
+++ b/app/api/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 declare (strict_types = 1);
--- a/app/api/middleware/Auth.php
+++ b/app/api/middleware/Auth.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/article/common.php
+++ b/app/article/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/article/controller/Cate.php
+++ b/app/article/controller/Cate.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/article/controller/Index.php
+++ b/app/article/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -31,7 +31,7 @@ class Index extends BaseController
            }
            $where[] = ['a.delete_time', '=', 0];
            $where[] = ['a.is_share', '=', 1];
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = ArticleList::where($where)
                ->field('a.*,a.id as id,c.title as cate_title,a.title as title,d.title as department,u.name as user')
                ->alias('a')
@ -59,7 +59,7 @@ class Index extends BaseController
            }
            $where[] = ['a.delete_time', '=', 0];
            $where[] = ['a.uid', '=', $this->uid];
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = ArticleList::where($where)
                ->field('a.*,a.id as id,c.title as cate_title,a.title as title')
                ->alias('a')
--- a/app/article/middleware.php
+++ b/app/article/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/article/model/Article.php
+++ b/app/article/model/Article.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/article/validate/ArticleCateCheck.php
+++ b/app/article/validate/ArticleCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/article/validate/ArticleCheck.php
+++ b/app/article/validate/ArticleCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/base/BaseController.php
+++ b/app/base/BaseController.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -89,12 +89,18 @@ abstract class BaseController
                $this->uid = Session::get($session_admin)['id'];
                $this->did = Session::get($session_admin)['did'];
                View::assign('login_user', $this->uid);
+				$user = Db::name('Admin')->where(['id' => $this->uid])->find();
+				$is_lock = $user['is_lock'];
+				if($is_lock==1){
+					redirect('/home/login/lock.html')->send();
+					exit;
+				}
                // 验证用户访问权限
                if (($this->module == 'api') || ($this->module == 'message') || ($this->module == 'home' && $this->controller == 'index')) {
 					return true;
 				}
 				else{
-					$reg_pwd = Db::name('Admin')->where(['id' => $this->uid])->value('reg_pwd');
+					$reg_pwd = $user['reg_pwd'];
 					if($reg_pwd!==''){
 						redirect('/home/api/edit_password.html')->send();
 						exit;
--- a/app/business/common.php
+++ b/app/business/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/business/controller/Analysis.php
+++ b/app/business/controller/Analysis.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/business/middleware.php
+++ b/app/business/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/common.php
+++ b/app/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 // 应用公共文件,内置主要的数据处理方法
--- a/app/contract/common.php
+++ b/app/contract/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/contract/controller/Api.php
+++ b/app/contract/controller/Api.php
@ -223,7 +223,7 @@ class Api extends BaseController
 			}			
 			$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',share_ids)")];
 		}
-		$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+		$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
        $list = Db::name('Customer')->field('id,name,address')->order('id asc')->where($where)->paginate($rows, false)->each(function($item, $key){
 			$contact = Db::name('CustomerContact')->where(['cid'=>$item['id'],'is_default'=>1])->find();
 			if(!empty($contact)){
--- a/app/contract/controller/Cate.php
+++ b/app/contract/controller/Cate.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/contract/controller/Index.php
+++ b/app/contract/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/contract/middleware.php
+++ b/app/contract/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/contract/model/Contract.php
+++ b/app/contract/model/Contract.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -46,7 +46,7 @@ class Contract extends Model
 	//列表检索
    public function get_list($param = [], $where = [], $whereOr=[])
    {
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
        $list = self::where($where)
            ->where(function ($query) use($whereOr) {
 					$query->whereOr($whereOr);
--- a/app/contract/model/ContractLog.php
+++ b/app/contract/model/ContractLog.php
@ -57,7 +57,7 @@ class ContractLog extends Model
        $where = [];
        $where[] = ['a.contract_id', '=', $param['contract_id']];
        $page = intval($param['page']);
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
        $content = Db::name('ContractLog')
            ->field('a.*,u.name,u.thumb')
            ->alias('a')
--- a/app/contract/validate/ContractCateCheck.php
+++ b/app/contract/validate/ContractCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/contract/validate/ContractCheck.php
+++ b/app/contract/validate/ContractCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/common.php
+++ b/app/customer/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/customer/controller/Api.php
+++ b/app/customer/controller/Api.php
@ -51,7 +51,7 @@ class Api extends BaseController
 		$where = array();
 		$where[] = ['delete_time', '=', 0];
 		$where[] = ['cid', '=', $param['customer_id']];
-		$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+		$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
 		$content = CustomerTrace::where($where)
 			->order('create_time desc')
            ->paginate($rows, false, ['query' => $param])
@ -170,7 +170,7 @@ class Api extends BaseController
 		$where = array();
 		$where[] = ['delete_time', '=', 0];
 		$where[] = ['cid', '=', $param['customer_id']];
-		$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+		$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
 		$content = CustomerChance::where($where)
 			->order('create_time desc')
            ->paginate($rows, false, ['query' => $param])
@ -289,7 +289,7 @@ class Api extends BaseController
 		$where = array();
 		$where[] = ['delete_time', '=', 0];
 		$where[] = ['cid', '=', $param['customer_id']];
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
 		$content = CustomerContact::where($where)
 			->order('create_time desc')
            ->paginate($rows, false, ['query' => $param])
--- a/app/customer/controller/Contact.php
+++ b/app/customer/controller/Contact.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -40,7 +40,7 @@ class Contact extends BaseController
 				$whereOr[] = ['', 'exp', Db::raw("FIND_IN_SET('{$uid}',c.share_ids)")];
 			}
 			
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = CustomerContact::where($where)
 				->where(function ($query) use($whereOr) {
 					$query->whereOr($whereOr);
--- a/app/customer/controller/Grade.php
+++ b/app/customer/controller/Grade.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/controller/Index.php
+++ b/app/customer/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -73,7 +73,7 @@ class Index extends BaseController
 				}
 			}
 			
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = CustomerList::where($where)
 				->where(function ($query) use($whereOr) {
 					$query->whereOr($whereOr);
@ -127,7 +127,7 @@ class Index extends BaseController
            $where[] = ['a.delete_time', '=', 0];
            $where[] = ['a.belong_uid', '=', 0];
 			
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = CustomerList::where($where)
                ->field('a.*,d.title as belong_department,g.title as grade,s.title as source,i.title as industry')
                ->alias('a')
@ -210,7 +210,7 @@ class Index extends BaseController
            $where[] = ['a.delete_time', '>', 0];
            $where[] = ['a.belong_uid', '=', 0];
 			
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = CustomerList::where($where)
                ->field('a.*,d.title as belong_department,g.title as grade,s.title as source,i.title as industry')
                ->alias('a')
--- a/app/customer/controller/Source.php
+++ b/app/customer/controller/Source.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/middleware.php
+++ b/app/customer/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/model/Customer.php
+++ b/app/customer/model/Customer.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/model/CustomerChance.php
+++ b/app/customer/model/CustomerChance.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/model/CustomerContact.php
+++ b/app/customer/model/CustomerContact.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/model/CustomerLog.php
+++ b/app/customer/model/CustomerLog.php
@ -128,7 +128,7 @@ class CustomerLog extends Model
        $where4[] = ['a.chance_id', 'in', $chance_ids];
 		
        $page = intval($param['page']);
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
        $content = Db::name('CustomerLog')
            ->field('a.*,u.name,u.thumb')
            ->alias('a')
--- a/app/customer/model/CustomerTrace.php
+++ b/app/customer/model/CustomerTrace.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/validate/CustomerCheck.php
+++ b/app/customer/validate/CustomerCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/validate/CustomerContactCheck.php
+++ b/app/customer/validate/CustomerContactCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/validate/CustomerGradeCheck.php
+++ b/app/customer/validate/CustomerGradeCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/customer/validate/CustomerSourceCheck.php
+++ b/app/customer/validate/CustomerSourceCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/finance/common.php
+++ b/app/finance/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/finance/controller/Expense.php
+++ b/app/finance/controller/Expense.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/finance/controller/Income.php
+++ b/app/finance/controller/Income.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/finance/controller/Invoice.php
+++ b/app/finance/controller/Invoice.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/finance/middleware.php
+++ b/app/finance/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/finance/model/Expense.php
+++ b/app/finance/model/Expense.php
@ -6,7 +6,7 @@ class Expense extends Model
 {
 	public function get_list($param = [],$where = [], $type='and')
    {
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
 		if($type == 'or'){
 			$expense = Expense::whereOr($where)
 				->order('id desc')
--- a/app/finance/model/Invoice.php
+++ b/app/finance/model/Invoice.php
@ -7,7 +7,7 @@ class Invoice extends Model
 	//发票列表检索
 	public function get_list($param=[],$where = [], $type='and')
    {
-		$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+		$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
 		if($type == 'or'){
 			$list = Invoice::field('i.*,a.name,d.title as department_name')
 				->alias('i')
@ -65,7 +65,7 @@ class Invoice extends Model
 	//到账列表检索
    public function income_list($param = [], $where = [])
    {
-        $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+        $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
        $list = Invoice::where($where)
            ->order('is_cash asc,create_time desc')
            ->paginate($rows, false, ['query' => $param])
--- a/app/home/common.php
+++ b/app/home/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/home/controller/Api.php
+++ b/app/home/controller/Api.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 declare (strict_types = 1);
--- a/app/home/controller/Cate.php
+++ b/app/home/controller/Cate.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/controller/Conf.php
+++ b/app/home/controller/Conf.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/controller/Database.php
+++ b/app/home/controller/Database.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/controller/Flow.php
+++ b/app/home/controller/Flow.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/controller/Index.php
+++ b/app/home/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -205,7 +205,7 @@ class Index extends BaseController
                $department_array = get_department_son($param['did']);
                $where[] = ['did', 'in', $department_array];
            }
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $admin = \app\user\model\Admin::where($where)
                ->order('id desc')
                ->paginate($rows, false, ['query' => $param])
--- a/app/home/controller/Keywords.php
+++ b/app/home/controller/Keywords.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -26,7 +26,7 @@ class Keywords extends BaseController
                $where[] = ['title', 'like', '%' . $param['keywords'] . '%'];
            }
            $where[] = ['status', '>=', 0];
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = Db::name('Keywords')
                ->order('create_time desc')
                ->where($where)
--- a/app/home/controller/Log.php
+++ b/app/home/controller/Log.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -27,7 +27,7 @@ class Log extends BaseController
            if (!empty($param['action'])) {
                $where[] = ['action','=',$param['action']];
            }
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $content = DB::name('AdminLog')
                ->field("id,uid,name,action,title,content,rule_menu,ip,param_id,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time")
                ->order('create_time desc')
--- a/app/home/controller/Module.php
+++ b/app/home/controller/Module.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/controller/Role.php
+++ b/app/home/controller/Role.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/controller/Rule.php
+++ b/app/home/controller/Rule.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/middleware.php
+++ b/app/home/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/middleware/Install.php
+++ b/app/home/middleware/Install.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/model/AdminGroup.php
+++ b/app/home/model/AdminGroup.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/model/AdminLog.php
+++ b/app/home/model/AdminLog.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/model/Keywords.php
+++ b/app/home/model/Keywords.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/ConfCheck.php
+++ b/app/home/validate/ConfCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/CostCateCheck.php
+++ b/app/home/validate/CostCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/ExpenseCateCheck.php
+++ b/app/home/validate/ExpenseCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/FlowCheck.php
+++ b/app/home/validate/FlowCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/FlowTypeCheck.php
+++ b/app/home/validate/FlowTypeCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/GroupCheck.php
+++ b/app/home/validate/GroupCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/IndustryCheck.php
+++ b/app/home/validate/IndustryCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/InvoiceSubjectCheck.php
+++ b/app/home/validate/InvoiceSubjectCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/KeywordsCheck.php
+++ b/app/home/validate/KeywordsCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/ModuleCheck.php
+++ b/app/home/validate/ModuleCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/RuleCheck.php
+++ b/app/home/validate/RuleCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/ServicesCheck.php
+++ b/app/home/validate/ServicesCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/UserCheck.php
+++ b/app/home/validate/UserCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/home/validate/WorkCateCheck.php
+++ b/app/home/validate/WorkCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/install/controller/Index.php
+++ b/app/install/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/install/validate/InstallCheck.php
+++ b/app/install/validate/InstallCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/message/common.php
+++ b/app/message/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/message/controller/Index.php
+++ b/app/message/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/message/middleware.php
+++ b/app/message/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/message/model/Message.php
+++ b/app/message/model/Message.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/middleware.php
+++ b/app/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 // 全局中间件定义文件
--- a/app/note/common.php
+++ b/app/note/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/note/controller/Index.php
+++ b/app/note/controller/Index.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -28,7 +28,7 @@ class Index extends BaseController
                $where[] = ['a.title|a.content', 'like', '%' . $param['keywords'] . '%'];
            }
            $where[] = ['a.status', '>=', 0];
-            $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+            $rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $note = NoteList::where($where)
                ->field('a.*,c.title as cate_title')
                ->alias('a')
--- a/app/note/middleware.php
+++ b/app/note/middleware.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/note/validate/NoteCateCheck.php
+++ b/app/note/validate/NoteCateCheck.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

--- a/app/oa/common.php
+++ b/app/oa/common.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */
 /**
--- a/app/oa/controller/Approve.php
+++ b/app/oa/controller/Approve.php
@ -1,7 +1,7 @@
 <?php
 /**
 * @copyright Copyright (c) 2021 勾股工作室
- * @license https://opensource.org/licenses/GPL-2.0
+ * @license https://opensource.org/licenses/GPL-3.0
 * @link https://www.gougucms.com
 */

@ -32,7 +32,7 @@ class Approve extends BaseController
 				}
            }
 			$where[] = ['admin_id','=',$this->uid];
-			$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+			$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
            $list = Db::name('Approve')
 				->field('f.*,a.name,d.title as department_name,t.title as flow_type')
 				->alias('f')
@ -72,7 +72,7 @@ class Approve extends BaseController
 			$map1[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',check_admin_ids)")];
 			$map2[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',flow_admin_ids)")];
 			
-			$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];
+			$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];
 			
 			if($status == 0){
 				$list = Db::name('Approve')
@ -153,7 +153,7 @@ class Approve extends BaseController
 			$map = [];
 			$map[] = ['check_status', '=', 2];			
 			$map[] = ['', 'exp', Db::raw("FIND_IN_SET('{$user_id}',copy_uids)")];			
-			$rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit'];			
+			$rows = empty($param['limit']) ? get_config('app.page_size') : $param['limit'];			
 			$list = Db::name('Approve')
 				->field('f.*,a.name,d.title as department_name,t.title as flow_type')
 				->alias('f')
--- a/Show More
+++ b/Show More