From bbf728b5e6a85af68d776462cefd20da424f30f5 Mon Sep 17 00:00:00 2001 From: T2cc <5152438+gtguizhou@user.noreply.gitee.com> Date: Fri, 18 Jun 2021 14:51:08 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20User=20=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E9=99=84=E5=8A=A0=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E6=97=B6=E5=AF=BC=E8=87=B4=E6=8E=A5=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E7=9A=84=20BUG=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/model/User.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/application/admin/model/User.php b/application/admin/model/User.php index 822c81b1..483557af 100644 --- a/application/admin/model/User.php +++ b/application/admin/model/User.php @@ -68,21 +68,22 @@ class User extends Model return ['normal' => __('Normal'), 'hidden' => __('Hidden')]; } + public function getPrevtimeTextAttr($value, $data) { - $value = $value ? $value : $data['prevtime']; + $value = $value ? $value : $data['prevtime'] ?? ""; return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; } public function getLogintimeTextAttr($value, $data) { - $value = $value ? $value : $data['logintime']; + $value = $value ? $value : $data['logintime'] ?? ""; return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; } public function getJointimeTextAttr($value, $data) { - $value = $value ? $value : $data['jointime']; + $value = $value ? $value : $data['jointime'] ?? ""; return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; } From ab53e00a759f4312227b699dfa42da4b7d5d3e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AF=9B=E5=BF=83?= Date: Wed, 8 Sep 2021 20:12:57 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfieldlist=E5=9C=A8?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=80=BC=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E7=BB=91=E5=AE=9Afa.event.refreshfieldlist?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/js/require-form.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js index df7abd32..111db677 100755 --- a/public/assets/js/require-form.js +++ b/public/assets/js/require-form.js @@ -358,9 +358,6 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio placeHolderTemplate: $("<" + tagName + "/>") }); var textarea = $("textarea[name='" + $(this).data("name") + "']", form); - if (textarea.val() == '') { - return true; - } var template = $(this).data("template"); textarea.on("fa.event.refreshfieldlist", function () { $("[fieldlist-item]", container).remove(); From c12f9bca844a748522713823cfeac7614e4b7997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=A1=E5=AE=85=E7=94=B7?= <530765310@qq.com> Date: Sun, 26 Sep 2021 02:02:26 +0000 Subject: [PATCH 3/6] =?UTF-8?q?update=20application/common/library/Upload.?= =?UTF-8?q?php.=20=E5=A4=9A=E4=BD=99=E7=B1=BB=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/common/library/Upload.php | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/application/common/library/Upload.php b/application/common/library/Upload.php index bbc2446c..d4735d2e 100644 --- a/application/common/library/Upload.php +++ b/application/common/library/Upload.php @@ -15,19 +15,6 @@ use think\Hook; */ class Upload { - - /** - * 验证码有效时长 - * @var int - */ - protected static $expire = 120; - - /** - * 最大允许检测的次数 - * @var int - */ - protected static $maxCheckNums = 10; - protected $merging = false; protected $chunkDir = null; From db69a36d283543353e722ff492b37d43c67c6be6 Mon Sep 17 00:00:00 2001 From: lscho Date: Fri, 15 Oct 2021 08:05:06 +0000 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=9F=8E=E5=B8=82?= =?UTF-8?q?=E5=B1=82=E7=BA=A7=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Install/fastadmin.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index 775e2027..0769e0c9 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -63,7 +63,7 @@ CREATE TABLE `fa_area` ( `shortname` varchar(100) DEFAULT NULL COMMENT '简称', `name` varchar(100) DEFAULT NULL COMMENT '名称', `mergename` varchar(255) DEFAULT NULL COMMENT '全称', - `level` tinyint(4) DEFAULT NULL COMMENT '层级 0 1 2 省市区县', + `level` tinyint(4) DEFAULT NULL COMMENT '层级:1=省,2=市,3=区/县', `pinyin` varchar(100) DEFAULT NULL COMMENT '拼音', `code` varchar(100) DEFAULT NULL COMMENT '长途区号', `zip` varchar(100) DEFAULT NULL COMMENT '邮编', From 48066342da4ff83da8657511e28efea4e459c82a Mon Sep 17 00:00:00 2001 From: simon429 <1095568674@qq.com> Date: Tue, 26 Oct 2021 16:31:38 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8DCRUD=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=8B=EF=BC=8C=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E7=94=9F=E6=88=90=E7=9A=84=E8=A2=AB?= =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E6=A8=A1=E5=9E=8Bnamespace=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Crud.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index c707aff9..3a7b70ed 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -26,7 +26,7 @@ class Crud extends Command * 受保护的系统表, crud不会生效 */ protected $systemTables = [ - 'admin', 'admin_log', 'auth_group', 'auth_group_access', 'auth_rule', + 'admin', 'admin_log', 'auth_group', 'auth_group_access', 'auth_rule', 'attachment', 'config', 'category', 'ems', 'sms', 'user', 'user_group', 'user_rule', 'user_score_log', 'user_token', ]; @@ -214,12 +214,12 @@ class Crud extends Command $force = $input->getOption('force'); //是否为本地model,为0时表示为全局model将会把model放在app/common/model中 $local = $input->getOption('local'); - + if (!$table) { throw new Exception('table name can\'t empty'); } - - + + //是否生成菜单 $menu = $input->getOption("menu"); //关联表 @@ -963,7 +963,7 @@ class Crud extends Command if ($relations) { foreach ($relations as $i => $relation) { - $relation['modelNamespace'] = $data['modelNamespace']; + $relation['modelNamespace'] = $relation['relationNamespace']; if (!is_file($relation['relationFile'])) { // 生成关联模型文件 $this->writeToFile('relationmodel', $relation, $relation['relationFile']); From a7b7b772fdbdfabb5120a367c280a5279e608f66 Mon Sep 17 00:00:00 2001 From: F4nniu Date: Thu, 11 Nov 2021 18:46:59 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=A0=E9=99=A4=20public=20=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E4=B8=8B=E6=97=A0=E7=94=A8=E7=9A=84=20router.php?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/router.php | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100755 public/router.php diff --git a/public/router.php b/public/router.php deleted file mode 100755 index 6ba1fabf..00000000 --- a/public/router.php +++ /dev/null @@ -1,17 +0,0 @@ - -// +---------------------------------------------------------------------- -// $Id$ - -if (is_file($_SERVER["DOCUMENT_ROOT"] . $_SERVER["REQUEST_URI"])) { - return false; -} else { - require __DIR__ . "/index.php"; -}