diff --git a/admin-client/dist/index.html b/admin-client/dist/index.html
index 506e36e..8c0d3d1 100644
--- a/admin-client/dist/index.html
+++ b/admin-client/dist/index.html
@@ -7,7 +7,7 @@
寰梦后台管理
-
+
diff --git a/admin-client/dist/static/css/LayoutHeader-YMq9aBbf.css b/admin-client/dist/static/css/LayoutHeader-YMq9aBbf.css
deleted file mode 100644
index 955eacc..0000000
--- a/admin-client/dist/static/css/LayoutHeader-YMq9aBbf.css
+++ /dev/null
@@ -1 +0,0 @@
-.hzy-layout .ant-layout-header{position:relative;z-index:6;width:100%;height:auto!important;line-height:normal!important}.hzy-layout .hzy-layout-header{padding:0;position:relative;display:flex;align-items:center;height:48px!important;transition:background-color .1s;-moz-transition:background-color .1s;-webkit-transition:background-color .1s;-o-transition:background-color .1s}.hzy-layout .hzy-layout-header .hzy-header-btn{padding:0 8px;cursor:pointer;height:100%;display:inline-flex;justify-content:center;align-items:center}.hzy-layout .hzy-layout-header .hzy-header-btn:hover{background:var(--091c5174)}
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 0d0ec33..1fa3a44 100644
--- a/admin-client/src/views/apps/T_Model_Configs/Index.vue
+++ b/admin-client/src/views/apps/T_Model_Configs/Index.vue
@@ -25,6 +25,7 @@ const state = reactive({
total: 100,
columns: [] as any,
data: [] as any,
+ scroll: { x: "100vw", y: "60vh" },
});
//权限
@@ -140,6 +141,11 @@ function exportExcel() {
+
+
+
+
+
@@ -212,20 +218,20 @@ function exportExcel() {
-
-
- {{ record.systemTemplate }}
+ {{ record[item.fieldName] }}
+
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 7d0cbd6..8f0aeab 100644
--- a/admin-client/src/views/apps/T_Model_Configs/Info.vue
+++ b/admin-client/src/views/apps/T_Model_Configs/Info.vue
@@ -70,7 +70,7 @@ function save() {
:title="state.vm.id ? '编辑' : '新建'"
centered
@ok="state.visible = false"
- :width="1200"
+ :width="1400"
>
@@ -86,7 +86,7 @@ function save() {
-
+
-
+
@@ -110,19 +110,7 @@ function save() {
/>
-
-
-
-
-
-
+
-
+
+
+
+
+
+
-
+
-
+
+ 否
+ 是
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
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 086b052..1c04fbf 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
@@ -1,4 +1,4 @@
-using MiaoYu.Repository.ChatAI.Admin.Entities.Apps;
+using MiaoYu.Repository.ChatAI.Admin.Entities.Apps;
namespace MiaoYu.Api.Admin.ApplicationServices.Apps;
///
@@ -20,20 +20,38 @@ public class T_Model_ConfigService : ApplicationService FindListAsync(PagingSearchInput pagingSearchInput)
{
var query = this._defaultRepository.Select
-
- //项目
- .WhereIf(pagingSearchInput.Search?.TenantId!=null,
- w => w.TenantId==pagingSearchInput.Search.TenantId)
-
-
+ //项目
+ .WhereIf(pagingSearchInput.Search?.TenantId != null,
+ w => w.TenantId == pagingSearchInput.Search.TenantId)
+
+
+
+ //模型名称
+ .WhereIf(!string.IsNullOrWhiteSpace(pagingSearchInput.Search?.ModelName),
+ w => w.ModelName.Contains(pagingSearchInput.Search.ModelName ?? ""))
+
+
.OrderByDescending(w => w.Id)
.Select(w => new
{
w.Id,
- w.ModelName,w.Model,w.MaxTokens,w.ApiKey,w.Url,w.AnthropicVersion,w.CreateTime,w.UpdateTime,w.TenantId,w.SystemTemplate,
- // w.LastModificationTime,
- // w.CreationTime
+ w.ModelName,
+ w.Model,
+ w.MaxTokens,
+ w.ApiKey,
+ w.Url,
+ w.AnthropicVersion,
+ w.CreateTime,
+ w.UpdateTime,
+ w.TenantId,
+ w.SystemTemplate,
+ w.RequestTemplate,
+ w.HeadersTemplate,
+ w.ResponseTemplate,
+ w.IsDefabult,
+ // w.LastModificationTime,
+ // w.CreationTime
})
;
@@ -64,19 +82,19 @@ public class T_Model_ConfigService : ApplicationService
/// id
///
- public async Task> FindFormAsync(int id)
+ public async Task> FindFormAsync(int id)
{
var res = new Dictionary();
var form = await this._defaultRepository.FindByIdAsync(id);
form = form.NullSafe();
- //if (form.CreateTime == null || form.CreateTime == DateTime.MinValue)
- //{
- // form.CreateTime = DateTime.Now;
- //}
- //if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue)
- //{
- // form.UpdateTime = DateTime.Now;
- //}
+ if (form.CreateTime == null || form.CreateTime == DateTime.MinValue)
+ {
+ form.CreateTime = DateTime.Now;
+ }
+ if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue)
+ {
+ form.UpdateTime = DateTime.Now;
+ }
res[nameof(id)] = id;
res[nameof(form)] = form;
return res;
@@ -89,6 +107,14 @@ public class T_Model_ConfigService : ApplicationService
public Task SaveFormAsync(T_Model_Config form)
{
+ if (form.CreateTime == null || form.CreateTime == DateTime.MinValue)
+ {
+ form.CreateTime = DateTime.Now;
+ }
+ if (form.UpdateTime == null || form.UpdateTime == DateTime.MinValue)
+ {
+ form.UpdateTime = DateTime.Now;
+ }
return this._defaultRepository.InsertOrUpdateAsync(form);
}
diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
index ffdfd5b..94ff82f 100644
--- a/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
+++ b/admin-server/MiaoYu.Api.Admin/appsettings.Development.json
@@ -2,7 +2,7 @@
// 连接字符串
"ConnectionStrings": {
// redis
- "Redis": "127.0.0.1:6379,password=123456,defaultDatabase=0"
+ "Redis": "124.220.55.158:6379,defaultDatabase=1"
},
// pi计算 数据库管理
"AdminRepositoryOptions": {
diff --git a/admin-server/MiaoYu.Api.Admin/appsettings.Production.json b/admin-server/MiaoYu.Api.Admin/appsettings.Production.json
index ae7b79f..aa76fdc 100644
--- a/admin-server/MiaoYu.Api.Admin/appsettings.Production.json
+++ b/admin-server/MiaoYu.Api.Admin/appsettings.Production.json
@@ -2,7 +2,7 @@
// 连接字符串
"ConnectionStrings": {
// redis
- "Redis": "127.0.0.1:6379,password=123456,defaultDatabase=0"
+ "Redis": "192.168.195.5:6379,defaultDatabase=1"
},
// pi计算 数据库管理
"AdminRepositoryOptions": {
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 1f5bf5e..e051c43 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
@@ -15,7 +15,7 @@ public class T_Model_Config : DefaultEntityV4
///
- /// model => 备注: 模型model
+ /// 模型model => 备注: 模型model
///
public string? Model { get; set; }
@@ -27,13 +27,13 @@ public class T_Model_Config : DefaultEntityV4
///
- /// x-api-key => 备注: 模型key x-api-key
+ /// key x-api-key => 备注: 模型key x-api-key
///
public string? ApiKey { get; set; }
///
- /// 请求地址 => 备注: 模型请求地址
+ /// 模型请求地址 => 备注: 模型请求地址
///
public string? Url { get; set; }
@@ -57,9 +57,33 @@ public class T_Model_Config : DefaultEntityV4
///
- /// system上下文模板 => 备注: system上下文模板
+ /// 上下文模板 => 备注: system上下文模板
///
public string? SystemTemplate { get; set; }
+
+ ///
+ /// 请求模板 => 备注: 请求模板
+ ///
+ public string? RequestTemplate { get; set; }
+
+
+ ///
+ /// headers对象 => 备注: headers对象
+ ///
+ public string? HeadersTemplate { get; set; }
+
+
+ ///
+ /// 返回数据模板 => 备注: 返回数据模板
+ ///
+ public string? ResponseTemplate { get; set; }
+
+
+ ///
+ /// 是否默认 => 备注: 是否默认
+ ///
+ public Boolean? IsDefabult { 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 d5e90dd..c09e52d 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
@@ -419,7 +419,7 @@
- model => 备注: 模型model
+ 模型model => 备注: 模型model
@@ -429,12 +429,12 @@
- x-api-key => 备注: 模型key x-api-key
+ key x-api-key => 备注: 模型key x-api-key
- 请求地址 => 备注: 模型请求地址
+ 模型请求地址 => 备注: 模型请求地址
@@ -454,7 +454,27 @@
- system上下文模板 => 备注: system上下文模板
+ 上下文模板 => 备注: system上下文模板
+
+
+
+
+ 请求模板 => 备注: 请求模板
+
+
+
+
+ headers对象 => 备注: headers对象
+
+
+
+
+ 返回数据模板 => 备注: 返回数据模板
+
+
+
+
+ 是否默认 => 备注: 是否默认