feat: release 9.6.0

Author: modstart

app/Constant/AppConstant.php

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

module/AdminManager/Admin/Controller/UpgradeController.php

@@ -5,6 +5,7 @@
 use App\Constant\AppConstant;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Artisan;
+use Illuminate\Support\Facades\Session;
 use ModStart\Admin\Auth\AdminPermission;
 use ModStart\Core\Exception\BizException;
 use ModStart\Core\Input\InputPackage;
@@ -65,10 +66,12 @@ public function index()
             BizException::throwsIfEmpty('toVersion为空', $toVersion);
             switch ($step) {
                 case 'upgradePackage':
-                    $package = $dataInput->getTrimString('package');
-                    $diffContentFile = $dataInput->getTrimString('diffContentFile');
+                    $package = Session::get('AdminManager.Upgrade.Package');
+                    $diffContentFile = Session::get('AdminManager.Upgrade.DiffContentFile');
                     BizException::throwsIfEmpty('package为空', $package);
                     BizException::throwsIfEmpty('diffContentFile为空', $diffContentFile);
+                    Session::forget('AdminManager.Upgrade.Package');
+                    Session::forget('AdminManager.Upgrade.DiffContentFile');
                     $ret = UpgradeUtil::upgradePackage($package, $diffContentFile);
                     BizException::throwsIfResponseError($ret);
                     return $this->doFinish([
@@ -77,6 +80,8 @@ public function index()
                 case 'downloadPackage':
                     $ret = UpgradeUtil::downloadPackage($token, AppConstant::APP, AppConstant::VERSION, $toVersion);
                     BizException::throwsIfResponseError($ret);
+                    Session::put('AdminManager.Upgrade.Package', $ret['data']['package']);
+                    Session::put('AdminManager.Upgrade.DiffContentFile', $ret['data']['diffContentFile']);
                     return $this->doNext('upgradePackage', [
                         '<span class="ub-text-success">获取安装包完成，大小 ' . FileUtil::formatByte($ret['data']['packageSize']) . '</span>',
                         '<span class="ub-text-white">开始解压升级装包...</span>'

module/AigcBase/Admin/Controller/AigcKeyPoolController.php

@@ -150,6 +150,9 @@ public function test()
                 $ret = $chatProvider->chat('test', '你是什么模型，使用最简短的回答');
                 break;
         }
+        if (!empty($ret['data']['isError'])) {
+            return Response::generateError('模型测试失败');
+        }
         if (Response::isSuccess($ret)) {
             return Response::generateSuccess('测试成功');
         }

module/AigcBase/Docs/release.md

@@ -1,3 +1,9 @@
+## 1.4.4 AI平台对接模型测试失效问题
+
+- 修复：AI平台对接模型测试失效问题
+
+---
+
 ## 1.4.3 无需选择模型的驱动默认使用default
 
 - 优化：无需选择模型的驱动默认使用default

module/AigcBase/Provider/AbstractAigcChatProvider.php

@@ -8,7 +8,6 @@
 use ModStart\Core\Input\Response;
 use ModStart\Core\Util\HtmlUtil;
 use Module\AigcBase\Type\AigcProviderType;
-use Module\AigcBase\Util\AigcKeyPoolUtil;
 use Module\Vendor\Markdown\MarkdownUtil;
 
 abstract class AbstractAigcChatProvider extends AbstractAigcProvider
@@ -60,6 +59,7 @@ protected function chatResponse($sessionId, $content, $option)
     protected function chatResponseError($sessionId, $option)
     {
         return Response::generateSuccessData([
+            'isError' => true,
             'msg' => [
                 'type' => 'text',
                 'content' => '机器人太忙啦，请稍后再试'

module/AigcBase/config.json

@@ -6,10 +6,11 @@
         "laravel9"
     ],
     "types": [
-        "PC",
-        "Mobile"
+        "PC"
+    ],
+    "tags": [
+        "AI"
     ],
-    "tags": [],
     "require": [
         "Vendor:>=4.1.0"
     ],
@@ -31,10 +32,10 @@
         "AigcChatXunfei",
         "AigcChatZhipuAi"
     ],
-    "version": "1.4.3",
+    "version": "1.4.4",
     "modstartVersion": ">=4.1.0",
     "author": "ModStart",
     "description": "提供AI基础框架包，支持各种模型接入",
     "providers": [],
-    "config": {}
-}
+    "config": []
+}

module/Cms/Docs/release.md

@@ -1,12 +1,7 @@
-## 3.9.1
-
-- 修复：已知缺陷修复
-
----
-
-## 3.9.0
+## 3.9.0 记录新增seo相关字段无效的问题，已知缺陷修复
 
 - 修复：记录新增seo相关字段无效的问题
+- 修复：已知缺陷修复
 
 ---
 

module/Cms/config.json

@@ -1,6 +1,6 @@
 {
     "name": "Cms",
-    "title": "通用CMS",
+    "title": "CMS系统",
     "env": [
         "laravel5",
         "laravel9"
@@ -15,13 +15,11 @@
         "WordSpliter",
         "SiteMapManager"
     ],
-    "tags": [
-        "通用CMS"
-    ],
+    "tags": [],
     "version": "3.9.0",
-    "modstartVersion": ">=4.0.0",
+    "modstartVersion": ">=4.1.0",
     "author": "ModStart",
     "description": "提供通用的动态模型内容管理系统",
     "providers": [],
     "config": {}
-}
+}

module/Member/Admin/Controller/MemberController.php

@@ -156,6 +156,9 @@ protected function crud(AdminCRUDBuilder $builder)
                 $builder->display('registerIp', '注册IP');
                 $builder->display('registerIpName', '注册IP定位');
                 $builder->display('created_at', '注册时间');
+                if (modstart_module_enabled('MemberSecurityGuard')) {
+                    $builder->display('loginLockTime', '登录锁定时间');
+                }
                 $builder->canBatchSelect(true);
                 $builder->batchOperatePrepend('<button class="btn" data-batch-confirm="确认禁用 %d 个用户？" data-batch-operate="' . modstart_admin_url('member/status_forbidden') . '"><i class="iconfont icon-warning"></i> 禁用</button>');
             })

module/Member/Config/MemberHomeIcon.php

@@ -25,6 +25,9 @@ public static function get()
             if ($item instanceof \Closure) {
                 $item = call_user_func($item);
             }
+            if (empty($item)) {
+                continue;
+            }
             $menu = array_merge($menu, $item);
         }
         $menu = self::mergeMenu($menu);