From 49ed6cb808223871d948096e9b8678559bf90429 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 7 Jul 2021 10:29:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20Soft=20=E5=8D=95?= =?UTF-8?q?=E8=AF=8D=E5=91=BD=E5=90=8D=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/command/Crud.php | 2 +- application/admin/command/Crud/stubs/model.stub | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 927625b7..9f97fa8c 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -868,7 +868,7 @@ class Crud extends Command 'editList' => $editList, 'javascriptList' => $javascriptList, 'langList' => $langList, - 'sofeDeleteClassPath' => in_array($this->deleteTimeField, $fieldArr) ? "use traits\model\SoftDelete;" : '', + 'softDeleteClassPath' => in_array($this->deleteTimeField, $fieldArr) ? "use traits\model\SoftDelete;" : '', 'softDelete' => in_array($this->deleteTimeField, $fieldArr) ? "use SoftDelete;" : '', 'modelAutoWriteTimestamp' => in_array($this->createTimeField, $fieldArr) || in_array($this->updateTimeField, $fieldArr) ? "'int'" : 'false', 'createTime' => in_array($this->createTimeField, $fieldArr) ? "'{$this->createTimeField}'" : 'false', diff --git a/application/admin/command/Crud/stubs/model.stub b/application/admin/command/Crud/stubs/model.stub index 4e92e3a9..855af095 100755 --- a/application/admin/command/Crud/stubs/model.stub +++ b/application/admin/command/Crud/stubs/model.stub @@ -3,7 +3,7 @@ namespace {%modelNamespace%}; use think\Model; -{%sofeDeleteClassPath%} +{%softDeleteClassPath%} class {%modelName%} extends Model { From 33788fc93eacb03dec8472b2e7d76613feca1a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?King=E8=B6=85?= <23939139@qq.com> Date: Tue, 6 Jul 2021 19:05:59 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAPI=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83=E5=85=B3=E9=97=AD=E6=97=A0?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/User.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/application/api/controller/User.php b/application/api/controller/User.php index df467131..ec739ba3 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -6,6 +6,7 @@ use app\common\controller\Api; use app\common\library\Ems; use app\common\library\Sms; use fast\Random; +use think\Config; use think\Validate; /** @@ -19,6 +20,11 @@ class User extends Api public function _initialize() { parent::_initialize(); + + if (!Config::get('fastadmin.usercenter')) { + $this->error(__('User center already closed')); + } + } /** From 503c67f9d87b997fa06cb6c94a2532d386955aad Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 9 Jul 2021 13:34:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3Form=E7=B1=BB=E5=86=85?= =?UTF-8?q?=E9=83=A8=E5=88=86=E6=96=B9=E6=B3=95=E7=9A=84=E5=8F=AF=E9=80=89?= =?UTF-8?q?=E5=8F=82=E5=9C=A8=E5=BF=85=E9=80=89=E5=8F=82=E5=89=8D=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extend/fast/Form.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/extend/fast/Form.php b/extend/fast/Form.php index b2dc4495..faf7d1db 100644 --- a/extend/fast/Form.php +++ b/extend/fast/Form.php @@ -929,7 +929,7 @@ EOD; * @param array $previewAttr * @return string */ - public function image($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) + public function image($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) { $default = [ 'data-mimetype' => 'image/gif,image/jpeg,image/png,image/jpg,image/bmp' @@ -950,7 +950,7 @@ EOD; * @param array $previewAttr * @return string */ - public function images($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) + public function images($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) { $default = [ 'data-multiple' => 'true', @@ -972,7 +972,7 @@ EOD; * @param array $previewAttr * @return string */ - public function upload($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) + public function upload($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) { return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); } @@ -988,7 +988,7 @@ EOD; * @param array $previewAttr * @return string */ - public function uploads($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) + public function uploads($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) { $default = [ 'data-multiple' => 'true', @@ -998,7 +998,7 @@ EOD; return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); } - protected function uploader($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) + protected function uploader($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) { $domname = str_replace(['[', ']', '.'], '', $name); $options = [