chengjie 4 miesięcy temu
rodzic
commit
70ad923583

+ 10 - 3
src/api/yjbdc/aiController.js

@@ -211,9 +211,7 @@ class AliyunAIProvider extends AIProvider {
211
         super();
211
         super();
212
 
212
 
213
         let url="https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions";
213
         let url="https://dashscope.aliyuncs.com/compatible-mode/v1/chat/completions";
214
-        // if (model=="llama-4-maverick-17b-128e-instruct")
215
-        //     url="https://dashscope.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation";
216
-
214
+        
217
         this.accessKey = config.aliyun.apikeyHLR;
215
         this.accessKey = config.aliyun.apikeyHLR;
218
         
216
         
219
         this.headers = {
217
         this.headers = {
@@ -437,6 +435,7 @@ class AIProviderFactory {
437
                 return new VolcesAIProvider("deepseek-v3-250324");
435
                 return new VolcesAIProvider("deepseek-v3-250324");
438
             case 'doubao-deepseek-r1-250528':
436
             case 'doubao-deepseek-r1-250528':
439
                 return new VolcesAIProvider("deepseek-r1-250528");
437
                 return new VolcesAIProvider("deepseek-r1-250528");
438
+
440
             case 'ali-qwen-plus':
439
             case 'ali-qwen-plus':
441
                 return new AliyunAIProvider("qwen-plus");
440
                 return new AliyunAIProvider("qwen-plus");
442
             case 'ali-qwen-max':
441
             case 'ali-qwen-max':
@@ -445,12 +444,20 @@ class AIProviderFactory {
445
                 return new AliyunAIProvider(providerLower);
444
                 return new AliyunAIProvider(providerLower);
446
             case 'llama-4-maverick-17b-128e-instruct':
445
             case 'llama-4-maverick-17b-128e-instruct':
447
                 return new AliyunAIProvider(providerLower);
446
                 return new AliyunAIProvider(providerLower);
447
+            case 'ali-deepseek-r1-0528':
448
+                return new AliyunAIProvider("deepseek-r1-0528");
449
+            case 'ali-Moonshot-Kimi-K2-Instruct':
450
+                return new AliyunAIProvider("Moonshot-Kimi-K2-Instruct");
451
+                
452
+
448
             case 'xf-yun-spark-x1':
453
             case 'xf-yun-spark-x1':
449
                 return new XunFeiYunAIProvider();
454
                 return new XunFeiYunAIProvider();
455
+
450
             case 'tencent-hunyuan-turbos-latest':
456
             case 'tencent-hunyuan-turbos-latest':
451
                 return new TencentHunyuanAIProvider("hunyuan-turbos-latest");
457
                 return new TencentHunyuanAIProvider("hunyuan-turbos-latest");
452
             case 'tencent-hunyuan-t1-latest':
458
             case 'tencent-hunyuan-t1-latest':
453
                 return new TencentHunyuanAIProvider("hunyuan-t1-latest");
459
                 return new TencentHunyuanAIProvider("hunyuan-t1-latest");
460
+
454
             case 'baidu-deepseek-v3':
461
             case 'baidu-deepseek-v3':
455
                 return new BaiduAIProvider();
462
                 return new BaiduAIProvider();
456
             case 'baidu-deepseek-r1':
463
             case 'baidu-deepseek-r1':

+ 14 - 7
src/api/yjbdc/yjbdcController.js

@@ -227,8 +227,6 @@ export async function GenerateArticle(ctx) {
227
                     break;
227
                     break;
228
                 }
228
                 }
229
             }
229
             }
230
-
231
-
232
             //console.log("content:"+content);
230
             //console.log("content:"+content);
233
             
231
             
234
             // 从请求参数中获取AI提供者,如果没有指定则使用默认值
232
             // 从请求参数中获取AI提供者,如果没有指定则使用默认值
@@ -242,12 +240,10 @@ export async function GenerateArticle(ctx) {
242
 
240
 
243
             //给用户一些比较好的体验
241
             //给用户一些比较好的体验
244
             if (params.AIVersion=="1.0"){
242
             if (params.AIVersion=="1.0"){
245
-                aiProvider = 'llama-4-scout-17b-16e-instruct';
243
+                aiProvider = 'ali-Moonshot-Kimi-K2-Instruct';
246
             }
244
             }
247
             else if (params.AIVersion=="1.5"){
245
             else if (params.AIVersion=="1.5"){
248
-                aiProvider = 'llama-4-maverick-17b-128e-instruct';
249
-                if (ctx.query.UserID==185 || ctx.query.UserID==1)
250
-                    aiProvider="doubao-deepseek-r1-250528";
246
+                aiProvider = 'ali-Moonshot-Kimi-K2-Instruct';
251
             }
247
             }
252
 
248
 
253
 
249
 
@@ -313,6 +309,7 @@ export async function GenerateArticle(ctx) {
313
                 let result3={};
309
                 let result3={};
314
                 result3.ID=idInsert.insertId;
310
                 result3.ID=idInsert.insertId;
315
                 result3.Content=result2;
311
                 result3.Content=result2;
312
+                result3.IsNew=true;
316
                 result = { errcode: 10000, result: result3 };
313
                 result = { errcode: 10000, result: result3 };
317
 
314
 
318
                 globalCache.set(url, result, config.BufferMemoryTime);
315
                 globalCache.set(url, result, config.BufferMemoryTime);
@@ -348,8 +345,18 @@ export async function GetYJBDCGenerateConfig(ctx) {
348
         delete result.ArticleStyle[i].English;
345
         delete result.ArticleStyle[i].English;
349
         delete result.ArticleStyle[i].Content;
346
         delete result.ArticleStyle[i].Content;
350
     }
347
     }
351
-    if (param.UserID>3){
348
+
349
+    
350
+    if (param.UserID>0){
352
         result.AIVersion.splice(2,result.AIVersion.length-2);
351
         result.AIVersion.splice(2,result.AIVersion.length-2);
352
+        if (param.UserID==185){
353
+            const configArr=constantClass.GetYJBDCGenerateConfig();
354
+            result.AIVersion.push(configArr.AIVersion[5]);
355
+        }
356
+        if (param.UserID==1){
357
+            const configArr=constantClass.GetYJBDCGenerateConfig();
358
+            result.AIVersion.push(configArr.AIVersion[6]);
359
+        }
353
     }
360
     }
354
     ctx.body = {"errcode": 10000, result:result};
361
     ctx.body = {"errcode": 10000, result:result};
355
 }
362
 }

+ 8 - 3
src/util/constant/index.js

@@ -33,14 +33,19 @@ export default {
33
             {Version:"1.5",BuildSecond:30,Model:"",Content:"深度表达,更多要素\n平均30秒生成",CSS:""},
33
             {Version:"1.5",BuildSecond:30,Model:"",Content:"深度表达,更多要素\n平均30秒生成",CSS:""},
34
             {Version:"db15",BuildSecond:30,Model:"doubao-1-5-pro-32k-250115",Content:"字节豆包1.5\n平均30秒生成",CSS:"Selected"},
34
             {Version:"db15",BuildSecond:30,Model:"doubao-1-5-pro-32k-250115",Content:"字节豆包1.5\n平均30秒生成",CSS:"Selected"},
35
             {Version:"db16",BuildSecond:60,Model:"doubao-seed-1-6-250615",Content:"字节豆包1.6\n平均60秒生成",CSS:""},
35
             {Version:"db16",BuildSecond:60,Model:"doubao-seed-1-6-250615",Content:"字节豆包1.6\n平均60秒生成",CSS:""},
36
-            {Version:"dp3",BuildSecond:60,Model:"doubao-deepseek-v3-250324",Content:"字节deepseek_v3\n平均60秒生成",CSS:""},
37
-            {Version:"dpr",BuildSecond:120,Model:"doubao-deepseek-r1-250528",Content:"字节deepseek_r1\n平均120秒生成",CSS:""},
36
+            {Version:"zdp3",BuildSecond:60,Model:"doubao-deepseek-v3-250324",Content:"字节deepseek_v3\n平均60秒生成",CSS:""},
37
+            {Version:"zdpr",BuildSecond:120,Model:"doubao-deepseek-r1-250528",Content:"字节deepseek_r1\n平均120秒生成",CSS:""},
38
+            
39
+            {Version:"akm",BuildSecond:30,Model:"ali-Moonshot-Kimi-K2-Instruct",Content:"阿里KimiK2\n平均30秒生成",CSS:""},
38
             {Version:"qwp",BuildSecond:30,Model:"ali-qwen-plus",Content:"阿里千问plus\n平均30秒生成",CSS:""},
40
             {Version:"qwp",BuildSecond:30,Model:"ali-qwen-plus",Content:"阿里千问plus\n平均30秒生成",CSS:""},
39
-            {Version:"qwm",BuildSecond:45,Model:"ali-qwen-plus",Content:"阿里千问Max\n平均45秒生成",CSS:""},
41
+            {Version:"qwm",BuildSecond:45,Model:"ali-qwen-max",Content:"阿里千问Max\n平均45秒生成",CSS:""},
40
             {Version:"lm4m",BuildSecond:15,Model:"llama-4-maverick-17b-128e-instruct",Content:"阿里脸书llama4maverick\n平均15秒生成",CSS:""},
42
             {Version:"lm4m",BuildSecond:15,Model:"llama-4-maverick-17b-128e-instruct",Content:"阿里脸书llama4maverick\n平均15秒生成",CSS:""},
41
             {Version:"lm4s",BuildSecond:20,Model:"llama-4-scout-17b-16e-instruct",Content:"阿里脸书llama4Scout\n平均20秒生成",CSS:""},
43
             {Version:"lm4s",BuildSecond:20,Model:"llama-4-scout-17b-16e-instruct",Content:"阿里脸书llama4Scout\n平均20秒生成",CSS:""},
44
+            {Version:"adpr",BuildSecond:120,Model:"ali-deepseek-r1-0528",Content:"阿里DeepSeekR1\n平均120秒生成",CSS:""},
45
+            
42
             {Version:"hytb",BuildSecond:30,Model:"tencent-hunyuan-turbos-latest",Content:"腾讯混元turbos\n平均30秒生成",CSS:""},
46
             {Version:"hytb",BuildSecond:30,Model:"tencent-hunyuan-turbos-latest",Content:"腾讯混元turbos\n平均30秒生成",CSS:""},
43
             {Version:"hyt1",BuildSecond:40,Model:"tencent-hunyuan-t1-latest",Content:"腾讯混元t1\n平均40秒生成",CSS:""},
47
             {Version:"hyt1",BuildSecond:40,Model:"tencent-hunyuan-t1-latest",Content:"腾讯混元t1\n平均40秒生成",CSS:""},
48
+            
44
             {Version:"x1",BuildSecond:60,Model:"xf-yun-spark-x1",Content:"讯飞sparkX1\n平均60秒生成",CSS:""},
49
             {Version:"x1",BuildSecond:60,Model:"xf-yun-spark-x1",Content:"讯飞sparkX1\n平均60秒生成",CSS:""},
45
             // {Version:"bde",BuildSecond:60,Model:"baidu-ernie-4.5-turbo-vl-32k-preview",Content:"百度ernie4.5turbo\n平均60秒生成",CSS:""},
50
             // {Version:"bde",BuildSecond:60,Model:"baidu-ernie-4.5-turbo-vl-32k-preview",Content:"百度ernie4.5turbo\n平均60秒生成",CSS:""},
46
         ];
51
         ];