新增：腾讯云短信和七牛云短信

app/common/library/sms/engine/Aliyun.php

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: 萤火科技 <admin@yiovo.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare (strict_types=1);
 
 namespace app\common\library\sms\engine;
 
@@ -64,7 +64,7 @@ class Aliyun extends Server
         // $params['SmsUpExtendCode'] = "1234567";
 
         // *** 需用户填写部分结束, 以下代码若无必要无需更改 ***
-        if (!empty($params['TemplateParam']) && is_array($params['TemplateParam'])) {
+        if (!empty($params['TemplateParam'])) {
             $params['TemplateParam'] = helper::jsonEncode($params['TemplateParam']);
         }
 

app/common/model/store/Setting.php

@@ -46,7 +46,7 @@ class Setting extends BaseModel
      * @param $value
      * @return string
      */
-    public function setValuesAttr($value)
+    public function setValuesAttr($value): string
     {
         return helper::jsonEncode($value);
     }
@@ -101,7 +101,8 @@ class Setting extends BaseModel
             // 写入缓存中
             Cache::tag('cache')->set("setting_{$storeId}", $data);
         }
-        return $model->getMergeData($data);
+        // 合并默认设置
+        return array_merge_multiple($model->defaultData(), $data);
     }
 
     /**
@@ -117,21 +118,11 @@ class Setting extends BaseModel
         return $this->where('store_id', '=', $storeId)->select();
     }
 
-    /**
-     * 合并用户设置与默认数据
-     * @param array $actualData
-     * @return array
-     */
-    private function getMergeData(array $actualData): array
-    {
-        return array_merge_multiple($this->defaultData(), $actualData);
-    }
-
     /**
      * 默认配置
      * @return array
      */
-    public function defaultData()
+    public function defaultData(): array
     {
         return [
             // 配送设置
@@ -290,5 +281,4 @@ class Setting extends BaseModel
             ]
         ];
     }
-
 }