release 9.5.0

Author: modstart

app/Constant/AppConstant.php

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

module/AigcBase/Admin/Controller/AigcKeyPoolController.php

@@ -79,14 +79,10 @@ protected function crud(AdminCRUDBuilder $builder)
                     ->hookRendering(function (AbstractField $field, $item, $index) {
                         $html = [];
                         $html[] = "<table class='ub-table mini border tw-bg-white'>";
-                        //$html[] = '<div>调用次数：' . ($item->callCount + 0) . '</div>';
-                        //$html[] = '<div>成功次数：' . ($item->successCount + 0) . '</div>';
-                        //$html[] = '<div>失败次数：' . ($item->failCount + 0) . '</div>';
-                        //$html[] = '<div>上次调用时间：' . ($item->lastCallTime ? $item->lastCallTime->format('Y-m-d H:i:s') : '-') . '</div>';
                         $html[] = '<tr><td>调用次数</td><td>' . ($item->callCount + 0) . '</td></tr>';
                         $html[] = '<tr><td>成功次数</td><td>' . ($item->successCount + 0) . '</td></tr>';
                         $html[] = '<tr><td>失败次数</td><td>' . ($item->failCount + 0) . '</td></tr>';
-                        $html[] = '<tr><td>上次调用时间</td><td>' . ($item->lastCallTime ? $item->lastCallTime->format('Y-m-d H:i:s') : '-') . '</td></tr>';
+                        $html[] = '<tr><td>上次调用时间</td><td>' . ($item->lastCallTime ? date('Y-m-d H:i:s', strtotime($item->lastCallTime)) : '-') . '</td></tr>';
                         $html[] = '</table>';
                         return AutoRenderedFieldValue::make(join('', $html));
                     })
@@ -141,6 +137,9 @@ public function test()
         $record = ModelUtil::get(AigcKeyPool::class, CRUDUtil::id());
         BizException::throwsIfEmpty('记录不存在', $record);
         ModelUtil::decodeRecordJson($record, ['param']);
+        if (empty($record['param']['model'])) {
+            $record['param']['model'] = 'default';
+        }
         $provider = AigcProvider::getByFullName($record['type'] . ':' . $record['param']['model']);
         BizException::throwsIfEmpty('模型驱动不存在', $provider);
         $ret = Response::generateError('暂不支持测试');

module/AigcBase/Docs/release.md

@@ -1,3 +1,15 @@
+## 1.4.3 无需选择模型的驱动默认使用default
+
+- 优化：无需选择模型的驱动默认使用default
+
+---
+
+## 1.4.2 AI平台对接模型名称显示方式优化 
+
+- 优化：AI平台对接模型名称显示方式优化
+
+---
+
 ## 1.4.1 积分计算方式升级
 
 - 升级：积分计算方式

module/AigcBase/Provider/AbstractAigcProvider.php

@@ -74,11 +74,15 @@ public function paramDisplay($item, $param = [])
             'appSecret' => 'AppSecret',
             'key' => 'Key',
         ];
+        $models = $this->models();
         if (!empty($itemParam)) {
             foreach ($itemParam as $k => $v) {
                 if (isset($map[$k])) {
                     $k = $map[$k];
                 }
+                if (isset($models[$v])) {
+                    $v = $models[$v];
+                }
                 $result[] = [
                     'name' => $k,
                     'value' => $v,

module/AigcBase/Util/AigcKeyPoolUtil.php

@@ -53,11 +53,11 @@ public static function randomByType($type, $model)
         return ArrayUtil::randomWithPriority($records);
     }
 
-    private static function markEnd($idOrKey, $success)
+    private static function markEnd($idOrKeyPool, $success)
     {
-        $id = $idOrKey;
+        $id = $idOrKeyPool;
         if (is_array($id)) {
-            $id = $idOrKey['id'];
+            $id = $idOrKeyPool['id'];
         }
         $update = [
             'callCount' => DB::raw('IFNULL(callCount,0)+1'),
@@ -71,14 +71,14 @@ private static function markEnd($idOrKey, $success)
         ModelUtil::update(AigcKeyPool::class, $id, $update);
     }
 
-    public static function markSuccess($key)
+    public static function markSuccess($keyPool)
     {
-        self::markEnd($key, true);
+        self::markEnd($keyPool, true);
     }
 
-    public static function markFail($key)
+    public static function markFail($keyPool)
     {
-        self::markEnd($key, false);
+        self::markEnd($keyPool, false);
     }
 
 }

module/AigcBase/config.json

@@ -31,7 +31,7 @@
         "AigcChatXunfei",
         "AigcChatZhipuAi"
     ],
-    "version": "1.4.1",
+    "version": "1.4.3",
     "modstartVersion": ">=4.1.0",
     "author": "ModStart",
     "description": "提供AI基础框架包，支持各种模型接入",

module/Article/Api/Controller/ArticleController.php

@@ -11,7 +11,7 @@
 /**
  * Class ArticleController
  * @package Module\Article\Api\Controller
- * @Api 通用文章
+ * @Api 物料
  */
 class ArticleController extends ModuleBaseController
 {

module/Banner/Api/Controller/BannerController.php

@@ -12,7 +12,7 @@
 /**
  * Class BannerController
  * @package Module\Banner\Api\Controller
- * @Api 通用轮播
+ * @Api 物料
  */
 class BannerController extends Controller
 {
@@ -32,4 +32,4 @@ public function get()
         }
         return Response::generateSuccessData($list);
     }
-}
+}

module/Cms/Docs/release.md

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

module/Cms/View/pc/cms/search/index.blade.php

@@ -6,7 +6,7 @@
 
 {!! \ModStart\ModStart::js('asset/vendor/jqueryMark.js') !!}
 {!! \ModStart\ModStart::style('[data-markjs]{color:red !important;background:transparent;}') !!}
-{!! \ModStart\ModStart::script("$('.ub-list-items .title,.ub-list-items .tag').mark(".\ModStart\Core\Util\SerializeUtil::jsonEncode($keywords).".split('').join(' '),{separateWordSearch:true});") !!}
+{!! \ModStart\ModStart::script("$('.ub-list-items .title,.ub-list-items .tag').mark(".json_encode(htmlspecialchars($keywords)).".split('').join(' '),{separateWordSearch:true});") !!}
 
 @section('bodyContent')