From bf6c4590ee058f4e64434d4deee6d14f3dd99573 Mon Sep 17 00:00:00 2001
From: "AriFe.Liu" <88468560@qq.com>
Date: Mon, 27 Jun 2022 03:27:27 +0000
Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=99=84=E4=BB=B6?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E5=9B=A0=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?id=E5=AF=BC=E8=87=B4=E6=97=A0=E6=B3=95=E5=93=8D=E5=BA=94?=
=?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84bug=20=E8=AF=A5=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=E6=9B=BE=E5=AF=BC=E8=87=B4=E9=99=84=E4=BB=B6=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=9C=A8=E6=B2=A1=E6=9C=89=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?ID=E6=97=B6=E9=80=A0=E6=88=90=E6=97=A0=E6=B3=95=E6=AD=A3?=
=?UTF-8?q?=E5=B8=B8=E5=93=8D=E5=BA=94=E5=9B=9E=E8=B0=83=E4=BA=8B=E4=BB=B6?=
=?UTF-8?q?=20=E5=AE=98=E6=96=B9=E6=96=87=E6=A1=A3:=20https://doc.fastadmi?=
=?UTF-8?q?n.net/doc/183.html=20=E9=99=84=E4=BB=B6=E9=80=89=E6=8B=A9=20?=
=?UTF-8?q?=E4=B8=AD,=20=E7=A4=BA=E4=BE=8B=E5=8F=8A=E6=96=87=E6=A1=A3?=
=?UTF-8?q?=E5=9D=87=E6=9C=AA=E6=8F=90=E5=8F=8A=E6=B7=BB=E5=8A=A0=E4=BA=86?=
=?UTF-8?q?faselect=E7=9A=84=E7=BB=84=E4=BB=B6=E5=BF=85=E9=A1=BB=E6=B7=BB?=
=?UTF-8?q?=E5=8A=A0id=20=E5=A6=82=E9=9D=9Ebug=E8=80=8C=E6=9C=89=E6=84=8F?=
=?UTF-8?q?=E4=B8=BA=E4=B9=8B,=20=E8=AF=B7=E4=BF=AE=E6=94=B9=E5=AE=98?=
=?UTF-8?q?=E6=96=B9=E6=96=87=E6=A1=A3=E8=AF=B4=E6=98=8E,=20=E5=91=8A?=
=?UTF-8?q?=E7=9F=A5=E7=94=A8=E6=88=B7=E6=B7=BB=E5=8A=A0=E4=BA=86faselect?=
=?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE=E5=BF=85=E9=A1=BB=E5=90=8C=E6=97=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0ID=E6=89=8D=E8=83=BD=E6=AD=A3=E7=A1=AE?=
=?UTF-8?q?=E5=A4=84=E7=90=86=E5=9B=9E=E8=B0=83.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/js/require-form.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 20e2a392..94a4ecf8 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -256,7 +256,7 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
var url = $(this).data("url") ? $(this).data("url") : (typeof Backend !== 'undefined' ? "general/attachment/select" : "user/attachment");
parent.Fast.api.open(url + "?element_id=" + $(this).attr("id") + "&multiple=" + multiple + "&mimetype=" + mimetype + "&admin_id=" + admin_id + "&user_id=" + user_id, __('Choose'), {
callback: function (data) {
- var button = $("#" + $(that).attr("id"));
+ var button = $(that);
var maxcount = $(button).data("maxcount");
var input_id = $(button).data("input-id") ? $(button).data("input-id") : "";
maxcount = typeof maxcount !== "undefined" ? maxcount : 0;
From 34e4c6c1e5245bc93ed957b7e23b60b0cefa51bc Mon Sep 17 00:00:00 2001
From: "AriFe.Liu" <88468560@qq.com>
Date: Sat, 13 Aug 2022 03:46:36 +0000
Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Diframe=E6=89=93?=
=?UTF-8?q?=E5=BC=80=E7=AA=97=E5=8F=A3=E6=97=B6=E9=93=BE=E6=8E=A5=E5=86=85?=
=?UTF-8?q?=E9=97=AE=E5=8F=B7=E9=87=8D=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
=?UTF-8?q?=20=E5=A6=82=E6=9E=9C=E5=9C=A8=E6=B7=BB=E5=8A=A0=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E6=97=B6,=20=E5=9C=A8=E8=A7=84=E5=88=99=E6=88=96URL?=
=?UTF-8?q?=E4=B8=AD=E8=BF=BD=E5=8A=A0=E4=BA=86=20=3F=20,=20=E5=88=99?=
=?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=9C=A8=E5=88=B7=E6=96=B0=E8=BF=99?=
=?UTF-8?q?=E4=B8=AA=E6=A0=87=E7=AD=BE=E9=A1=B5=E6=97=B6,=20=E8=AF=B7?=
=?UTF-8?q?=E6=B1=82=E9=93=BE=E6=8E=A5=E4=B8=AD=E4=BD=BF=E7=94=A8=E4=BA=86?=
=?UTF-8?q?=E4=B8=A4=E4=B8=AA=E9=97=AE=E5=8F=B7=E5=AF=BC=E8=87=B4=E5=8F=82?=
=?UTF-8?q?=E6=95=B0=E5=8F=96=E5=87=BA=E9=94=99=E8=AF=AF,=20=E6=AD=A4?=
=?UTF-8?q?=E5=A4=84=E5=8E=9F=E6=9C=AC=E8=BF=BD=E5=8A=A0=E7=9A=84=3Faddtab?=
=?UTF-8?q?s=3D1=E6=9C=AA=E5=81=9A=E5=88=A4=E6=96=AD.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: AriFe.Liu <88468560@qq.com>
---
application/admin/view/index/index.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/admin/view/index/index.html b/application/admin/view/index/index.html
index 0fd259a1..8faf4001 100644
--- a/application/admin/view/index/index.html
+++ b/application/admin/view/index/index.html
@@ -28,12 +28,12 @@
{if $fixedmenu}
{/if}
{if $referermenu}
{/if}
From fb5972dd2cb8e6baef3dae3b3524609ce647cd37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=8F=E9=A9=AC?= <179906767@qq.com>
Date: Fri, 9 Sep 2022 03:23:40 +0000
Subject: [PATCH 03/13] =?UTF-8?q?update=20application/admin/command/Crud.p?=
=?UTF-8?q?hp.=20=E9=97=AE=E9=A2=98=EF=BC=9A=E5=88=A0=E9=99=A4=E6=A8=A1?=
=?UTF-8?q?=E5=BC=8F=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E5=BC=BA=E5=88=B6?=
=?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=95=B0=E6=8D=AE=E8=A1=A8=EF=BC=8C=E5=A6=82?=
=?UTF-8?q?=E6=9E=9C=E5=9C=A8=E5=88=A0=E9=99=A4=E5=89=8D=E5=B7=B2=E6=89=8B?=
=?UTF-8?q?=E5=8A=A8=E5=88=A0=E9=99=A4=E6=95=B0=E6=8D=AE=E8=A1=A8=EF=BC=8C?=
=?UTF-8?q?=E5=B0=86=E6=8A=9B=E5=87=BA=E5=BC=82=E5=B8=B8=E2=80=9Ctable=20n?=
=?UTF-8?q?ot=20found=E2=80=9D=E5=AF=BC=E8=87=B4=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复：增加删除模式判断，如果是删除模式，无需读取数据表
Signed-off-by: 苏小马 <179906767@qq.com>
---
application/admin/command/Crud.php | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 390cb953..f41d951d 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -435,16 +435,19 @@ class Crud extends Command
$modelName = $table = stripos($table, $prefix) === 0 ? substr($table, strlen($prefix)) : $table;
$modelTableType = 'table';
$modelTableTypeName = $modelTableName = $modelName;
- $modelTableInfo = $dbconnect->query("SHOW TABLE STATUS LIKE '{$modelTableName}'", [], true);
- if (!$modelTableInfo) {
- $modelTableType = 'name';
- $modelTableName = $prefix . $modelName;
+ $modelTableInfo = null;
+ if (!$input->getOption('delete')) {
$modelTableInfo = $dbconnect->query("SHOW TABLE STATUS LIKE '{$modelTableName}'", [], true);
if (!$modelTableInfo) {
- throw new Exception("table not found");
+ $modelTableType = 'name';
+ $modelTableName = $prefix . $modelName;
+ $modelTableInfo = $dbconnect->query("SHOW TABLE STATUS LIKE '{$modelTableName}'", [], true);
+ if (!$modelTableInfo) {
+ throw new Exception("table not found");
+ }
}
+ $modelTableInfo = $modelTableInfo[0];
}
- $modelTableInfo = $modelTableInfo[0];
$relations = [];
//检查关联表
@@ -1069,7 +1072,7 @@ class Crud extends Command
}
//表注释
- $tableComment = $modelTableInfo['Comment'];
+ $tableComment = $modelTableInfo ? $modelTableInfo['Comment'] : '';
$tableComment = mb_substr($tableComment, -1) == '表' ? mb_substr($tableComment, 0, -1) . '管理' : $tableComment;
$modelInit = '';
From 372be26dd24b50d9a73b15b714ec700e77d9b8e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E5=92=8C?= <496631085@qq.com>
Date: Mon, 17 Jun 2024 01:56:09 +0000
Subject: [PATCH 04/13] =?UTF-8?q?!465=20=E4=BF=AE=E6=94=B9=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=20*=20=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E5=AD=97=E6=AE=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/lang/zh-cn/general/profile.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/admin/lang/zh-cn/general/profile.php b/application/admin/lang/zh-cn/general/profile.php
index fd699560..1c6002f2 100644
--- a/application/admin/lang/zh-cn/general/profile.php
+++ b/application/admin/lang/zh-cn/general/profile.php
@@ -2,7 +2,7 @@
return [
'Url' => '链接',
- 'Userame' => '用户名',
+ 'Username' => '用户名',
'Createtime' => '操作时间',
'Click to edit' => '点击编辑',
'Admin log' => '操作日志',
From db8739670c5e1296b2f45b0de77ac7f1a6441daa Mon Sep 17 00:00:00 2001
From: Karson
Date: Tue, 18 Jun 2024 16:05:57 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dautocomplete=E9=80=89?=
=?UTF-8?q?=E4=B8=AD=E5=90=8E=E6=9C=AA=E8=A7=A6=E5=8F=91=E9=AA=8C=E8=AF=81?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修复Table.api.formatter.file无法渲染的问题
---
public/assets/js/require-form.js | 6 +++++-
public/assets/js/require-table.js | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js
index 46764b6d..edc7250b 100755
--- a/public/assets/js/require-form.js
+++ b/public/assets/js/require-form.js
@@ -510,7 +510,11 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio
autocomplete: function (form) {
if ($("[data-role='autocomplete']", form).length > 0) {
require(['autocomplete'], function () {
- $("[data-role='autocomplete']").autocomplete();
+ $("[data-role='autocomplete']").autocomplete({
+ onSelect: function () {
+ $(this).trigger('change').trigger('validate');
+ }
+ });
});
}
},
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index 90532c84..dcf3e20c 100755
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -753,7 +753,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
return html.join(' ');
},
file: function (value, row, index) {
- Table.api.formatter.files.call(this, value, row, index);
+ return Table.api.formatter.files.call(this, value, row, index);
},
files: function (value, row, index) {
value = value == null || value.length === 0 ? '' : value.toString();
From 64c157f56a50be649690321ff689644f45dabf5e Mon Sep 17 00:00:00 2001
From: Karson
Date: Tue, 25 Jun 2024 11:44:38 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8F=90=E7=A4=BA?=
=?UTF-8?q?=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/js/require-table.js | 41 ++++++++++++++++++-------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/public/assets/js/require-table.js b/public/assets/js/require-table.js
index dcf3e20c..3df6305f 100755
--- a/public/assets/js/require-table.js
+++ b/public/assets/js/require-table.js
@@ -469,8 +469,10 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
toolbar.on('click', Table.config.delbtn, function () {
var that = this;
var ids = Table.api.selectedids(table);
+ var confirm = $(this).data("confirm");
+ var message = typeof confirm === 'function' ? confirm.call(this, ids) : (typeof confirm !== 'undefined' ? __(confirm, ids.length) : '');
Layer.confirm(
- __('Are you sure you want to delete the %s selected item?', ids.length),
+ message || __('Are you sure you want to delete the %s selected item?', ids.length),
{icon: 3, title: __('Warning'), offset: 0, shadeClose: true, btn: [__('OK'), __('Cancel')]},
function (index) {
Table.api.multi("del", ids, table, that);
@@ -692,7 +694,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
top = left = undefined;
}
Layer.confirm(
- __('Are you sure you want to delete this item?'),
+ $(that).data("confirm") || __('Are you sure you want to delete this item?'),
{icon: 3, title: __('Warning'), offset: [top, left], shadeClose: true, btn: [__('OK'), __('Cancel')]},
function (index) {
var table = $(that).closest('table');
@@ -915,23 +917,28 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
var table = this.table;
// 操作配置
var options = table ? table.bootstrapTable('getOptions') : {};
- // 默认按钮组
- var buttons = $.extend([], this.buttons || []);
- // 所有按钮名称
- var names = [];
- buttons.forEach(function (item) {
- names.push(item.name);
+ var buttons = [];
+ var existBtn = [];
+ var defaultBtn = ['dragsort', 'edit', 'del'];
+ var tempButton = $.extend({}, Table.button, {});
+ (this.buttons || []).forEach(function (item, index) {
+ if (defaultBtn.indexOf(item.name) > -1) {
+ $.extend(tempButton[item.name], item, Table.button[item.name], item.name === 'edit' ? {url: options.extend.edit_url} : {});
+ if (item.keep) {
+ if (options.extend[item.name + "_url"] !== '') {
+ buttons.push(tempButton[item.name]);
+ }
+ existBtn.push(item.name);
+ }
+ } else {
+ buttons.push(item);
+ }
});
- if (options.extend.dragsort_url !== '' && names.indexOf('dragsort') === -1) {
- buttons.push(Table.button.dragsort);
- }
- if (options.extend.edit_url !== '' && names.indexOf('edit') === -1) {
- Table.button.edit.url = options.extend.edit_url;
- buttons.push(Table.button.edit);
- }
- if (options.extend.del_url !== '' && names.indexOf('del') === -1) {
- buttons.push(Table.button.del);
+ defaultBtn.forEach(function (value, index) {
+ if (existBtn.indexOf(value) === -1) {
+ buttons.push(tempButton[value]);
}
+ });
return Table.api.buttonlink(this, buttons, value, row, index, 'operate');
}
,
From ac25e4b2754831fc94941cc7ff7d7c1edcaaf8cc Mon Sep 17 00:00:00 2001
From: Karson
Date: Thu, 4 Jul 2024 15:27:26 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=82=AE=E7=AE=B1?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8F=91=E9=80=81=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/api/controller/Ems.php | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/application/api/controller/Ems.php b/application/api/controller/Ems.php
index b70c414e..4c2e8a4d 100644
--- a/application/api/controller/Ems.php
+++ b/application/api/controller/Ems.php
@@ -34,8 +34,20 @@ class Ems extends Api
$event = $this->request->post("event");
$event = $event ? $event : 'register';
+ if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+ $this->error(__('邮箱格式错误'));
+ }
+ if (!preg_match("/^[a-z0-9_\-]{3,30}\$/i", $event)) {
+ $this->error(__('事件名称错误'));
+ }
+
//发送前验证码
if (config('fastadmin.user_api_captcha')) {
+
+ if (!preg_match("/^[a-z0-9]{4,6}\$/i", $captcha)) {
+ $this->error(__('验证码格式错误'));
+ }
+
if (!\think\Validate::is($captcha, 'captcha')) {
$this->error("验证码不正确");
}
@@ -87,6 +99,17 @@ class Ems extends Api
$event = $event ? $event : 'register';
$captcha = $this->request->post("captcha");
+ if (!$email || !filter_var($email, FILTER_VALIDATE_EMAIL)) {
+ $this->error(__('邮箱格式错误'));
+ }
+ if (!preg_match("/^[a-z0-9_\-]{3,30}\$/i", $event)) {
+ $this->error(__('事件名称错误'));
+ }
+
+ if (!preg_match("/^[a-z0-9]{4,6}\$/i", $captcha)) {
+ $this->error(__('验证码格式错误'));
+ }
+
if ($event) {
$userinfo = User::getByEmail($email);
if ($event == 'register' && $userinfo) {
From 271596ee2d7cb76a3046932f5eee16c7ac53324c Mon Sep 17 00:00:00 2001
From: "AriFe.Liu" <88468560@qq.com>
Date: Tue, 23 Jul 2024 03:33:44 +0000
Subject: [PATCH 08/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsidebar=E5=B7=A6?=
=?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E5=9B=A0=E5=A4=A7=E5=B0=8F=E5=86=99?=
=?UTF-8?q?=E9=97=AE=E9=A2=98=E5=AF=BC=E8=87=B4=E7=9A=84=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E6=98=BE?=
=?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=20=E5=BD=93=E6=89=8B=E5=8A=A8?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8F=9C=E5=8D=95=E8=A7=84=E5=88=99=E6=97=B6?=
=?UTF-8?q?,=20=E8=A7=84=E5=88=99=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=8F=90?=
=?UTF-8?q?=E7=A4=BA=E5=92=8C=E5=A4=84=E7=90=86=E7=94=A8=E6=88=B7=E5=BD=95?=
=?UTF-8?q?=E5=85=A5=E7=9A=84=E5=AD=97=E7=AC=A6=20=E5=9C=A8application/adm?=
=?UTF-8?q?in/library/Auth.php=20->=20getSidebar=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E4=B8=AD,=20=E4=BC=9A=E5=AF=B9=E5=BD=93=E5=89=8D=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E6=89=80=E6=8B=A5=E6=9C=89=E7=9A=84=E6=9D=83=E9=99=90?=
=?UTF-8?q?=E8=8A=82=E7=82=B9=E5=81=9A=E6=A0=A1=E9=AA=8C=E7=A7=BB=E9=99=A4?=
=?UTF-8?q?=E4=B8=8D=E7=9B=B8=E5=85=B3=E7=9A=84=E6=9D=83=E9=99=90=20?=
=?UTF-8?q?=E5=BD=93=E5=88=A4=E6=96=AD=E5=BD=93=E5=89=8D=E8=8F=9C=E5=8D=95?=
=?UTF-8?q?=E8=A7=84=E5=88=99=E6=98=AF=E5=90=A6=E5=9C=A8$userRule=E4=B8=AD?=
=?UTF-8?q?=E6=97=B6,=20=E5=8E=9F=E6=9C=AC=E7=9A=84$v['name']=E4=B8=BA?=
=?UTF-8?q?=E7=9B=B4=E6=8E=A5=E4=BB=8E=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD?=
=?UTF-8?q?=E5=8F=96=E5=87=BA=E6=9C=AA=E5=81=9A=E5=A4=84=E7=90=86,=20$user?=
=?UTF-8?q?Rule=E5=88=99=E6=98=AF=E9=80=9A=E8=BF=87$this->getRuleList?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=E8=8E=B7=E5=8F=96,=20=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E5=86=85=E5=B7=B2=E7=BB=8F=E5=AF=B9=E5=AD=97=E7=AC=A6=E4=B8=B2?=
=?UTF-8?q?=E5=81=9A=E4=BA=86=E8=BD=AC=E5=B0=8F=E5=86=99=E5=A4=84=E7=90=86?=
=?UTF-8?q?,=20=E5=81=87=E5=A6=82=E7=94=A8=E6=88=B7=E5=A1=AB=E5=86=99?=
=?UTF-8?q?=E4=BA=86=E5=A4=A7=E5=B0=8F=E5=86=99=E6=B7=B7=E5=90=88=E7=9A=84?=
=?UTF-8?q?=E8=A7=84=E5=88=99,=20=E5=88=99=E6=AD=A4=E5=A4=84=E5=B0=86?=
=?UTF-8?q?=E4=BC=9A=E8=A2=AB=E9=94=99=E8=AF=AF=E7=9A=84=E7=A7=BB=E9=99=A4?=
=?UTF-8?q?=E6=8E=89;=20=E5=AF=BC=E8=87=B4=E5=B7=A6=E4=BE=A7=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E8=AF=A5=E8=8F=9C=E5=8D=95=E8=A7=84=E5=88=99;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: AriFe.Liu <88468560@qq.com>
---
application/admin/library/Auth.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/admin/library/Auth.php b/application/admin/library/Auth.php
index 9332cdbb..6e1c61f8 100644
--- a/application/admin/library/Auth.php
+++ b/application/admin/library/Auth.php
@@ -472,7 +472,7 @@ class Auth extends \fast\Auth
->column('name,pid');
$pidArr = array_unique(array_filter(array_column($ruleList, 'pid')));
foreach ($ruleList as $k => &$v) {
- if (!in_array($v['name'], $userRule)) {
+ if (!in_array(strtolower($v['name']), $userRule)) {
unset($ruleList[$k]);
continue;
}
From 25c0490285ef22e2837bcc48e8e035469927a82f Mon Sep 17 00:00:00 2001
From: Karson
Date: Thu, 25 Jul 2024 14:51:18 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85?=
=?UTF-8?q?=E8=84=9A=E6=9C=AC=E8=B5=84=E6=BA=90=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/admin/command/Install.php | 2 +-
application/admin/command/Install/install.html | 2 +-
application/admin/command/Install/zh-cn.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/application/admin/command/Install.php b/application/admin/command/Install.php
index 24e29d20..572cc979 100644
--- a/application/admin/command/Install.php
+++ b/application/admin/command/Install.php
@@ -93,7 +93,7 @@ class Install extends Command
*/
public function index()
{
- $this->view = View::instance(Config::get('template'), Config::get('view_replace_str'));
+ $this->view = View::instance(array_merge(Config::get('template'), ['tpl_cache' => false]));
$this->request = Request::instance();
define('INSTALL_PATH', APP_PATH . 'admin' . DS . 'command' . DS . 'Install' . DS);
diff --git a/application/admin/command/Install/install.html b/application/admin/command/Install/install.html
index 1381c80d..6c3bca05 100644
--- a/application/admin/command/Install/install.html
+++ b/application/admin/command/Install/install.html
@@ -254,7 +254,7 @@
-
+
+
-
+