diff --git a/admin-client/dist/index.html b/admin-client/dist/index.html
index 10cad21..506e36e 100644
--- a/admin-client/dist/index.html
+++ b/admin-client/dist/index.html
@@ -7,7 +7,7 @@
寰梦后台管理
-
+
diff --git a/admin-client/src/core/components/huanmeng/hm-image.vue b/admin-client/src/core/components/huanmeng/hm-image.vue
index cf70168..eb5c388 100644
--- a/admin-client/src/core/components/huanmeng/hm-image.vue
+++ b/admin-client/src/core/components/huanmeng/hm-image.vue
@@ -76,7 +76,7 @@ function updateValueNumber(event: number) {
}
async function fileupload() {
- const response = await Tools.imageFileUpload(0, 1);
+ const response = await Tools.imageFileUpload(0, 0);
console.log(response);
updateValueNumber(response.imageId);
diff --git a/admin-client/src/core/components/layouts/LayoutHeader.vue b/admin-client/src/core/components/layouts/LayoutHeader.vue
index 68f130e..df62e85 100644
--- a/admin-client/src/core/components/layouts/LayoutHeader.vue
+++ b/admin-client/src/core/components/layouts/LayoutHeader.vue
@@ -69,17 +69,24 @@ function jumpPro() {
-
+ -->
-
+
+
+
+ 清除缓存
+
diff --git a/admin-client/src/views/Apps/T_Image_Configs/Index.vue b/admin-client/src/views/Apps/T_Image_Configs/Index.vue
index 4cdf1e7..eb35016 100644
--- a/admin-client/src/views/Apps/T_Image_Configs/Index.vue
+++ b/admin-client/src/views/Apps/T_Image_Configs/Index.vue
@@ -22,7 +22,7 @@ const state = reactive({
state: false,
vm: {
name: undefined,
- imageType: undefined,
+ imageType: '-1',
},
sort: [] as any[],
},
@@ -135,7 +135,7 @@ async function findList() {
state.loading = false;
if (result.code != 200) return;
state.page = result.data.page;
- state.size = 50;//result.data.size;
+ state.size = result.data.size;
state.total = result.data.total;
state.columns = columns,//result.data.columns;
state.data = result.data.dataSource;
@@ -193,15 +193,19 @@ async function imageUpdate(image: any) {
{
state.page = changeTable.pagination.current ?? 1;
state.size = changeTable.pagination.pageSize ?? state.size;
+ console.log(changeTable);
state.search.sort = changeTable.sorter instanceof Array ? [...changeTable.sorter] : [changeTable.sorter];
findList();
}
- " @show-size-change="({ current, size }) => {
+ "
+ @show-size-change="({ current, size }) => {
state.page = current == 0 ? 1 : current;
+ console.log(size,state);
state.size = size;
findList();
}
- ">
+ "
+ >
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 e6f3380..0d0ec33 100644
--- a/admin-client/src/views/apps/T_Model_Configs/Index.vue
+++ b/admin-client/src/views/apps/T_Model_Configs/Index.vue
@@ -140,11 +140,6 @@ function exportExcel() {
-
-
-
-
-
@@ -216,8 +211,21 @@ function exportExcel() {
-
-
+
+
+
+
+
+ {{ record.systemTemplate }}
+
+
+
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 fe969ad..7d0cbd6 100644
--- a/admin-client/src/views/apps/T_Model_Configs/Info.vue
+++ b/admin-client/src/views/apps/T_Model_Configs/Info.vue
@@ -1,112 +1,177 @@
-
-
- 提交
-关闭
+
+
+
+ 提交
+ 关闭
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/admin-client/src/views/home/Index.vue b/admin-client/src/views/home/Index.vue
index 47f4099..8d26d51 100644
--- a/admin-client/src/views/home/Index.vue
+++ b/admin-client/src/views/home/Index.vue
@@ -30,11 +30,11 @@ let visible = ref(false);
-
+
diff --git a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/TImageConfigService.cs b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/TImageConfigService.cs
index a6fd6c9..4cc80e6 100644
--- a/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/TImageConfigService.cs
+++ b/admin-server/MiaoYu.Api.Admin/ApplicationServices/Apps/MiaoYuChat/TImageConfigService.cs
@@ -39,7 +39,7 @@ public class TImageConfigService : ApplicationService w.Name.Contains(pagingSearchInput.Search.Name ?? ""))
.WhereIf(pagingSearchInput.Search?.TenantId != null,
w => w.TenantId == pagingSearchInput.Search.TenantId)
- .WhereIf(pagingSearchInput != null && pagingSearchInput.Search?.ImageType > -1, w => w.ImageType == pagingSearchInput.Search.ImageType)
+ .WhereIf(pagingSearchInput != null && pagingSearchInput.Search?.ImageType > 0, w => w.ImageType == pagingSearchInput.Search.ImageType)
.OrderByDescending(w => w.Id)
.Select(w => new
{
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 47f20d5..086b052 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
@@ -26,17 +26,12 @@ public class T_Model_ConfigService : ApplicationService 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.ModelName,w.Model,w.MaxTokens,w.ApiKey,w.Url,w.AnthropicVersion,w.CreateTime,w.UpdateTime,w.TenantId,w.SystemTemplate,
// w.LastModificationTime,
// w.CreationTime
})
diff --git a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Character_Type_Intimacy.cs b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Character_Type_Intimacy.cs
index 699fa8d..7b3b63e 100644
--- a/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Character_Type_Intimacy.cs
+++ b/admin-server/MiaoYu.Repository.ChatAI.Admin/Entities/Apps/T_Character_Type_Intimacy.cs
@@ -1,4 +1,4 @@
-namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps;
+namespace MiaoYu.Repository.ChatAI.Admin.Entities.Apps;
///
/// 角色和角色类型关联表
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 aa56d0e..1f5bf5e 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
@@ -21,7 +21,7 @@ public class T_Model_Config : DefaultEntityV4
///
- /// 输出token => 备注: 模型运行最大的max_tokens
+ /// max_tokens => 备注: 模型运行最大的max_tokens
///
public Int32 MaxTokens { get; set; }
@@ -55,5 +55,11 @@ public class T_Model_Config : DefaultEntityV4
///
public DateTime UpdateTime { get; set; }
+
+ ///
+ /// system上下文模板 => 备注: system上下文模板
+ ///
+ public string? SystemTemplate { 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 e44cf53..d5e90dd 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
@@ -424,7 +424,7 @@
- 输出token => 备注: 模型运行最大的max_tokens
+ max_tokens => 备注: 模型运行最大的max_tokens
@@ -452,6 +452,11 @@
修改时间 => 备注: 修改时间
+
+
+ system上下文模板 => 备注: system上下文模板
+
+
用户表