From 5425800b42d1bd9060ad10e12b37849ac64f7e86 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gmail.com>
Date: Sat, 17 Aug 2024 16:20:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E5=9E=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/apps/T_Model_Configs/Index.vue  |  2 +-
 .../src/views/apps/T_Model_Configs/Info.vue   | 15 ++++-
 .../MiaoYu.Api.Admin/ApiAdminStartup.cs       |  2 +
 .../Apps/MiaoYuChat/T_Model_ConfigService.cs  |  1 +
 .../appsettings.Development.json              |  2 +-
 .../Entities/Apps/T_Model_Config.cs           | 57 ++++++++++---------
 .../MiaoYu.Repository.ChatAI.Admin.xml        |  5 ++
 7 files changed, 54 insertions(+), 30 deletions(-)

diff --git a/admin-client/src/views/apps/T_Model_Configs/Index.vue b/admin-client/src/views/apps/T_Model_Configs/Index.vue
index 1fa3a44..ff9fc2f 100644
--- a/admin-client/src/views/apps/T_Model_Configs/Index.vue
+++ b/admin-client/src/views/apps/T_Model_Configs/Index.vue
@@ -219,7 +219,7 @@ function exportExcel() {
       <template #table-col>
         <template v-for="item,index in state.columns.filter((w:any) => w.show)" :key="item.fieldName">
         
-          <a-table-column  v-if="(item.fieldName=='systemTemplate'||item.fieldName=='headersTemplate'||item.fieldName=='requestTemplate')" 
+          <a-table-column  v-if="(item.fieldName=='systemTemplate'||item.fieldName=='headersTemplate'||item.fieldName=='requestTemplate' ||item.fieldName=='otherTemplate')" 
          :title="item.title" :data-index="item.fieldName" :sorter="item.sort ? { multiple: index + 1 } : false"
           min-width="300px"
           width="500px"
diff --git a/admin-client/src/views/apps/T_Model_Configs/Info.vue b/admin-client/src/views/apps/T_Model_Configs/Info.vue
index 8f0aeab..1b5777e 100644
--- a/admin-client/src/views/apps/T_Model_Configs/Info.vue
+++ b/admin-client/src/views/apps/T_Model_Configs/Info.vue
@@ -221,7 +221,20 @@ function save() {
              
             </a-form-item>
           </a-col>
-         
+          <a-col :xs="24" :sm="24" :md="24" :lg="24" :xl="24">
+            <a-form-item
+              label="其它的模板"
+              name="otherTemplate"
+            
+            >
+            <a-textarea
+                v-model:value="state.vm.form.otherTemplate"
+                placeholder="可为空，非必填"
+                :rows="10"
+              />
+             
+            </a-form-item>
+          </a-col>
         </a-row>
       </a-form>
     </a-spin>
diff --git a/admin-server/MiaoYu.Api.Admin/ApiAdminStartup.cs b/admin-server/MiaoYu.Api.Admin/ApiAdminStartup.cs
index b7b70f1..3bbbbb5 100644
--- a/admin-server/MiaoYu.Api.Admin/ApiAdminStartup.cs
+++ b/admin-server/MiaoYu.Api.Admin/ApiAdminStartup.cs
@@ -67,6 +67,8 @@ public class ApiAdminStartup : AppStartupBase<ApiAdminStartup>
         // 跳转客户端
         //  webApplication.MapGet("/", [AllowAnonymous] () => Results.Redirect("/client/index.html"));
         webApplication.MapGet("/", [AllowAnonymous] () => "请求成功");
+        var dateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+        webApplication.MapGet("/system", [AllowAnonymous] () => $"启动时间{dateTime}").WithName("系统配置");
         // 跳转离线文档
         webApplication.MapGet("/docs", [AllowAnonymous] () => Results.Redirect("/docs/index.html"));
 
diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_Model_ConfigService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_Model_ConfigService.cs
index 1c04fbf..805b461 100644
--- a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_Model_ConfigService.cs
+++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/T_Model_ConfigService.cs
@@ -50,6 +50,7 @@ public class T_Model_ConfigService : ApplicationService<IRepository<T_Model_Conf
                     w.HeadersTemplate,
                     w.ResponseTemplate,
                     w.IsDefabult,
+                    w.OtherTemplate,
                     //  w.LastModificationTime,
                     //  w.CreationTime
                 })
diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
index 275d541..3d5d4d7 100644
--- a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
+++ b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
@@ -32,7 +32,7 @@
   "Kestrel": {
     "Endpoints": {
       "Http": {
-        "Url": "http://*:90"
+        "Url": "http://*:91"
       }
     }
   }
diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Model_Config.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Model_Config.cs
index e051c43..fc389ab 100644
--- a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Model_Config.cs
+++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Model_Config.cs
@@ -1,4 +1,4 @@
-namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps;
+namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps;
 
 /// <summary>
 /// 模型配置表
@@ -7,83 +7,86 @@
 public class T_Model_Config : DefaultEntityV4
 {
 
-    
+
     /// <summary>
     ///  模型名称 => 备注: 模型名称
     /// </summary>
     public string? ModelName { get; set; }
-    
-    
+
+
     /// <summary>
     ///  模型model => 备注: 模型model
     /// </summary>
     public string? Model { get; set; }
-    
-    
+
+
     /// <summary>
     ///  max_tokens => 备注: 模型运行最大的max_tokens
     /// </summary>
     public Int32 MaxTokens { get; set; }
-    
-    
+
+
     /// <summary>
     ///  key x-api-key => 备注: 模型key x-api-key
     /// </summary>
     public string? ApiKey { get; set; }
-    
-    
+
+
     /// <summary>
     ///  模型请求地址 => 备注: 模型请求地址
     /// </summary>
     public string? Url { get; set; }
-    
-    
+
+
     /// <summary>
     ///  模型版本 => 备注: 模型版本 anthropic-version
     /// </summary>
     public string? AnthropicVersion { get; set; }
-    
-    
+
+
     /// <summary>
     ///  创建时间 => 备注: 创建时间
     /// </summary>
     public DateTime CreateTime { get; set; }
-    
-    
+
+
     /// <summary>
     ///  修改时间 => 备注: 修改时间
     /// </summary>
     public DateTime UpdateTime { get; set; }
-    
-    
+
+
     /// <summary>
     ///  上下文模板 => 备注: system上下文模板
     /// </summary>
     public string? SystemTemplate { get; set; }
-    
-    
+
+
     /// <summary>
     ///  请求模板 => 备注: 请求模板
     /// </summary>
     public string? RequestTemplate { get; set; }
-    
-    
+
+
     /// <summary>
     ///  headers对象 => 备注: headers对象
     /// </summary>
     public string? HeadersTemplate { get; set; }
-    
-    
+
+
     /// <summary>
     ///  返回数据模板 => 备注: 返回数据模板
     /// </summary>
     public string? ResponseTemplate { get; set; }
-    
-    
+
+
     /// <summary>
     ///  是否默认 => 备注: 是否默认
     /// </summary>
     public Boolean? IsDefabult { get; set; }
-    
 
+    /// <summary>
+    /// 其它的模板
+    /// </summary>
+    public virtual string? OtherTemplate { get; set; }
 }
\ No newline at end of file
diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml b/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml
index c09e52d..208740f 100644
--- a/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml
+++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/MiaoYu.Repository.ChatAI.Admin.xml
@@ -477,6 +477,11 @@
              是否默认 => 备注: 是否默认
             </summary>
         </member>
+        <member name="P:MiaoYu.Repository.ChatAI.Admin.Entities.Apps.T_Model_Config.OtherTemplate">
+            <summary>
+            其它的模板
+            </summary>
+        </member>
         <member name="T:MiaoYu.Repository.ChatAI.Admin.Entities.Apps.T_User">
             <summary>
             用户表