Merge remote-tracking branch 'origin/develop' into develop

application/admin/command/Crud.php

@@ -891,7 +891,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',

application/admin/command/Crud/stubs/model.stub

@@ -3,7 +3,7 @@
 namespace {%modelNamespace%};
 
 use think\Model;
-{%sofeDeleteClassPath%}
+{%softDeleteClassPath%}
 
 class {%modelName%} extends Model
 {

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'));
+        }
+
     }
 
     /**

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 = [