新增：升级存储驱动

Author: modstart

app/Constant/AppConstant.php

@@ -6,6 +6,6 @@ class AppConstant
 {
     const APP = 'cms9';
     const APP_NAME = 'ModStartCMS9';
-    const VERSION = '9.1.0';
+    const VERSION = '9.2.0';
 
 }

module/Article/View/pc/article/viewPage.blade.php

@@ -4,18 +4,19 @@
 @section('pageKeywords'){{$article['title']}}@endsection
 @section('pageDescription'){{$article['title']}}@endsection
 
+@section('bodyAppend')@endsection
+
 @section('body')
 
     <div style="max-width:800px;margin:0 auto;">
-        <div class="ub-panel">
-            <div class="head"></div>
-            <div class="body">
-                <div class="ub-article">
+        <div class="ub-content-box" style="min-height:100vh;">
+            <div class="ub-article">
+                @if(empty($hideTitle))
                     <h1 class="ub-text-center">{{$article['title']}}</h1>
                     <div class="attr"></div>
-                    <div class="content ub-html lg">
-                        {!! $article['content'] !!}
-                    </div>
+                @endif
+                <div class="content ub-html lg">
+                    {!! $article['content'] !!}
                 </div>
             </div>
         </div>

module/Cms/Api/Controller/FormController.php

@@ -11,6 +11,7 @@
 use ModStart\Core\Input\Response;
 use Module\Cms\Field\CmsField;
 use Module\Cms\Util\CmsContentUtil;
+use Module\Vendor\Provider\Captcha\CaptchaProvider;
 
 /**
  * @Api 通用CMS
@@ -42,6 +43,14 @@ public function submit()
         $input = InputPackage::buildFromInput();
         $catId = $input->getTrimString('cat');
         $data = parent::setup($catId);
+        if (!empty($data['cat']['captchaProvider'])) {
+            $provider = CaptchaProvider::get($data['cat']['captchaProvider']);
+            BizException::throwsIfEmpty('验证码配置异常', $provider);
+            $ret = $provider->validate();
+            if (Response::isError($ret)) {
+                return $ret;
+            }
+        }
         $input = InputPackage::buildFromInput();
         $submitData = [];
         $submitData['content'] = $input->getRichContent('content');

module/Cms/Docs/release.md

@@ -1,4 +1,10 @@
-## 3.8.0
+## 3.8.1 表单验证码不生效问题修复
+
+- 修复：表单验证码不生效问题修复
+
+---
+
+## 3.8.0 支持验证码避免恶意提交，后台首页报表升级，审核状态修复
 
 - 新增：CMS表单提交支持验证码配置，拦截恶意信息提交
 - 新增：后台首页报表统计功能升级

module/Cms/Helpers/MCms.php

@@ -72,6 +72,10 @@
  * $option = [ 'whereOperate'=>[ 'title', 'like', '%关键词%' ] ];
  * // 副表关联搜索（关联副表 cms_m_xxx，同时搜索副表字段 title = 标题 的记录）
  * $option = [ 'fieldFilterTable'=>'cms_m_xxx', 'fieldFilter'=>[ [ 'condition'=>'is', 'field'=>'title', 'value'=>'标题' ] ] ];
+ * // 排序（单个字段排序）
+ * $option = [ 'order'=>['id','desc'] ]
+ * // 排序（多个字段排序）
+ * $option = [ 'order'=>[ ['id','desc'], ['title','desc'] ] ]
  */
 class MCms
 {

module/Cms/config.json

@@ -18,10 +18,10 @@
     "tags": [
         "通用CMS"
     ],
-    "version": "3.8.0",
-    "modstartVersion": ">=2.9.0",
+    "version": "3.8.1",
+    "modstartVersion": ">=4.0.0",
     "author": "ModStart",
     "description": "提供通用的动态模型内容管理系统",
-    "providers": [
-    ]
+    "providers": [],
+    "config": {}
 }

module/Member/Admin/Controller/ConfigController.php

@@ -92,7 +92,7 @@ public function setting(AdminConfigBuilder $builder)
                 })
                 ->help('禁用后，可通过后台增加账号');
 
-            if (MemberOauth::hasItems()) {
+            if (MemberOauth::hasItems() || modstart_module_enabled('MemberWechatMpLogin')) {
                 $builder->switch('Member_OauthBindAuto', '授权登录自动绑定账号')
                     ->when('=', false, function ($builder) {
                         /** @var HasFields $builder */

module/Member/Admin/Controller/MemberCreditLogController.php

@@ -11,7 +11,9 @@
 use ModStart\Field\AbstractField;
 use ModStart\Field\AutoRenderedFieldValue;
 use ModStart\Grid\GridFilter;
+use ModStart\Module\ModuleManager;
 use ModStart\Support\Concern\HasFields;
+use Module\Member\Model\MemberCreditLog;
 use Module\Member\Util\MemberCmsUtil;
 
 class MemberCreditLogController extends Controller
@@ -20,15 +22,16 @@ class MemberCreditLogController extends Controller
 
     protected function crud(AdminCRUDBuilder $builder)
     {
+        $creditName = ModuleManager::getModuleConfig('Member', 'creditName', '积分');
         $builder
-            ->init('member_credit_log')
-            ->field(function ($builder) {
+            ->init(MemberCreditLog::class)
+            ->field(function ($builder) use ($creditName) {
                 /** @var HasFields $builder */
                 $builder->id('id', 'ID');
                 $builder->display('memberUserId', '用户')->hookRendering(function (AbstractField $field, $item, $index) {
                     return MemberCmsUtil::showFromId($item->memberUserId);
                 });
-                $builder->display('change', '积分')
+                $builder->display('change', $creditName)
                     ->hookRendering(function (AbstractField $field, $item, $index) {
                         return AutoRenderedFieldValue::make(
                             $item->change > 0 ?
@@ -54,7 +57,7 @@ protected function crud(AdminCRUDBuilder $builder)
             ->gridFilter(function (GridFilter $filter) {
                 $filter->eq('memberUserId', '用户ID');
             })
-            ->title('用户积分流水')->canAdd(false)->canEdit(false)->canDelete(false);
+            ->title('用户' . $creditName . '流水')->canAdd(false)->canEdit(false)->canDelete(false);
     }
 
 }

module/Member/Admin/Controller/MemberVipSetController.php

@@ -105,6 +105,7 @@ public function config(AdminConfigBuilder $builder)
             ])
             ->help('当最近开通用户为空时，将显示虚拟开通用户')
             ->defaultValue($openUserDefaults);
+        $builder->text('Member_VipTitle', 'VIP开通协议标题')->help('默认为 会员协议');
         $builder->richHtml('Member_VipContent', 'VIP开通说明')->help('默认为 VIP开通说明');
         $builder->formClass('wide');
         return $builder->perform();

module/Member/Api/Controller/AuthController.php

@@ -225,12 +225,29 @@ public function oauthTryLogin($oauthType = null)
         return Response::generateSuccessData($resultData);
     }
 
+    public function oauthBindInfo()
+    {
+        $oauthUserInfo = Session::get('oauthUserInfo', []);
+        //$oauthUserInfo = [
+        //    'openid' => 'mock',
+        //    'username' => 'test-username',
+        //    'avatar' => 'avatar',
+        //];
+        return Response::generateSuccessData([
+            'oauthUserInfo' => $oauthUserInfo,
+        ]);
+    }
+
     public function oauthBind($oauthType = null)
     {
         $input = InputPackage::buildFromInput();
         $redirect = $input->getTrimString('redirect', modstart_web_url('member'));
         $oauthType = $input->getTrimString('type', $oauthType);
         $oauthUserInfo = Session::get('oauthUserInfo', []);
+        if (empty($oauthType)) {
+            return Response::generate(-1, '授权类型为空');
+        }
+
         if (empty($oauthUserInfo)) {
             return Response::generate(-1, '用户授权数据为空');
         }