diff --git a/src/admin/ai_log_main.php b/src/admin/ai_log_main.php index 5d27c3b5..44471333 100644 --- a/src/admin/ai_log_main.php +++ b/src/admin/ai_log_main.php @@ -17,12 +17,12 @@ $sql = $where = ''; if (empty($adminid)) $adminid = 0; if (empty($cip)) $cip = ''; if (empty($dtime)) $dtime = 0; -if ($adminid > 0) $where .= " AND `#@__log`.adminid='$adminid' "; -if ($cip != "") $where .= " AND `#@__log`.cip LIKE '%$cip%' "; +if ($adminid > 0) $where .= " AND `#@__ai_log`.adminid='$adminid' "; +if ($cip != "") $where .= " AND `#@__ai_log`.cip LIKE '%$cip%' "; if ($dtime > 0) { $nowtime = time(); $starttime = $nowtime - ($dtime * 24 * 3600); - $where .= " AND `#@__log`.dtime>'$starttime' "; + $where .= " AND `#@__ai_log`.dtime>'$starttime' "; } $sql = "SELECT `#@__ai_log`.*,`#@__admin`.userid FROM `#@__ai_log` LEFT JOIN `#@__admin` ON `#@__admin`.id=`#@__ai_log`.adminid WHERE 1=1 $where ORDER BY `#@__ai_log`.lid DESC"; $adminlist = ''; diff --git a/src/admin/ai_model_add.php b/src/admin/ai_model_add.php index ff9c7678..4185dbb9 100644 --- a/src/admin/ai_model_add.php +++ b/src/admin/ai_model_add.php @@ -15,7 +15,8 @@ if ($dopost == "add") { $model = isset($model)? HtmlReplace($model, -1) : ''; $title = isset($title)? HtmlReplace($title, -1) : ''; $description = isset($description)? HtmlReplace($description, -1) : ''; - $query = "INSERT INTO `#@__ai_model` (aiid,title,model,description) VALUES ('$aiid','$title','$model','$description'); "; + $sortrank = isset($sortrank)? intval($sortrank) : 50; + $query = "INSERT INTO `#@__ai_model` (aiid,title,model,description,sortrank) VALUES ('$aiid','$title','$model','$description','$sortrank'); "; $rs = $dsql->ExecuteNoneQuery($query); $burl = "ai_edit.php?id=".$aiid; if ($rs) { diff --git a/src/admin/ai_model_edit.php b/src/admin/ai_model_edit.php index 59c264e9..8857dedc 100644 --- a/src/admin/ai_model_edit.php +++ b/src/admin/ai_model_edit.php @@ -20,7 +20,8 @@ if ($dopost == "delete") { $title = isset($title)? HtmlReplace($title, -1) : ''; $description = isset($description)? HtmlReplace($description, -1) : ''; $model = isset($model)? HtmlReplace($model, -1) : ''; - $query = "UPDATE `#@__ai_model` SET title='$title',description='$description',model='$model' WHERE id='$id' "; + $sortrank = isset($sortrank)? intval($sortrank) : 50; + $query = "UPDATE `#@__ai_model` SET title='$title',description='$description',model='$model',sortrank='$sortrank' WHERE id='$id' "; $dsql->ExecuteNoneQuery($query); ShowMsg("成功修改一个模型版本", "ai_edit.php?id={$myModel['aiid']}&dopost=getedit"); exit(); diff --git a/src/admin/ai_model_main.php b/src/admin/ai_model_main.php index 0083a0fc..656d4398 100644 --- a/src/admin/ai_model_main.php +++ b/src/admin/ai_model_main.php @@ -12,7 +12,7 @@ require_once(dirname(__FILE__).'/config.php'); require_once(DEDEINC.'/datalistcp.class.php'); DedeSetCookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/'); -$sql = "SELECT AM.*,A.title as aititle FROM `#@__ai_model` AM LEFT JOIN `#@__ai` A ON A.id = AM.aiid ORDER BY AM.id DESC"; +$sql = "SELECT AM.*,A.title as aititle FROM `#@__ai_model` AM LEFT JOIN `#@__ai` A ON A.id = AM.aiid WHERE 1=1 ORDER BY AM.sortrank ASC,AM.id DESC"; $dlist = new DataListCP(); $dlist->SetTemplet(DEDEADMIN.'/templets/ai_model_main.htm'); $dlist->SetSource($sql); diff --git a/src/admin/ai_prompt_view.php b/src/admin/ai_prompt_view.php new file mode 100644 index 00000000..b0108243 --- /dev/null +++ b/src/admin/ai_prompt_view.php @@ -0,0 +1,30 @@ +GetOne("SELECT * FROM `#@__ai_prompt` WHERE id=$id"); +if ($dopost == "delete") { + $dsql->ExecuteNoneQuery("DELETE FROM `#@__ai_prompt` WHERE id='$id'"); + ShowMsg("成功删除一个提示词", "ai_prompt_main.php"); + exit(); +} else if ($dopost == "saveedit") { + $title = isset($title)? HtmlReplace($title, -1) : ''; + $description = isset($description)? HtmlReplace($description, -1) : ''; + $prompt = isset($prompt)? $prompt : ''; + $dfprompt = isset($dfprompt)? $dfprompt : ''; + $query = "UPDATE `#@__ai_prompt` SET title='$title',description='$description',prompt='$prompt',dfprompt='$dfprompt' WHERE id='$id' "; + $dsql->ExecuteNoneQuery($query); + ShowMsg("成功修改一个提示词", "ai_prompt_edit.php?id={$myPrompt['id']}"); + exit(); +} +include DedeInclude('templets/ai_prompt_view.htm'); +?> \ No newline at end of file diff --git a/src/admin/templets/ai_add.htm b/src/admin/templets/ai_add.htm index aaa34f86..9df1f481 100644 --- a/src/admin/templets/ai_add.htm +++ b/src/admin/templets/ai_add.htm @@ -48,7 +48,7 @@ 接口地址 - + （需兼容OpenAI接口标准） diff --git a/src/admin/templets/ai_edit.htm b/src/admin/templets/ai_edit.htm index 086b13e4..54ef70d9 100644 --- a/src/admin/templets/ai_edit.htm +++ b/src/admin/templets/ai_edit.htm @@ -46,7 +46,7 @@ 接口地址 - + （需兼容OpenAI接口标准） @@ -61,6 +61,7 @@ Model 名称 描述 + 排序 操作 @@ -71,6 +72,7 @@ {dede:field.model function='dede_htmlspecialchars(@me)'/} {dede:field.title function='dede_htmlspecialchars(@me)'/} {dede:field.description/} + {dede:field.sortrank/} diff --git a/src/admin/templets/ai_log_main.htm b/src/admin/templets/ai_log_main.htm index c215a95d..eb9675d6 100644 --- a/src/admin/templets/ai_log_main.htm +++ b/src/admin/templets/ai_log_main.htm @@ -17,7 +17,7 @@
- + - + + 重置
@@ -48,6 +49,8 @@ 提示词 地址 时间 + 提示 + 补全 消耗 @@ -61,11 +64,9 @@ {dede:field.cip/} {dede:field.dtime function="MyDate('y/m/d H:i:s',@me)"/} - - 提示：{dede:field.prompt_tokens/}
- 对话：{dede:field.completion_tokens/}
- 总计：{dede:field.total_tokens/} - + {dede:field.prompt_tokens/} + {dede:field.completion_tokens/} + {dede:field.total_tokens/} {/dede:datalist} diff --git a/src/admin/templets/ai_main.htm b/src/admin/templets/ai_main.htm index aa72fb95..6d3418d8 100644 --- a/src/admin/templets/ai_main.htm +++ b/src/admin/templets/ai_main.htm @@ -1,4 +1,4 @@ -{dede:config.pagesize value='30'/} +{dede:config.pagesize value='15'/} diff --git a/src/admin/templets/ai_model_add.htm b/src/admin/templets/ai_model_add.htm index 616cd282..313ef0b8 100644 --- a/src/admin/templets/ai_model_add.htm +++ b/src/admin/templets/ai_model_add.htm @@ -56,6 +56,10 @@ 名称 + + 排序 + （由低到高） + 描述 diff --git a/src/admin/templets/ai_model_edit.htm b/src/admin/templets/ai_model_edit.htm index 6ef9ad47..dc5f7101 100644 --- a/src/admin/templets/ai_model_edit.htm +++ b/src/admin/templets/ai_model_edit.htm @@ -41,6 +41,10 @@ 名称 + + 排序 + （由低到高） + 描述 diff --git a/src/admin/templets/ai_model_main.htm b/src/admin/templets/ai_model_main.htm index a436942d..45a4f767 100644 --- a/src/admin/templets/ai_model_main.htm +++ b/src/admin/templets/ai_model_main.htm @@ -36,6 +36,7 @@ 名称 大模型 描述 + 排序 操作 @@ -47,6 +48,7 @@ {dede:field.title function='dede_htmlspecialchars(@me)'/} {dede:field.aititle/} {dede:field.description/} + {dede:field.sortrank/} diff --git a/src/admin/templets/ai_prompt_add.htm b/src/admin/templets/ai_prompt_add.htm index 8de0eac6..79c4d064 100644 --- a/src/admin/templets/ai_prompt_add.htm +++ b/src/admin/templets/ai_prompt_add.htm @@ -48,7 +48,7 @@ class="admin-textarea-sm"> - 提示词规则 + 系统提示词 （AI系统提示词） diff --git a/src/admin/templets/ai_prompt_edit.htm b/src/admin/templets/ai_prompt_edit.htm index a83168ac..6e86d6e4 100644 --- a/src/admin/templets/ai_prompt_edit.htm +++ b/src/admin/templets/ai_prompt_edit.htm @@ -55,7 +55,7 @@ class="admin-textarea-sm"> - 提示词规则 + 系统提示词 diff --git a/src/admin/templets/ai_prompt_main.htm b/src/admin/templets/ai_prompt_main.htm index 8fbe2dba..4bb83fb2 100644 --- a/src/admin/templets/ai_prompt_main.htm +++ b/src/admin/templets/ai_prompt_main.htm @@ -56,6 +56,8 @@ class="btn btn-light btn-sm"> + diff --git a/src/admin/templets/ai_prompt_view.htm b/src/admin/templets/ai_prompt_view.htm new file mode 100644 index 00000000..aa71529b --- /dev/null +++ b/src/admin/templets/ai_prompt_view.htm @@ -0,0 +1,131 @@ + + + + + + 预览提示词 + + + + + + + + +
+
    +
  1. 后台面板
    2. +
  2. 提示词管理
    3. +
  3. 预览提示词
    4. +
+
+
预览提示词
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + +
名称 + [] +
提示词 + +
选择模型 + +
+ + 返回 +
结果
+
+
+
+
+ + + \ No newline at end of file diff --git a/src/admin/templets/article_add.htm b/src/admin/templets/article_add.htm index 9dce3893..6d39ec2e 100644 --- a/src/admin/templets/article_add.htm +++ b/src/admin/templets/article_add.htm @@ -26,7 +26,7 @@
  • 发布文档
    • -
    发布文档
    +
    发布文档
    @@ -227,7 +227,7 @@
    -
    AI发布文档
    +
    智能助手-发布文档
    @@ -236,7 +236,7 @@
    选择模型： @@ -231,7 +231,7 @@
    -
    AI修改文档
    +
    智能助手-修改文档
    @@ -240,7 +240,7 @@
    选择模型： @@ -297,7 +297,7 @@
    -
    AI创建栏目
    +
    智能助手-创建栏目
    @@ -306,7 +306,7 @@
    选择模型： @@ -194,7 +194,7 @@
    -
    AI批量创建栏目
    +
    智能助手-批量创建栏目
    @@ -203,7 +203,7 @@
    选择模型： @@ -327,7 +327,7 @@
    -
    AI修改栏目
    +
    智能助手-修改栏目
    @@ -336,7 +336,7 @@
    选择模型：