1. 修改用户机器码管理(所有用户需要重新注册,激活)

2. 重构软件鉴权,添加自动判断机器码,可以不在手动点击确定
3. 新增软件启动时,提示用户是不是还存在等待中的任务,还有的话,由用户判断是不是丢弃,丢弃,会将所有的等待中的任务设置为失败
4. 聚合推文 提示词合并,人物、风格和场景 添加判无,修复部分情况无法合并
5. 新增 预设(人物,场景,风格)对提示词相关的提示
6. 修复 文案处理,流式输出内容重复问题,删除豆包(请求格式不兼容)
7. 新增 文案处理 输出内容一键格式化(注意:由于GPT输出的格式化有太多的不确定,不一定可以完全格式化,需要手动检查)
8. 聚合推文原创,新增时默认设置 修脸参数,初始和SD设置中的一致
9. 修复聚合推文选图覆盖 bug
This commit is contained in:
lq1405 2024-10-15 19:33:37 +08:00
parent 92c1d99efd
commit 224ee47984
101 changed files with 1354 additions and 1008 deletions

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "laitool",
"version": "3.1.4",
"version": "3.1.5",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "laitool",
"version": "3.1.4",
"version": "3.1.5",
"hasInstallScript": true,
"dependencies": {
"@alicloud/alimt20181012": "^1.2.0",

View File

@ -1,6 +1,6 @@
{
"name": "laitool",
"version": "3.1.4",
"version": "3.1.5",
"description": "An AI tool for image processing, video processing, and other functions.",
"main": "./out/main/index.js",
"author": "laitool.cn",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

View File

@ -1,53 +0,0 @@
<svg class="svg-canvas" viewBox="0 0 800 600" width="1600" height="1200" preserveAspectRatio="none" version="1.1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink">
<!--滤镜-->
<defs>
<filter id="filter_shadow_shape_HBt9Poo2sR" width="300%" height="300%" x="-100%" y="-100%">
<feDropShadow dx="7.431448254773942" dy="6.691306063588582" stdDeviation="1.2000000000000002" flood-color="#000000" flood-opacity="0.26"></feDropShadow>
</filter>
</defs>
<!--元素-->
<g id="shape_BG1gIWpILa" ref="shape_BG1gIWpILa" key="shape_BG1gIWpILa" mask="">
<g transform="translate(-82.01635169835797,-38.231795889017974) rotate(0,482.36560107022797,353.36560107022797) scale(1,1)" style="opacity: 1;mix-blend-mode: multiply;" filter="">
<!--普通元素-->
<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
xmlns:xlink="http://www.w3.org/1999/xlink" width="964.7312021404559" height="706.7312021404559" viewBox="0 0 964.7312021404559 706.7312021404559" data-ligature="true" data-parent="shape_BG1gIWpILa">
<g data-role="text" data-width="354.00141380959474" data-height="117" transform="translate(305.3648941654306, 294.86560107022797)">
<path d="M17.66-71.89L17.66-71.89Q19.68-69.97 28.03-67.96L28.03-67.96Q30.43-66.61 30.43-63.83L30.43-63.83L30.43-63.54Q30.43-60.18 25.05-59.42L25.05-59.42L24.48-58.46L24.48-56.44Q21.79-45.79 21.79-40.89L21.79-40.89L22.08-38.20L20.35-28.70L20.64-27.26Q19.10-16.70 19.10-15.65L19.10-15.65L19.39-15.65Q24.57-15.65 44.44-15.93L44.44-15.93Q46.55-15.65 46.84-15.65L46.84-15.65Q51.64-18.91 53.37-18.91L53.37-18.91L53.94-18.91Q54.52-17.76 54.81-17.76L54.81-17.76Q54.52-14.78 54.52-13.25L54.52-13.25L54.52-12.38Q54.52-10.75 55.38-7.87L55.38-7.87Q55.38-6.72 53.08-4.90L53.08-4.90Q51.54-4.90 51.54-5.47L51.54-5.47L48.57-5.18L44.73-5.18Q41.37-5.18 36.09-5.47L36.09-5.47L35.51-5.18Q34.46-5.47 34.27-5.47L34.27-5.47Q28.12-4.90 24.19-4.90L24.19-4.90L22.08-4.90Q20.64-4.90 17.09-4.03L17.09-4.03L14.11-4.32Q10.46-3.46 10.46-3.17L10.46-3.17Q10.08-3.17 6.91-7.87L6.91-7.87Q4.22-9.89 4.22-11.42L4.22-11.42Q4.22-12.29 6.05-15.65L6.05-15.65Q6.05-17.47 8.45-21.02L8.45-21.02Q13.15-42.62 13.15-61.72L13.15-61.72Q13.44-61.72 13.44-63.25L13.44-63.25L11.71-64.69Q12.09-66.23 16.41-69.78L16.41-69.78Q16.41-71.89 17.66-71.89Z" transform="translate(0 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="63.4155967830671" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
<path d="M24.19-39.64L24.19-39.64L25.72-39.64Q27.84-39.64 30.72-35.80L30.72-35.80L31.39-35.80Q33.12-37.63 35.80-37.63L35.80-37.63Q39.64-36.19 39.64-32.54L39.64-32.54L41.47-28.99Q41.47-28.51 40.89-26.30L40.89-26.30Q40.89-26.11 41.18-24.48L41.18-24.48Q39.07-19.39 39.07-18.24L39.07-18.24L39.07-17.37Q39.07-15.07 41.18-13.25L41.18-13.25L41.75-13.25Q43.77-13.25 45.88-16.22L45.88-16.22L48.57-17.09Q49.62-17.09 50.10-13.82L50.10-13.82Q48.86-8.45 48.86-7.58L48.86-7.58Q49.43-7.29 49.82-7.29L49.82-7.29Q48.38-4.61 45.59-4.61L45.59-4.61Q44.73-4.61 43.58-4.90L43.58-4.90Q41.95-4.61 40.31-4.61L40.31-4.61Q34.08-7.29 33.12-9.02L33.12-9.02Q26.49-3.65 25.05-3.65L25.05-3.65Q25.05-3.07 20.64-2.78L20.64-2.78Q12.57-2.78 9.31-8.16L9.31-8.16Q5.76-12.48 5.76-17.95L5.76-17.95L5.76-21.21Q5.76-31.48 16.80-37.91L16.80-37.91Q22.46-39.64 24.19-39.64ZM13.15-19.49L13.15-19.49Q14.40-10.56 16.51-10.56L16.51-10.56L19.10-10.56Q23.32-10.56 27.45-19.49L27.45-19.49Q30.43-24.57 30.43-28.99L30.43-28.99Q29.08-30.24 27.16-34.65L27.16-34.65L26.30-34.65Q21.21-34.65 15.55-27.74L15.55-27.74Q13.15-23.71 13.15-19.49Z" transform="translate(63.4155967830671 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="54.872813579942104" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
<path d="M14.30-56.34L14.30-56.34Q18.24-56.34 20.25-50.68L20.25-50.68Q20.25-49.05 16.13-46.55L16.13-46.55Q12.96-47.32 12.19-47.99L12.19-47.99Q11.71-47.71 11.04-47.71L11.04-47.71Q9.21-50.20 9.21-50.68L9.21-50.68Q9.89-56.06 14.01-56.06L14.01-56.06Q14.01-56.34 14.30-56.34ZM9.21-39.93L9.50-41.47L10.17-41.47Q11.52-41.47 13.15-41.18L13.15-41.18L14.88-41.47Q16.51-41.47 17.85-39.07L17.85-39.07Q16.99-29.76 16.99-21.79L16.99-21.79Q17.28-20.25 17.28-20.06L17.28-20.06L16.99-18.24Q17.28-15.65 17.28-15.26L17.28-15.26L16.99-13.53Q17.28-10.65 17.28-8.16L17.28-8.16L17.28-5.76Q17.28-5.47 17.57-5.47L17.57-5.47Q16.80-0.96 16.41-0.96L16.41-0.96Q15.84-1.25 15.45-1.25L15.45-1.25L15.17-0.67L15.45-0.10Q15.17 0.77 14.88 0.77L14.88 0.77Q13.92 0.19 13.15 0.19L13.15 0.19Q12.86 0.67 12.86 1.34L12.86 1.34L12.48 1.34Q6.24-4.32 6.24-7.58L6.24-7.58Q8.16-20.06 9.21-38.20L9.21-38.20L9.21-39.93Z" transform="translate(118.2884103630092 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="27.804669048692098" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
<path d="M56.25-68.05L56.25-68.05Q61.34-67.29 61.34-62.97L61.34-62.97L61.34-62.68Q61.14-60.76 56.54-57.30L56.54-57.30Q55.96-56.15 55.96-55.58L55.96-55.58L53.85-55.86L53.56-55.86Q52.98-55.86 52.98-55.00L52.98-55.00Q47.90-55.58 46.17-55.58L46.17-55.58L44.06-55.58Q37.53-55.58 37.53-53.46L37.53-53.46Q37.53-53.08 36.57-52.31L36.57-52.31L36.95-51.06L36.28-49.62L36.57-47.51Q36.57-46.17 36.28-43.67L36.28-43.67Q36.57-38.20 36.57-34.46L36.57-34.46Q36.57-33.79 36.28-31.20L36.28-31.20Q36.57-30.62 36.57-30.24L36.57-30.24L35.99-24.57Q36.28-23.04 36.28-21.31L36.28-21.31Q36.28-20.45 35.99-19.29L35.99-19.29Q36.28-17.66 36.28-16.32L36.28-16.32L36.28-14.49Q34.56-0.77 31.87-0.77L31.87-0.77Q30.81-0.48 30.62-0.48L30.62-0.48Q30.04-0.48 28.60-1.15L28.60-1.15L20.83-0.48L20.83-1.44L19.68-5.86Q21.79-5.86 25.05-37.72L25.05-37.72Q25.05-40.31 25.34-52.02L25.34-52.02L25.63-53.46L25.05-53.75Q14.30-53.46 14.30-52.89L14.30-52.89L12.77-53.18L9.21-52.02Q5.09-52.02 5.09-58.55L5.09-58.55Q4.80-58.55 3.55-60.95L3.55-60.95L3.55-62.10Q3.65-62.68 4.22-62.68L4.22-62.68L4.80-62.68Q6.82-62.68 8.06-61.53L8.06-61.53L9.50-62.10L11.61-61.82Q40.60-66.23 45.88-66.23L45.88-66.23L50.30-66.23Q56.25-67.57 56.25-68.05Z" transform="translate(146.0930794117013 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="68.2149131893171" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
<path d="M26.49-40.41L26.49-40.41Q44.63-33.31 44.63-24.67L44.63-24.67L44.63-22.27Q44.63-16.32 39.83-11.81L39.83-11.81Q36.86-6.43 30.62-4.13L30.62-4.13Q23.61-2.02 21.69-2.02L21.69-2.02Q13.73-2.02 6.82-12.09L6.82-12.09Q5.95-14.78 5.95-15.74L5.95-15.74L5.95-17.76Q7.01-31.20 8.64-31.20L8.64-31.20Q15.74-40.12 21.98-40.12L21.98-40.12L24.67-39.83Q25.92-40.41 26.49-40.41ZM27.64-30.33L24.96-30.33Q24.96-28.51 18.72-28.51L18.72-28.51L17.85-28.51Q14.88-28.51 13.05-21.69L13.05-21.69L13.05-19.01Q14.21-13.05 17.28-13.05L17.28-13.05Q17.37-12.48 17.85-12.48L17.85-12.48L21.12-12.48Q28.03-12.48 32.44-22.56L32.44-22.56L32.73-25.24Q31.77-30.33 27.64-30.33L27.64-30.33Z" transform="translate(214.30799260101838 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="54.200909283067105" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
<path d="M26.49-40.41L26.49-40.41Q44.63-33.31 44.63-24.67L44.63-24.67L44.63-22.27Q44.63-16.32 39.83-11.81L39.83-11.81Q36.86-6.43 30.62-4.13L30.62-4.13Q23.61-2.02 21.69-2.02L21.69-2.02Q13.73-2.02 6.82-12.09L6.82-12.09Q5.95-14.78 5.95-15.74L5.95-15.74L5.95-17.76Q7.01-31.20 8.64-31.20L8.64-31.20Q15.74-40.12 21.98-40.12L21.98-40.12L24.67-39.83Q25.92-40.41 26.49-40.41ZM27.64-30.33L24.96-30.33Q24.96-28.51 18.72-28.51L18.72-28.51L17.85-28.51Q14.88-28.51 13.05-21.69L13.05-21.69L13.05-19.01Q14.21-13.05 17.28-13.05L17.28-13.05Q17.37-12.48 17.85-12.48L17.85-12.48L21.12-12.48Q28.03-12.48 32.44-22.56L32.44-22.56L32.73-25.24Q31.77-30.33 27.64-30.33L27.64-30.33Z" transform="translate(268.5089018840855 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="54.200909283067105" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
<path d="M18.33-68.73L18.33-68.73Q22.56-67.86 22.56-66.71L22.56-66.71Q21.31-61.34 21.31-59.80L21.31-59.80L21.31-57.50Q20.16-35.04 18.72-21.12L18.72-21.12L18.72-19.10L19.58-19.10Q19.58-19.49 24.28-22.36L24.28-22.36Q27.64-25.34 28.22-25.34L28.22-25.34L28.22-24.76Q25.72-19.20 23.71-11.33L23.71-11.33Q20.16-7.68 20.16-5.38L20.16-5.38Q20.16-2.98 13.34-2.40L13.34-2.40Q13.34-2.11 13.05-2.11L13.05-2.11L5.86-5.95Q5.28-7.77 4.99-7.77L4.99-7.77Q5.57-9.31 5.57-13.15L5.57-13.15L5.57-13.44Q8.64-13.44 10.65-52.41L10.65-52.41Q11.23-62.20 11.23-64.60L11.23-64.60Q10.75-64.89 10.08-64.89L10.08-64.89L10.08-65.46Q10.65-67.77 13.63-68.44L13.63-68.44Q14.11-68.44 18.33-68.73Z" transform="translate(322.7098111671526 94) " fill="rgb(50, 113, 174)" stroke="rgb(50, 113, 174)" stroke-width="0.164" data-glyph-w="35.2916026424421" data-glyph-h="95.986328125" data-glyph-ascender="84.46796875000001" data-glyph-descender="-11.518359375000001" data-kerning="0"></path>
</g>
</svg>
</g>
</g>
<g id="shape_HBt9Poo2sR" ref="shape_HBt9Poo2sR" key="shape_HBt9Poo2sR" mask="">
<g transform="translate(290.23123855735,120) rotate(0,109.76876144264,68.206715750285) scale(1,1)" style="opacity: 1;mix-blend-mode: undefined;" filter="url(#filter_shadow_shape_HBt9Poo2sR)">
<!--普通元素-->
<svg version="1.1" id="圖層_1"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 -8.068921089172363 315.3833923339844 195.9689178466797" style="enable-background:new 0 0 304.3 187.9;" xml:space="preserve" width="219.53752288528" height="136.41343150057" class="style-removed" preserveAspectRatio="none" data-parent="shape_HBt9Poo2sR">
<g>
<path d="M214.9,124.7L214.9,124.7c1.3,4.5,2.7,9.1,4.2,13.7c12.6,40.3,27.1,42.9,27.1,42.9l4.4,0.4h0.3
c0,0,15.8-3.6,26.7-45c7.4-28.2,11.5-43.9,16.5-62h-64.6C225,91.1,220.3,107.5,214.9,124.7z" fill="rgb(50, 113, 174)" stroke-width="0"></path>
<path d="M88.6,6.5c-0.5-0.2-0.9-0.4-1.3-0.6h-2.8c0,0-13.2-1.6-22,30.7C52.8,72.3,44.9,105,33,141.8
c-14.7,45.5-33,46.1-33,46.1h72.9c0,0,16.6-3.6,27.5-46.3c9.1-35.9,12.6-52.2,19.5-77.5c-1.5-5.6-3.1-11.7-5-18.5
C105.9,13.5,90.3,7.2,88.6,6.5z" fill="rgb(50, 113, 174)" stroke-width="0"></path>
<path d="M212.7,140.4c-0.5-1.5-1-3.1-1.4-4.6c-11.1-36.2-18.8-68.7-28.1-104.1C175.3,1.4,163.6,0,161.6,0
c-0.2,0-0.3,0-0.3,0H90.8c-0.1,0-0.2,0.2-0.1,0.2c1.5,0.5,4.9,2,9.2,5.6c6.7,5.7,15.4,16.8,21.3,37.9c0.7,2.7,1.5,5.2,2.1,7.7
c8.6,31.4,11.7,47.7,21.8,88.6c10.9,44.1,27.5,47.8,27.5,47.8h72.8c-0.7-0.1-5-0.6-11-6.3C229.4,177.3,220.5,165.4,212.7,140.4z" fill="rgb(50, 113, 174)" stroke-width="0"></path>
<ellipse transform="matrix(0.8694 -0.4941 0.4941 0.8694 17.8966 137.5734)" cx="269.2" cy="34.9" rx="37" ry="28.4" fill="rgb(50, 113, 174)" stroke-width="0"></ellipse>
</g>
</svg>
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 183 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 566 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

View File

@ -131,6 +131,17 @@ export class BookBackTaskListService extends BaseRealmService {
}
}
/**
*
*/
GetAllStatusTaskCount(status: BookBackTaskStatus[]): number {
let taskLength = this.realm
.objects<BookBackTaskList>('BookBackTaskList').filtered(
'status == $0', status
).length;
return taskLength;
}
/**
*
* @param bookBackTask

View File

@ -144,7 +144,10 @@ export class BookTaskDetailService extends BaseRealmService {
bookTaskDetail.imageLock = false
bookTaskDetail.createTime = new Date()
bookTaskDetail.updateTime = new Date()
bookTaskDetail.adetailer = false // 先写死false
if (!bookTaskDetail.hasOwnProperty('adetailer')) {
bookTaskDetail.adetailer = false; // 设置默认值
}
// 开始添加
this.transaction(() => {
this.realm.create('BookTaskDetail', bookTaskDetail)

View File

@ -12,11 +12,11 @@ if (!app.isPackaged) {
tag_setting: path.join(__dirname, '../../resources/config/tag_setting.json'),
img_base: path.join(__dirname, '../../resources/config/img_base.json'),
video_config: path.join(__dirname, '../../resources/config/video_config.json'),
system_config: path.join(__dirname, '../../resources/config/system_config.json'),
scripts_path: path.join(__dirname, '../../resources/scripts'),
db_path: path.join(__dirname, '../../resources/scripts/db'),
project_path: path.join(__dirname, '../../project'),
tts_path: path.join(__dirname, '../../tts'),
logger_path: path.join(__dirname, '../../resources/logger'),
package_path: path.join(__dirname, '../../resources/package'),
image_path: path.join(__dirname, '../../resources/image'),
@ -80,6 +80,7 @@ if (!app.isPackaged) {
dynamic_setting: path.join(__dirname, '../../../resources/config/dynamic_setting.json'),
tag_setting: path.join(__dirname, '../../../resources/config/tag_setting.json'),
video_config: path.join(__dirname, '../../../resources/config/video_config.json'),
system_config: path.join(__dirname, '../../../resources/config/system_config.json'),
img_base: path.join(__dirname, '../../../resources/config/img_base.json'),
scripts_path: path.join(__dirname, '../../../resources/scripts'),
db_path: path.join(__dirname, '../../../resources/scripts/db'),

View File

@ -1,4 +1,9 @@
import { SYSTEM } from "./systemDefineString"
import TASK from "./taskDefineString"
export const DEFINE_STRING = {
SYSTEM: SYSTEM,
TASK: TASK,
SHOW_GLOBAL_MESSAGE: "SHOW_GLOBAL_MESSAGE",
SHOW_GLOBAL_MAIN_NOTIFICATION: 'SHOW_GLOBAL_MAIN_NOTIFICATION',
OPEN_DEV_TOOLS_PASSWORD: 'OPEN_DEV_TOOLS_PASSWORD',
@ -81,7 +86,6 @@ export const DEFINE_STRING = {
GET_ADETAILER_LIST: 'GET_ADETAILER_LIST',
SAVE_DETAILER_CONFIG: 'SAVE_DETAILER_CONFIG',
OPEN_URL: 'OPEN_URL',
GET_VERSION: 'GET_VERSION',
GET_FRAME_RETUN: 'GET_FRAME_RETUN',
DOWNLOAD_MODEL: 'DOWNLOAD_MODEL',
START_STORY_BOARDING: 'START_STORY_BOARDING',
@ -357,10 +361,6 @@ export const DEFINE_STRING = {
//#endregion
},
SYSTEM: {
OPEN_FILE: 'OPEN_FILE',
RETURN_LOGGER: 'RETURN_LOGGER'
},
SETTING: {
GET_DATA_BY_TYPE_AND_PROPERTY: 'GET_DATA_BY_TYPE_AND_PROPERTY',
SAVE_DATA_BY_TYPE_AND_PROPERTY: 'SAVE_DATA_BY_TYPE_AND_PROPERTY',
@ -420,19 +420,5 @@ export const DEFINE_STRING = {
UPDATE_BOOK_TASK_DETAIL_DATA: "UPDATE_BOOK_TASK_DETAIL_DATA",
UPDATE_BOOK_DATA: "UPDATE_BOOK_DATA",
UPDATE_SOFTWARE_SETTING: "UPDATE_SOFTWARE_SETTING"
},
/**
*
*/
TASK: {
/**
*
*/
ADD_BOOK_BACK_TASK: "ADD_BOOK_BACK_TASK",
/**
*
*/
ADD_MULTI_BOOK_BACK_TASK: 'ADD_MULTI_BOOK_BACK_TASK'
}
}

View File

@ -0,0 +1,12 @@
export const SYSTEM = {
/** 打开文件夹 */
OPEN_FILE: 'OPEN_FILE',
/** 返回日志写出 */
RETURN_LOGGER: 'RETURN_LOGGER',
/** 获取版本信息和显卡信息 */
GET_VISION_AND_GPU_MESSAGE: 'GET_VISION_AND_GPU_MESSAGE',
/** 获取机器码 */
GET_MACHINE_ID: "GET_MACHINE_ID",
/** 检查机器码状态 */
CHECK_MACHINE_STATUS : "CHECK_MACHINE_STATUS"
}

View File

@ -0,0 +1,14 @@
const TASK = {
/** 启动后台任务 */
START_BACK_TASK: "START_BACK_TASK",
/** 添加单个后台任务 */
ADD_BOOK_BACK_TASK: "ADD_BOOK_BACK_TASK",
/** 添加多个后台任务 */
ADD_MULTI_BOOK_BACK_TASK: 'ADD_MULTI_BOOK_BACK_TASK',
/** 获取等待中的任务 */
GET_ALL_STATUS_TASK_COUNT: "GET_ALL_STATUS_TASK_COUNT",
};
export default TASK;

View File

@ -11,7 +11,7 @@ import { SdIpc } from './sdIpc.js'
import { MainIpc } from './mainIpc.js'
import { GlobalIpc } from './globalIpc.js'
import { ImageIpc } from './imageIpc.js'
import { SystemIpc } from './systemIpc.js'
import { SystemIpc } from './systemIpc'
import { BookIpc } from './bookIpc'
import { TTSIpc } from './ttsIpc.js'
import { DBIpc } from './dbIpc'

View File

@ -1,39 +0,0 @@
import { ipcMain } from 'electron'
import { DEFINE_STRING } from '../../define/define_string'
import { CheckFileOrDirExist } from '../../define/Tools/file'
import { errorMessage, successMessage } from '../Public/generalTools'
import path from 'path'
const { shell } = require('electron')
function SystemIpc() {
// 打开指定的文件
ipcMain.on(DEFINE_STRING.SYSTEM.OPEN_FILE, async (event, value) => {
await shell.openPath(value)
})
// 试用文件资源打开指定的文件夹
ipcMain.handle(DEFINE_STRING.OPEN_FOLDER, async (event, value) => {
try {
let openFolder = null
if (value.baseProject) {
openFolder = path.join(global.config.project_path, value.folderPath)
}
if (value.dirFloder) {
openFolder = path.dirname(value.folderPath)
}
if (!openFolder) {
openFolder = value.folderPath
}
// 判断文件夹是不是存在
let isExist = await CheckFileOrDirExist(openFolder)
if (!isExist) {
throw new Error('文件夹不存在,请检查')
}
shell.openPath(openFolder)
return successMessage(null, '打开成功')
} catch (error) {
return errorMessage('打开文件夹错误,错误信息如下:' + error.message, 'SystemIpc_OPEN_FOLDER')
}
})
}
export { SystemIpc }

View File

@ -0,0 +1,30 @@
import { ipcMain } from 'electron'
import { DEFINE_STRING } from '../../define/define_string'
import { CheckFileOrDirExist } from '../../define/Tools/file'
import { errorMessage, successMessage } from '../Public/generalTools'
import path from 'path'
import { shell } from 'electron'
import SystemInfo from '../Service/system/systeminfo'
import ElectronInterface, { OpenFolderParams } from '../Service/system/electronInterface'
const systemInfo = new SystemInfo();
const electronInterface = new ElectronInterface()
function SystemIpc() {
/**打开指定的文件 */
ipcMain.on(DEFINE_STRING.SYSTEM.OPEN_FILE, async (event, value) => {
await shell.openPath(value)
})
/**试用文件资源打开指定的文件夹 */
ipcMain.handle(DEFINE_STRING.OPEN_FOLDER, async (event, value: OpenFolderParams) => await electronInterface.OpenFolder(value))
/**
* CPU
*
*/
ipcMain.handle(DEFINE_STRING.SYSTEM.GET_VISION_AND_GPU_MESSAGE, async (event) => await systemInfo.GetViosionAndGpuMessage())
/**获取系统的机器码 */
ipcMain.handle(DEFINE_STRING.SYSTEM.GET_MACHINE_ID, async (event) => await systemInfo.GetMachineId())
/** 检查机器码状态 */
ipcMain.handle(DEFINE_STRING.SYSTEM.CHECK_MACHINE_STATUS, async (event, value: string) => await systemInfo.CheckMachineStatus(value))
}
export { SystemIpc }

View File

@ -2,12 +2,16 @@ import { ipcMain } from "electron"
import { BookServiceBasic } from "../Service/ServiceBasic/bookServiceBasic"
import { DEFINE_STRING } from "../../define/define_string";
import { errorMessage, successMessage } from "../Public/generalTools";
import { BookBackTaskType, TaskExecuteType } from "../../define/enum/bookEnum";
import { BookBackTaskStatus, BookBackTaskType, TaskExecuteType } from "../../define/enum/bookEnum";
let bookServiceBasic = new BookServiceBasic();
import BackTaskService from '../Service/task/backTaskService'
const backTaskService = new BackTaskService()
function TaskIpc() {
ipcMain.handle(DEFINE_STRING.TASK.START_BACK_TASK, async (event, isGiveUp: boolean) => await backTaskService.StartBackTask(isGiveUp))
/**
*
*/
@ -34,6 +38,8 @@ function TaskIpc() {
return errorMessage(`添加多个任务失败,错误信息如下:${error.toString()} `, 'TaskIpc_AddMultiBookBackTask')
}
})
/** 获取指定状态的任务数量 */
ipcMain.handle(DEFINE_STRING.TASK.GET_ALL_STATUS_TASK_COUNT, async (event, value: BookBackTaskStatus[]) => await backTaskService.GetAllStatusTaskCount(value))
}
export { TaskIpc }

View File

@ -8,7 +8,7 @@ import { DEFINE_STRING } from "../../../define/define_string";
import path from 'path'
import { BasicReverse } from './basicReverse'
import { BookTaskDetailService } from '../../../define/db/service/Book/bookTaskDetailService'
import { TaskScheduler } from "../../Service/taskScheduler"
import { TaskScheduler } from "../task/taskScheduler"
import { Book } from '../../../model/book'
import { LoggerStatus, OtherData, ResponseMessageType } from '../../../define/enum/softwareEnum'
import { GeneralResponse } from '../../../model/generalResponse'

View File

@ -5,7 +5,7 @@ const { exec } = require('child_process')
const execAsync = util.promisify(exec)
import { define } from '../../../define/define'
import { BookService } from '../../../define/db/service/Book/bookService'
import { TaskScheduler } from '../taskScheduler'
import { TaskScheduler } from '../task/taskScheduler'
import { LoggerStatus, LoggerType, OtherData } from '../../../define/enum/softwareEnum'
import { errorMessage, successMessage } from '../../Public/generalTools'
import { CheckFileOrDirExist, CheckFolderExistsOrCreate } from '../../../define/Tools/file'

View File

@ -7,7 +7,7 @@ import { FfmpegOptions } from "../ffmpegOptions";
import { CheckFileOrDirExist, CopyFileOrFolder, DeleteFolderAllFile } from "../../../define/Tools/file";
import fs from 'fs';
import { Book } from "../../../model/book";
import { TaskScheduler } from '../taskScheduler';
import { TaskScheduler } from '../task/taskScheduler';
import { BookBasic } from "./BooKBasic";
import { LoggerStatus, OtherData } from "../../../define/enum/softwareEnum";
import { BasicReverse } from "./basicReverse";

View File

@ -155,9 +155,6 @@ export class BookTask {
return newBookTask
}
CopyCopywrittingData() {
}
/**
*

View File

@ -34,7 +34,9 @@ export class ImageStyle {
if (imageStyleRes.code == 0) {
throw new Error(imageStyleRes.message)
}
styleArr.push(...imageStyleRes.data);
if (imageStyleRes.data && imageStyleRes.data.length > 0) {
styleArr.push(...imageStyleRes.data);
}
}
// 获取自定义的风格
if (customizeImageStyle && customizeImageStyle.length > 0) {
@ -43,11 +45,13 @@ export class ImageStyle {
throw new Error(customizeImageStyleRes.message)
}
let customizeImageStyleArr = customizeImageStyleRes.data
for (let i = 0; i < customizeImageStyle.length; i++) {
const element = customizeImageStyle[i];
let style = customizeImageStyleArr.find(x => x.key == element)
if (style) {
styleArr.push(style)
if (customizeImageStyleArr) {
for (let i = 0; i < customizeImageStyle.length; i++) {
const element = customizeImageStyle[i];
let style = customizeImageStyleArr.find(x => x.key == element)
if (style) {
styleArr.push(style)
}
}
}
}

View File

@ -13,7 +13,7 @@ import { MJSetting } from "../../../model/Setting/mjSetting";
import { GeneralResponse } from "../../../model/generalResponse"
import { LoggerStatus, ResponseMessageType } from "../../../define/enum/softwareEnum";
import { ImageStyle } from "../Book/imageStyle";
import { TaskScheduler } from "../taskScheduler";
import { TaskScheduler } from "../task/taskScheduler";
import { Tools } from "../../../main/tools"
import { BookServiceBasic } from "../ServiceBasic/bookServiceBasic";
import { PresetService } from "../presetService";
@ -283,11 +283,12 @@ export class MJOpt {
for (let i = 0; i < ids.length; i++) {
const id = ids[i];
let scene = await this.presetService.GetScenePresetDetailById(id)
if (scene.code == 1) {
if (scene.code == 0) {
throw new Error(scene.message)
}
if (scene.data) {
// 这边开始拼接
sceneString += scene.data.prompt + ', '
} else {
throw new Error(scene.message)
}
}
return sceneString
@ -306,16 +307,17 @@ export class MJOpt {
for (let i = 0; i < ids.length; i++) {
const element = ids[i];
let character = await this.presetService.GetCharacterPresetDetailById(element)
if (character.code == 1) {
if (character.code == 0) {
throw new Error(character.message)
}
if (character.data) {
characterString += character.data.prompt + ', '
if (character.data.image_url && character.data.image_url != '' && character.data.cref_cw) {
characterUrl += ` ${character.data.image_url} `
crefCw = character.data.cref_cw
}
}
else {
throw new Error(character.message)
}
}
//这边坐下合并s
@ -399,6 +401,7 @@ export class MJOpt {
let characterString = '' // 人物
let characterUrl = ''
let sceneString = "" // 场景
// 获取当前的自定义风格的垫图字符串
if (book.type == BookType.ORIGINAL) {
let sceneIds = element.sceneTags ? element.sceneTags : []
@ -594,7 +597,7 @@ export class MJOpt {
let imagePath = path.join(book.bookFolderPath, `data\\MJOriginalImage\\${task_res.messageId}.png`);
await CheckFolderExistsOrCreate(path.dirname(imagePath))
await this.tools.downloadFileUrl(task_res.imageClick, imagePath)
debugger
// 进行图片裁剪
let imageRes = await ImageSplit(imagePath, bookTaskDetail.name, path.join(book.bookFolderPath, 'data\\MJOriginalImage'));
if (imageRes && imageRes.length < 4) {
@ -608,7 +611,7 @@ export class MJOpt {
}
let out_file = path.join(bookTask.imageFolder, `${bookTaskDetail.name}.png`)
await CopyFileOrFolder(firstImage, out_file);
task_res.outImagePath = firstImage;
task_res.outImagePath = out_file;
task_res.subImagePath = imageRes;
task_res.id = task.bookTaskDetailId;

View File

@ -0,0 +1,78 @@
import { BookBackTaskStatus, BookBackTaskType, TaskExecuteType } from "../../../define/enum/bookEnum";
import { BookBackTaskListService } from "../../../define/db/service/Book/bookBackTaskListService";
import { Book } from "../../../model/book";
export default class BookBackTaskServiceBasic {
bookBackTaskListService: BookBackTaskListService
constructor() { }
private async InitService() {
if (!this.bookBackTaskListService) {
this.bookBackTaskListService = await BookBackTaskListService.getInstance()
}
}
/**
*
* @param bookId ID
* @param taskType
* @param executeType
* @param bookTaskId ID
* @param bookTaskDetailId ID
* @param responseMessageName
*/
async AddBookBackTask(bookId: string,
taskType: BookBackTaskType,
executeType = TaskExecuteType.AUTO,
bookTaskId = null,
bookTaskDetailId = null,
responseMessageName: string = null
): Promise<TaskModal.Task> {
await this.InitService();
let res = this.bookBackTaskListService.AddBookBackTask(bookId, taskType, executeType, bookTaskId, bookTaskDetailId, responseMessageName)
if (res.code == 0) {
throw new Error(res.message)
}
return res.data as TaskModal.Task
}
/**
*
* @param status
* @returns
*/
async GetAllStatusTaskCount(status: BookBackTaskStatus[]): Promise<number> {
await this.InitService();
let count = this.bookBackTaskListService.GetAllStatusTaskCount(status)
return count;
}
/**
*
* @param bookBackTask
*/
async UpdateTaskStatus(bookBackTask: Book.UpdateBookTaskListStatus) {
await this.InitService();
this.bookBackTaskListService.UpdateTaskStatus(bookBackTask)
}
/**
*
*/
async GiveUpNotStartBackTask() {
await this.InitService();
let task = this.bookBackTaskListService.realm.objects('BookBackTaskList').filtered('status == $0 || status == $1', BookBackTaskStatus.WAIT, BookBackTaskStatus.RECONNECT);
let ids = task.map((item) => {
return item.id
})
// 讲所有的人物状态改为放弃然后errmessage改为 此任务已丢弃
this.bookBackTaskListService.transaction(() => {
for (let i = 0; i < ids.length; i++) {
const element = this.bookBackTaskListService.realm.objectForPrimaryKey('BookBackTaskList', ids[i]);
element.status = BookBackTaskStatus.FAIL
element.errorMessage = '任务被丢弃'
}
})
}
}

View File

@ -0,0 +1,57 @@
import { BookService } from "../../../define/db/service/Book/bookService";
import { Book } from "../../../model/book";
export class BookBasic {
bookService: BookService
constructor() { }
async InitService() {
if (!this.bookService) {
this.bookService = await BookService.getInstance()
}
}
//#region 事务操作
async transaction(callback: (realm: any) => void) {
await this.InitService();
this.bookService.transaction(() => {
callback(this.bookService.realm)
})
}
//#endregion
/**
* ID获取小说数据
* @param bookId ID
* @returns
*/
async GetBookDataById(bookId: string): Promise<Book.SelectBook> {
await this.InitService();
let book = this.bookService.GetBookDataById(bookId);
if (book == null) {
let msg = '未找到对应的小说数据,请检查'
throw new Error(msg);
}
return book
}
/**
* ID的数据
* @param bookId ID
* @param data
*/
async UpdateBookData(bookId: string, data: Book.SelectBook): Promise<Book.SelectBook> {
await this.InitService();
let res = this.bookService.UpdateBookData(bookId, data)
return res
}
/**
*
* @param bookId ID
*/
async DeleteBookData(bookId: string): Promise<void> {
await this.InitService();
this.bookService.DeleteBookData(bookId)
}
}

View File

@ -2,39 +2,28 @@ import { DEFINE_STRING } from "../../../define/define_string";
import { GeneralResponse } from "../../../model/generalResponse";
import { BookService } from "../../../define/db/service/Book/bookService";
import { Book } from "../../../model/book";
import { BookTaskService } from "../../../define/db/service/Book/bookTaskService";
import { TaskScheduler } from "../taskScheduler";
import { LoggerStatus, OtherData } from "../../../define/enum/softwareEnum";
import { BookTaskDetailService } from "../../../define/db/service/Book/bookTaskDetailService";
import { BookBackTaskListService } from "../../../define/db/service/Book/bookBackTaskListService";
import { BookBackTaskType, BookTaskStatus, TaskExecuteType } from "../../../define/enum/bookEnum";
import { BookBackTaskStatus, BookBackTaskType, BookTaskStatus, TaskExecuteType } from "../../../define/enum/bookEnum";
import BookBackTaskServiceBasic from "./bookBackTaskServiceBasic";
import { BookBasic } from "./bookBasic";
import BookTaskServiceBasic from "./bookTaskServiceBasic";
import BookTaskDetailServiceBasic from "./bookTaskDetailServiceBasic";
/**
*
* 便
*/
export class BookServiceBasic {
class BookServiceBasic {
bookService: BookService
bookTaskService: BookTaskService;
taskScheduler: TaskScheduler
bookTaskDetailService: BookTaskDetailService
bookBackTaskListService: BookBackTaskListService
private bookBasic: BookBasic
private bookTaskServiceBasic: BookTaskServiceBasic
private bookTaskDetailServiceBasic: BookTaskDetailServiceBasic
private bookBackTaskServiceBasic: BookBackTaskServiceBasic
constructor() {
this.taskScheduler = new TaskScheduler()
}
async InitService() {
if (!this.bookService) {
this.bookService = await BookService.getInstance()
}
if (!this.bookTaskService) {
this.bookTaskService = await BookTaskService.getInstance()
}
if (!this.bookTaskDetailService) {
this.bookTaskDetailService = await BookTaskDetailService.getInstance()
}
if (!this.bookBackTaskListService) {
this.bookBackTaskListService = await BookBackTaskListService.getInstance()
}
this.bookBasic = new BookBasic();
this.bookTaskServiceBasic = new BookTaskServiceBasic();
this.bookTaskDetailServiceBasic = new BookTaskDetailServiceBasic();
this.bookBackTaskServiceBasic = new BookBackTaskServiceBasic();
}
// 主动返回前端的消息
@ -42,298 +31,65 @@ export class BookServiceBasic {
global.newWindow[0].win.webContents.send(message_name, data)
}
//#region 事务操作
transaction(callback: (realm: any) => void) {
this.bookService.transaction(() => {
callback(this.bookService.realm)
})
}
transaction = async (realm : any) => await this.bookBasic.transaction(realm);
// (callback: (realm: any) => void) {
// this.bookService.transaction(() => {
// callback(this.bookService.realm)
// })
// }
//#endregion
//#region 小说任务
GetBookDataById = async (bookId: string) => await this.bookBasic.GetBookDataById(bookId);
UpdateBookData = async (bookId: string, data: Book.SelectBook) => await this.bookBasic.UpdateBookData(bookId, data);
DeleteBookData = async (bookId: string) => await this.bookBasic.DeleteBookData(bookId);
//#endregion
//#region 小说相关的基础服务
//#region 批次任务任
/**
* ID获取小说数据
* @param bookId ID
* @returns
*/
async GetBookDataById(bookId: string): Promise<Book.SelectBook> {
await this.InitService();
let book = this.bookService.GetBookDataById(bookId);
if (book == null) {
let msg = '未找到对应的小说数据,请检查'
throw new Error(msg);
}
return book
}
/**
* ID的数据
* @param bookId ID
* @param data
*/
async UpdateBookData(bookId: string, data: Book.SelectBook): Promise<Book.SelectBook> {
await this.InitService();
let res = this.bookService.UpdateBookData(bookId, data)
return res
}
/**
*
* @param bookId ID
*/
async DeleteBookData(bookId: string): Promise<void> {
await this.InitService();
this.bookService.DeleteBookData(bookId)
}
GetBookTaskDataById = async (bookTaskId: string) => await this.bookTaskServiceBasic.GetBookTaskDataById(bookTaskId);
GetBookTaskData = async (bookTaskCondition: Book.QueryBookTaskCondition) => await this.bookTaskServiceBasic.GetBookTaskData(bookTaskCondition);
GetMaxBookTaskNo = async (bookId: string) => await this.bookTaskServiceBasic.GetMaxBookTaskNo(bookId);
UpdetedBookTaskData = async (bookTaskId: string, data: Book.SelectBookTask) => await this.bookTaskServiceBasic.UpdetedBookTaskData(bookTaskId, data);
ResetBookTask = async (bookTaskId: string) => await this.bookTaskServiceBasic.ResetBookTask(bookTaskId);
DeleteBookTaskData = async (bookTaskId: string) => await this.bookTaskServiceBasic.DeleteBookTaskData(bookTaskId);
GetBookAndTask = async (bookId: string, bookTaskName: string) => await this.bookTaskServiceBasic.GetBookAndTask(bookId, bookTaskName);
//#endregion
//#region 小说批次任务相关的基础服务
/**
* ID获取小说批次任务数据
* @param bookTaskId ID
* @returns
*/
async GetBookTaskDataById(bookTaskId: string): Promise<Book.SelectBookTask> {
await this.InitService();
let bookTask = this.bookTaskService.GetBookTaskDataById(bookTaskId);
if (bookTask == null) {
let msg = '未找到对应的小说批次任务数据,请检查';
throw new Error(msg);
}
return bookTask
}
/**
*
* @param bookTaskCondition
*/
async GetBookTaskData(bookTaskCondition: Book.QueryBookTaskCondition): Promise<{ bookTasks: Book.SelectBookTask[], total: number }> {
await this.InitService();
let bookTasks = this.bookTaskService.GetBookTaskData(bookTaskCondition)
if (bookTasks.data.bookTasks.length <= 0 || bookTasks.data.total <= 0) {
throw new Error("未找到对应的小说批次任务数据,请检查")
}
return bookTasks.data
}
/**
*
* @param bookId ID
*/
async GetMaxBookTaskNo(bookId: string): Promise<number> {
await this.InitService();
let maxNo = this.bookTaskService.realm
.objects('BookTask')
.filtered('bookId = $0', bookId)
.max('no')
let no = maxNo == null ? 1 : Number(maxNo) + 1
return no
}
/**
*
* @param bookTaskId ID
* @param data
*/
async UpdetedBookTaskData(bookTaskId: string, data: Book.SelectBookTask): Promise<void> {
await this.InitService();
this.bookTaskService.UpdetedBookTaskData(bookTaskId, data)
}
/**
*
* @param bookTaskId ID
*/
async ResetBookTask(bookTaskId: string): Promise<void> {
await this.InitService();
this.bookTaskService.ResetBookTask(bookTaskId)
}
/**
*
* @param bookTaskId ID
*/
async DeleteBookTaskData(bookTaskId: string): Promise<void> {
await this.InitService();
this.bookTaskService.DeleteBookTask(bookTaskId)
}
//#endregion
//#region 小说批次任务对应的分镜的相关的基础服务
async AddBookTaskDetail(bookTaskDetail: Book.SelectBookTaskDetail): Promise<void> {
await this.InitService();
this.bookTaskDetailService.AddBookTaskDetail(bookTaskDetail)
}
/**
* ID
* @param bookTaskDetailId ID
* @returns
*/
async GetBookTaskDetailDataById(bookTaskDetailId: string): Promise<Book.SelectBookTaskDetail> {
await this.InitService();
let bookTaskDetail = this.bookTaskDetailService.GetBookTaskDetailDataById(bookTaskDetailId)
if (bookTaskDetail == null) {
let msg = "未找到对应的小说批次任务分镜数据,请检查"
global.logger.error('BookServiceBasic_GetBookTaskDetailDataById', msg);
throw new Error("未找到对应的小说批次任务分镜数据,请检查")
}
return bookTaskDetail
}
/**
*
* @param condition
* @param returnEmpty false
*/
async GetBookTaskDetailData(condition: Book.QueryBookTaskDetailCondition, returnEmpty: boolean = false): Promise<Book.SelectBookTaskDetail[]> {
await this.InitService();
let bookTaskDetails = this.bookTaskDetailService.GetBookTaskData(condition)
if (!returnEmpty && bookTaskDetails.data.length <= 0) {
let msg = "未找到对应的小说批次任务分镜数据,请检查";
throw new Error(msg)
}
return bookTaskDetails.data
}
/**
* ID
* @param bookTaskDetailId ID
* @param data
*/
async UpdateBookTaskDetail(bookTaskDetailId: string, data: Book.SelectBookTaskDetail): Promise<Book.SelectBookTaskDetail> {
await this.InitService();
let res = this.bookTaskDetailService.UpdateBookTaskDetail(bookTaskDetailId, data)
return res
}
/**
*
* @param bookTaskId ID
* @param status
* @param errorMsg
*/
async UpdateBookTaskStatus(bookTaskId: string, status: BookTaskStatus, errorMsg: string | null = null): Promise<void> {
await this.InitService();
this.bookTaskService.UpdateBookTaskStatus(bookTaskId, status, errorMsg);
}
//#region 分镜任务
/**
*
* @param bookTaskDetail
*/
async DeleteBookTaskDetailReversePromptById(bookTaskDetailId: string): Promise<void> {
await this.InitService();
this.bookTaskDetailService.DeleteBookTaskDetailReversePromptById(bookTaskDetailId)
}
/**
*
* @param bookTaskDetailId
*/
async DeleteBoookTaskDetailGenerateImage(bookTaskDetailId: string): Promise<void> {
await this.InitService()
this.bookTaskDetailService.DeleteBoookTaskDetailGenerateImage(bookTaskDetailId);
}
/**
*
* @param bookTaskDetailId ID
* @param reversePromptId ID
* @param data
*/
async UpdateBookTaskDetailReversePrompt(bookTaskDetailId: string, reversePromptId: string, data: Book.ReversePrompt): Promise<void> {
await this.InitService();
this.bookTaskDetailService.UpdateBookTaskDetailReversePrompt(bookTaskDetailId, reversePromptId, data)
}
/**
* MJ消息
* @param bookTaskDetailId
* @param mjMessage
*/
async UpdateBookTaskDetailMjMessage(bookTaskDetailId: string, mjMessage: Book.MJMessage) {
await this.InitService();
this.bookTaskDetailService.UpdateBookTaskDetailMjMessage(bookTaskDetailId, mjMessage)
}
AddBookTaskDetail = async (bookTaskDetail: Book.SelectBookTaskDetail) => await this.bookTaskDetailServiceBasic.AddBookTaskDetail(bookTaskDetail);
GetBookTaskDetailDataById = async (bookTaskDetailId: string) => await this.bookTaskDetailServiceBasic.GetBookTaskDetailDataById(bookTaskDetailId);
GetBookTaskDetailData = async (condition: Book.QueryBookTaskDetailCondition, returnEmpty: boolean = false) => await this.bookTaskDetailServiceBasic.GetBookTaskDetailData(condition, returnEmpty);
UpdateBookTaskDetail = async (bookTaskDetailId: string, data: Book.SelectBookTaskDetail) => await this.bookTaskDetailServiceBasic.UpdateBookTaskDetail(bookTaskDetailId, data);
UpdateBookTaskStatus = async (bookTaskDetailId: string, status: BookTaskStatus) => await this.bookTaskDetailServiceBasic.UpdateBookTaskStatus(bookTaskDetailId, status);
DeleteBookTaskDetailReversePromptById = async (bookTaskDetailId: string, reversePromptId: string) => await this.bookTaskDetailServiceBasic.DeleteBookTaskDetailReversePromptById(bookTaskDetailId);
DeleteBoookTaskDetailGenerateImage = async (bookTaskDetailId: string) => await this.bookTaskDetailServiceBasic.DeleteBoookTaskDetailGenerateImage(bookTaskDetailId);
UpdateBookTaskDetailReversePrompt = async (bookTaskDetailId: string, reversePromptId: string, data: Book.ReversePrompt) => await this.bookTaskDetailServiceBasic.UpdateBookTaskDetailReversePrompt(bookTaskDetailId, reversePromptId, data);
UpdateBookTaskDetailMjMessage = async (bookTaskDetailId: string, mjMessage: Book.MJMessage) => await this.bookTaskDetailServiceBasic.UpdateBookTaskDetailMjMessage(bookTaskDetailId, mjMessage);
//#endregion
//#region 小说后台任务相关操作
//#region 后台任务
/**
*
* @param bookId ID
* @param taskType
* @param executeType
* @param bookTaskId ID
* @param bookTaskDetailId ID
* @param responseMessageName
*/
async AddBookBackTask(bookId: string,
AddBookBackTask = async (bookId: string,
taskType: BookBackTaskType,
executeType = TaskExecuteType.AUTO,
bookTaskId = null,
bookTaskDetailId = null,
responseMessageName: string = null
): Promise<TaskModal.Task> {
executeType: TaskExecuteType,
bookTaskId: string,
bookTaskDetailId: string,
responseMessageName: string) => await this.bookBackTaskServiceBasic.AddBookBackTask(bookId, taskType, executeType, bookTaskId, bookTaskDetailId, responseMessageName);
GetAllStatusTaskCount = async (status: BookBackTaskStatus[]) => await this.bookBackTaskServiceBasic.GetAllStatusTaskCount(status);
UpdateTaskStatus = async (bookBackTask: Book.UpdateBookTaskListStatus) => await this.bookBackTaskServiceBasic.UpdateTaskStatus(bookBackTask);
GiveUpNotStartBackTask = async () => await this.bookBackTaskServiceBasic.GiveUpNotStartBackTask();
await this.InitService();
let res = this.bookBackTaskListService.AddBookBackTask(bookId, taskType, executeType, bookTaskId, bookTaskDetailId, responseMessageName)
if (res.code == 0) {
throw new Error(res.message)
}
return res.data as TaskModal.Task
}
//#endregion
/**
* ID和小说批次任务ID获取小说和小说批次任务数据
* @param bookId ID
* @param bookTaskName ID
* @returns
*/
async GetBookAndTask(bookId: string, bookTaskName: string) {
await this.InitService();
let book = this.bookService.GetBookDataById(bookId)
if (book == null) {
throw new Error("查找小说数据失败");
}
// 获取小说对应的批次任务数据,默认初始化为第一个
let condition = {
bookId: bookId
} as Book.QueryBookBackTaskCondition
if (bookTaskName == "output_00001") {
condition["name"] = bookTaskName
} else {
condition["id"] = bookTaskName
}
let bookTaskRes = this.bookTaskService.GetBookTaskData(condition)
if (bookTaskRes.data.bookTasks.length <= 0 || bookTaskRes.data.total <= 0) {
let msg = "没有找到对应的小说批次任务数据"
this.taskScheduler.AddLogToDB(bookId, book.type, msg, OtherData.DEFAULT, LoggerStatus.FAIL)
throw new Error(msg)
}
return { book: book as Book.SelectBook, bookTask: bookTaskRes.data.bookTasks[0] as Book.SelectBookTask }
}
/**
*
* @param bookBackTask
*/
async UpdateTaskStatus(bookBackTask: Book.UpdateBookTaskListStatus) {
await this.InitService();
this.bookBackTaskListService.UpdateTaskStatus(bookBackTask)
}
}
export { BookServiceBasic };

View File

@ -0,0 +1,122 @@
import { BookTaskDetailService } from "../../../define/db/service/Book/bookTaskDetailService";
import { BookTaskStatus } from "../../../define/enum/bookEnum";
import { Book } from "../../../model/book";
import { BookTaskService } from "../../../define/db/service/Book/bookTaskService";
export default class BookTaskDetailServiceBasic {
bookTaskDetailService: BookTaskDetailService
bookTaskService: BookTaskService
constructor() { }
private async InitService() {
if (!this.bookTaskDetailService) {
this.bookTaskDetailService = await BookTaskDetailService.getInstance()
}
if (!this.bookTaskService) {
this.bookTaskService = await BookTaskService.getInstance()
}
}
/**
*
* @param bookTaskDetail
*/
async AddBookTaskDetail(bookTaskDetail: Book.SelectBookTaskDetail): Promise<void> {
await this.InitService();
this.bookTaskDetailService.AddBookTaskDetail(bookTaskDetail)
}
/**
* ID
* @param bookTaskDetailId ID
* @returns
*/
async GetBookTaskDetailDataById(bookTaskDetailId: string): Promise<Book.SelectBookTaskDetail> {
await this.InitService();
let bookTaskDetail = this.bookTaskDetailService.GetBookTaskDetailDataById(bookTaskDetailId)
if (bookTaskDetail == null) {
let msg = "未找到对应的小说批次任务分镜数据,请检查"
global.logger.error('BookServiceBasic_GetBookTaskDetailDataById', msg);
throw new Error("未找到对应的小说批次任务分镜数据,请检查")
}
return bookTaskDetail
}
/**
*
* @param condition
* @param returnEmpty false
*/
async GetBookTaskDetailData(condition: Book.QueryBookTaskDetailCondition, returnEmpty: boolean = false): Promise<Book.SelectBookTaskDetail[]> {
await this.InitService();
let bookTaskDetails = this.bookTaskDetailService.GetBookTaskData(condition)
if (!returnEmpty && bookTaskDetails.data.length <= 0) {
let msg = "未找到对应的小说批次任务分镜数据,请检查";
throw new Error(msg)
}
return bookTaskDetails.data
}
/**
* ID
* @param bookTaskDetailId ID
* @param data
*/
async UpdateBookTaskDetail(bookTaskDetailId: string, data: Book.SelectBookTaskDetail): Promise<Book.SelectBookTaskDetail> {
await this.InitService();
let res = this.bookTaskDetailService.UpdateBookTaskDetail(bookTaskDetailId, data)
return res
}
/**
*
* @param bookTaskId ID
* @param status
* @param errorMsg
*/
async UpdateBookTaskStatus(bookTaskId: string, status: BookTaskStatus, errorMsg: string | null = null): Promise<void> {
await this.InitService();
this.bookTaskService.UpdateBookTaskStatus(bookTaskId, status, errorMsg);
}
/**
*
* @param bookTaskDetail
*/
async DeleteBookTaskDetailReversePromptById(bookTaskDetailId: string): Promise<void> {
await this.InitService();
this.bookTaskDetailService.DeleteBookTaskDetailReversePromptById(bookTaskDetailId)
}
/**
*
* @param bookTaskDetailId
*/
async DeleteBoookTaskDetailGenerateImage(bookTaskDetailId: string): Promise<void> {
await this.InitService()
this.bookTaskDetailService.DeleteBoookTaskDetailGenerateImage(bookTaskDetailId);
}
/**
*
* @param bookTaskDetailId ID
* @param reversePromptId ID
* @param data
*/
async UpdateBookTaskDetailReversePrompt(bookTaskDetailId: string, reversePromptId: string, data: Book.ReversePrompt): Promise<void> {
await this.InitService();
this.bookTaskDetailService.UpdateBookTaskDetailReversePrompt(bookTaskDetailId, reversePromptId, data)
}
/**
* MJ消息
* @param bookTaskDetailId
* @param mjMessage
*/
async UpdateBookTaskDetailMjMessage(bookTaskDetailId: string, mjMessage: Book.MJMessage) {
await this.InitService();
this.bookTaskDetailService.UpdateBookTaskDetailMjMessage(bookTaskDetailId, mjMessage)
}
}

View File

@ -0,0 +1,118 @@
import { BookTaskService } from "../../../define/db/service/Book/bookTaskService";
import { Book } from "../../../model/book";
import { BookService } from "../../../define/db/service/Book/bookService";
export default class BookTaskServiceBasic {
bookTaskService: BookTaskService
bookService: BookService
constructor() { }
private async InitService() {
if (!this.bookTaskService) {
this.bookTaskService = await BookTaskService.getInstance()
}
if (!this.bookService) {
this.bookService = await BookService.getInstance()
}
}
/**
* ID获取小说批次任务数据
* @param bookTaskId ID
* @returns
*/
async GetBookTaskDataById(bookTaskId: string): Promise<Book.SelectBookTask> {
await this.InitService();
let bookTask = this.bookTaskService.GetBookTaskDataById(bookTaskId);
if (bookTask == null) {
let msg = '未找到对应的小说批次任务数据,请检查';
throw new Error(msg);
}
return bookTask
}
/**
*
* @param bookTaskCondition
*/
async GetBookTaskData(bookTaskCondition: Book.QueryBookTaskCondition): Promise<{ bookTasks: Book.SelectBookTask[], total: number }> {
await this.InitService();
let bookTasks = this.bookTaskService.GetBookTaskData(bookTaskCondition)
if (bookTasks.data.bookTasks.length <= 0 || bookTasks.data.total <= 0) {
throw new Error("未找到对应的小说批次任务数据,请检查")
}
return bookTasks.data
}
/**
*
* @param bookId ID
*/
async GetMaxBookTaskNo(bookId: string): Promise<number> {
await this.InitService();
let maxNo = this.bookTaskService.realm
.objects('BookTask')
.filtered('bookId = $0', bookId)
.max('no')
let no = maxNo == null ? 1 : Number(maxNo) + 1
return no
}
/**
*
* @param bookTaskId ID
* @param data
*/
async UpdetedBookTaskData(bookTaskId: string, data: Book.SelectBookTask): Promise<void> {
await this.InitService();
this.bookTaskService.UpdetedBookTaskData(bookTaskId, data)
}
/**
*
* @param bookTaskId ID
*/
async ResetBookTask(bookTaskId: string): Promise<void> {
await this.InitService();
this.bookTaskService.ResetBookTask(bookTaskId)
}
/**
*
* @param bookTaskId ID
*/
async DeleteBookTaskData(bookTaskId: string): Promise<void> {
await this.InitService();
this.bookTaskService.DeleteBookTask(bookTaskId)
}
/**
* ID和小说批次任务ID获取小说和小说批次任务数据
* @param bookId ID
* @param bookTaskName ID
* @returns
*/
async GetBookAndTask(bookId: string, bookTaskName: string) {
await this.InitService();
let book = this.bookService.GetBookDataById(bookId)
if (book == null) {
throw new Error("查找小说数据失败");
}
// 获取小说对应的批次任务数据,默认初始化为第一个
let condition = {
bookId: bookId
} as Book.QueryBookBackTaskCondition
if (bookTaskName == "output_00001") {
condition["name"] = bookTaskName
} else {
condition["id"] = bookTaskName
}
let bookTaskRes = this.bookTaskService.GetBookTaskData(condition)
if (bookTaskRes.data.bookTasks.length <= 0 || bookTaskRes.data.total <= 0) {
let msg = "没有找到对应的小说批次任务数据"
throw new Error(msg)
}
return { book: book as Book.SelectBook, bookTask: bookTaskRes.data.bookTasks[0] as Book.SelectBookTask }
}
}

View File

@ -16,7 +16,7 @@ import fs from 'fs'
import { GeneralResponse } from '../../../model/generalResponse'
import { BookServiceBasic } from '../ServiceBasic/bookServiceBasic'
import { LoggerStatus, OtherData, ResponseMessageType } from '../../../define/enum/softwareEnum'
import { TaskScheduler } from '../taskScheduler'
import { TaskScheduler } from '../task/taskScheduler'
import { SubtitleModel } from '../../../model/subtitle'
import { BookTaskStatus, OperateBookType } from '../../../define/enum/bookEnum'
import axios from 'axios'

View File

@ -11,7 +11,7 @@ import fs from 'fs'
import { CheckFileOrDirExist } from "../../../define/Tools/file";
import { BookServiceBasic } from "../ServiceBasic/bookServiceBasic";
import { Subtitle } from "./subtitle";
import { TaskScheduler } from "../taskScheduler";
import { TaskScheduler } from "../task/taskScheduler";
import { BookTaskStatus, BookType, OperateBookType } from "../../../define/enum/bookEnum";
import { Book } from "../../../model/book";
import { TimeStringToMilliseconds } from "../../../define/Tools/time";
@ -354,6 +354,15 @@ export class SubtitleService {
bookTaskId: bookTaskId
}, true)
debugger
// 获取SD设置
let sdConifg = JSON.parse(await fs.promises.readFile(define.sd_setting, 'utf-8'));
let adetailer = false;
if (sdConifg && sdConifg?.webui?.adetailer) {
adetailer = true;
}
if (bookTaskDetails.length == 0) {
// 新增
for (let i = 0; i < copywritingData.length; i++) {
@ -367,7 +376,9 @@ export class SubtitleService {
word: element.word,
afterGpt: element.after_gpt,
subValue: JSON.stringify(element.subValue),
timeLimit: element.timeLimit
timeLimit: element.timeLimit,
// 新增修脸跟随
adetailer: adetailer
})
}
} else {

View File

@ -0,0 +1,60 @@
import { shell } from "electron";
import { CheckFileOrDirExist } from "../../../define/Tools/file";
import { errorMessage, successMessage } from "../../Public/generalTools";
import path from 'path';
/** 打开指定的文件夹的方法 */
export type OpenFolderParams = {
/** 是不是基于项目文件,是的话,会在项目文件夹的基础上进行拼接 */
baseProject: boolean;
/** 判断是不是打开父文件夹 */
dirFloder: boolean;
/** 文件路径baseProject 为false需要设置完整的文件路径 */
folderPath: string;
}
/** 一些对electron接口的封装配合业务逻辑 */
export default class ElectronInterface {
constructor() { }
/**
*
* @param value
* @returns
*/
public async OpenFile(value: string) {
if (await CheckFileOrDirExist(value)) {
return errorMessage('文件不存在', 'SystemIpc_OPEN_FILE')
}
await shell.openPath(value)
}
/**
*
* @param params
* @returns
*/
public async OpenFolder(params: OpenFolderParams) {
try {
let openFolder = null
if (params.baseProject) {
openFolder = path.join(global.config.project_path, params.folderPath)
}
if (params.dirFloder) {
openFolder = path.dirname(params.folderPath)
}
if (!openFolder) {
openFolder = params.folderPath
}
// 判断文件夹是不是存在
let isExist = await CheckFileOrDirExist(openFolder)
if (!isExist) {
throw new Error('文件夹不存在,请检查')
}
shell.openPath(openFolder)
return successMessage(null, '打开成功')
} catch (error) {
return errorMessage('打开文件夹错误,错误信息如下:' + error.message, 'SystemIpc_OPEN_FOLDER')
}
}
}

View File

@ -0,0 +1,113 @@
import { define } from '../../../define/define';
import { CheckFileOrDirExist } from '../../../define/Tools/file';
import fs from "fs";
import { errorMessage, successMessage } from '../../Public/generalTools';
import { version } from '../../../../package.json';
import { graphics } from 'systeminformation';
import { machineId } from 'node-machine-id';
import axios from 'axios';
import { TaskManager } from '../task/taskManage';
export default class SystemInfo {
constructor() { }
/**
*
* @returns
*/
public async GetViosionAndGpuMessage() {
try {
// 判断是不是又配置文件
let systemConfigPath = define.system_config;
if (!await CheckFileOrDirExist(systemConfigPath)) {
// 如果没有配置文件就创建一个
let systemConfig = {};
// 写入配置文件
await fs.promises.writeFile(systemConfigPath, JSON.stringify(systemConfig));
}
// 读取配置文件
let systemConfig = JSON.parse(await fs.promises.readFile(systemConfigPath, 'utf-8')) as SystemConfig.SystemConfig;
if (systemConfig && systemConfig.gpu && systemConfig.gpu.name && systemConfig.gpu.updateTime) {
const currentDate = new Date(systemConfig.gpu.updateTime);
const nextDate = new Date(currentDate);
nextDate.setDate(currentDate.getDate() + 1);
if (systemConfig && systemConfig.gpu && nextDate > new Date()) {
global.gpu = systemConfig.gpu
return successMessage(version + ' ' + (global.gpu?.name ? global.gpu.name : ''), '获取成功')
}
}
// 获取当前电脑的显卡信息
let da = await graphics()
for (let i = 0; i < da.controllers.length; i++) {
// 获取第一个英伟达或者是AMD的显卡信息
const element = da.controllers[i]
if (element.vendor.startsWith('NVIDIA')) {
global.gpu = element
global.gpu.type = 'NVIDIA'
break
} else if (element.vendor.startsWith('AMD') || element.vendor.startsWith('Advanced')) {
global.gpu = element
global.gpu.type = 'AMD'
break
} else {
global.gpu = {
name: 'OTHER'
}
global.gpu.type = 'OTHER'
}
}
// 更新配置文件
systemConfig.gpu = global.gpu
systemConfig.gpu.updateTime = new Date()
await fs.promises.writeFile(systemConfigPath, JSON.stringify(systemConfig));
return successMessage(version + ' ' + (global.gpu?.name ? global.gpu.name : ''), '获取成功')
} catch (error) {
return errorMessage('获取版本信息和显卡信息错误,错误信息如下:' + error.message, 'SystemIpc_GET_VISION_AND_GPU_MESSAGE')
}
}
/**
*
*/
public async GetMachineId() {
try {
let id = await machineId(true);
global.machineId = id;
return successMessage(id, '获取机器码成功')
} catch (error) {
return errorMessage('获取机器码错误,错误信息如下:' + error.message, 'SystemIpc_GET_MACHINE_ID')
}
}
/**
*
* @param {*} value
* @returns
*/
public async CheckMachineStatus(value: string) {
try {
// 判断机器码是不是存在
// let res = await axios.post('http://api.yu-zhile.com/GetMachineStatus', {
// machineId: value
// })
// /lms/Machine/GetMachineStatus/{machineId}
//
let res = await axios.get('https://lms.laitool.cn/lms/Machine/GetMachineStatus/' + value);
if (res.status != 200) {
throw new Error('请求错误')
}
if (res.data.code != 1) {
throw new Error(res.data.message)
}
global.endTime = res.data.endTime
global.permissions = res.data.permissions
global.CheckMachineId = true
return successMessage(res.data, '获取机器码状态成功')
} catch (error) {
return errorMessage('获取机器码状态错误,错误信息如下:' + error.message, 'SystemIpc_CHECK_MACHINE_STATUS')
}
}
}

View File

@ -0,0 +1,47 @@
import { BookBackTaskStatus } from "../../../define/enum/bookEnum";
import { GeneralResponse } from "../../../model/generalResponse";
import { errorMessage, successMessage } from "../../Public/generalTools";
import { BookServiceBasic } from "../ServiceBasic/bookServiceBasic";
import { TaskManager } from "./taskManage";
export default class BackTaskService {
bookServiceBasic: BookServiceBasic
constructor() {
this.bookServiceBasic = new BookServiceBasic()
}
/**
*
*/
public async GetAllStatusTaskCount(status: BookBackTaskStatus[]): Promise<GeneralResponse.ErrorItem | GeneralResponse.SuccessItem> {
try {
let res = await this.bookServiceBasic.GetAllStatusTaskCount(status)
return successMessage(res, '获取任务数量成功', 'BackTaskService_GetAllStatusTaskCount')
} catch (error) {
return errorMessage('获取任务数量失败,失败信息如下:' + error.toString(), 'BackTaskService_GetAllStatusTaskCount')
}
}
/**
*
* @param isGiveUp
*/
public async StartBackTask(isGiveUp: boolean): Promise<GeneralResponse.ErrorItem | GeneralResponse.SuccessItem> {
try {
if (isGiveUp) {
await this.bookServiceBasic.GiveUpNotStartBackTask()
}
// 启动后台任务
// 这边初始化任务队列
if (!global.taskManager) {
global.taskManager = new TaskManager()
global.taskManager.InitListeners() // 启动监听
}
return successMessage(null, '启动后台任务成功', 'BackTaskService_StartBackTask')
} catch (error) {
return errorMessage('启动后台任务失败', 'BackTaskService_StartBackTask')
}
}
}

View File

@ -1,18 +1,18 @@
import { BookBackTaskListService } from '../../define/db/service/Book/bookBackTaskListService'
import { BookBackTaskStatus, BookBackTaskType, TaskExecuteType } from '../../define/enum/bookEnum'
import { SoftwareService } from '../../define/db/service/SoftWare/softwareService'
import { errorMessage, successMessage } from '../Public/generalTools'
import { BasicReverse } from './Book/basicReverse'
import { ReverseBook } from './Book/ReverseBook'
import { GeneralResponse } from '../../model/generalResponse'
import { DEFINE_STRING } from '../../define/define_string'
import { MJOpt } from './MJ/mj'
import { SDOpt } from './SD/sd'
import { D3Opt } from './d3'
import { FluxOpt } from './Flux/flux'
import { AsyncQueue } from '../../main/quene'
import { SoftWareServiceBasic } from './ServiceBasic/softwareServiceBasic'
import { MJSetting } from '../../model/Setting/mjSetting'
import { BookBackTaskListService } from '../../../define/db/service/Book/bookBackTaskListService'
import { BookBackTaskStatus, BookBackTaskType, TaskExecuteType } from '../../../define/enum/bookEnum'
import { SoftwareService } from '../../../define/db/service/SoftWare/softwareService'
import { errorMessage, successMessage } from '../../Public/generalTools'
import { BasicReverse } from '../Book/basicReverse'
import { ReverseBook } from '../Book/ReverseBook'
import { GeneralResponse } from '../../../model/generalResponse'
import { DEFINE_STRING } from '../../../define/define_string'
import { MJOpt } from '../MJ/mj'
import { SDOpt } from '../SD/sd'
import { D3Opt } from '../d3'
import { FluxOpt } from '../Flux/flux'
import { AsyncQueue } from '../../quene'
import { SoftWareServiceBasic } from '../ServiceBasic/softwareServiceBasic'
import { MJSetting } from '../../../model/Setting/mjSetting'
export class TaskManager {
isExecuting: boolean = false;
@ -61,24 +61,6 @@ export class TaskManager {
}
}
async GetGlobalConfig() {
try {
await this.InitService();
let softData = this.softwareService.GetSoftwareData();
if (softData.data.length <= 0) {
throw new Error('获取软件数据失败');
}
let config = softData.data[0];
global.config = JSON.parse(config.globalSetting);
this.globalConfig = global.config;
return successMessage(global.config, '获取全局配置完成', 'TaskManager_GetGlobalConfig');
} catch (error) {
console.error('GetGlobalConfig Error:', error);
return errorMessage(`获取全局配置失败,失败信息如下:${error.message}`, 'TaskManager_GetGlobalConfig');
}
}
// 初始化事件监听方法
InitListeners() {
if (this.isListening) return; // 如果已经在监听,直接返回
@ -363,24 +345,5 @@ export class TaskManager {
return errorMessage(`处理 ${task.type} 类型任务 ${task.name} 失败,失败信息如下:${error.message}`, 'TaskManager_handleTask');
}
}
//#endregion
async AddTaskHandle(task: TaskModal.Task, isAdd = false) {
if (!isAdd) {
return;
}
if (task.type == BookBackTaskType.STORYBOARD) {
await this.basicReverse.AddCutVideoDataTask(task.bookId);
} else if (task.type == BookBackTaskType.SPLIT) {
await this.basicReverse.AddSplitAudioDataTask(task.bookId, task.bookTaskId);
} else if (task.type == BookBackTaskType.AUDIO) {
await this.basicReverse.AddGetFrameTask(task.bookId, task.bookTaskId);
} else if (task.type == BookBackTaskType.FRAME) {
await this.basicReverse.AddExtractSubtitlesDataTask(task.bookId, task.bookTaskId);
} else {
throw new Error('不支持的任务类型');
}
}
}

View File

@ -1,8 +1,8 @@
import { LoggerService } from '../../define/db/service/SoftWare/loggerService'
import { DEFINE_STRING } from '../../define/define_string'
import { LoggerStatus, OtherData } from '../../define/enum/softwareEnum'
import { successMessage, errorMessage } from '../Public/generalTools'
import { GeneralResponse } from '../../model/generalResponse'
import { LoggerService } from '../../../define/db/service/SoftWare/loggerService'
import { DEFINE_STRING } from '../../../define/define_string'
import { LoggerStatus, OtherData } from '../../../define/enum/softwareEnum'
import { successMessage, errorMessage } from '../../Public/generalTools'
import { GeneralResponse } from '../../../model/generalResponse'
export class TaskScheduler {
constructor() { }

View File

@ -13,7 +13,7 @@ import { define } from '../../define/define'
import { LOGGER_DEFINE } from '../../define/logger_define'
import axios from 'axios'
import { Base64ToFile, GetImageBase64 } from '../../define/Tools/image'
import { TaskScheduler } from './taskScheduler';
import { TaskScheduler } from './task/taskScheduler';
import { LoggerStatus, OtherData, ResponseMessageType } from '../../define/enum/softwareEnum';
import { basicApi } from '../../api/apiBasic';
import { FfmpegOptions } from './ffmpegOptions';

View File

@ -92,6 +92,7 @@ export class Writing extends ServiceBase {
apiKey: aiData.api_key,
word: word
}
var myHeaders = new Headers();
myHeaders.append("User-Agent", "Apifox/1.0.0 (https://apifox.com)");
myHeaders.append("Content-Type", "application/json");
@ -102,7 +103,7 @@ export class Writing extends ServiceBase {
body: JSON.stringify(body),
};
let resData = oldData;
let resData = '\n\n';
return new Promise((resolve, reject) => {
fetch(define.serverUrl + "/api/Forward/ForwardWordStream", requestOptions)
.then(response => {
@ -126,7 +127,7 @@ export class Writing extends ServiceBase {
const text = new TextDecoder().decode(value);
resData += text
// 将数据返回前端
global.newWindow[0].win.webContents.send(DEFINE_STRING.GPT.GPT_STREAM_RETURN, resData)
global.newWindow[0].win.webContents.send(DEFINE_STRING.GPT.GPT_STREAM_RETURN, oldData + resData)
controller.enqueue(value); // 可选:将数据块放入流中
push();
}).catch(err => {
@ -182,7 +183,7 @@ export class Writing extends ServiceBase {
async ActionStart(setting, word) {
try {
await this.InitService()
console.log(setting, word)
// console.log(setting, word)
if (isEmpty(setting.gptType)) {
throw new Error('请选择GPT类型')
}
@ -217,7 +218,6 @@ export class Writing extends ServiceBase {
if (setting.isSplit) {
// 这边拆分文案
let spiltWord = await this.SplitWord(word, setting.splitNumber)
console.log(spiltWord)
for (let i = 0; i < spiltWord.length; i++) {
const element = spiltWord[i];
if (setting.isStream) {
@ -243,6 +243,7 @@ export class Writing extends ServiceBase {
}
// let tasks =
// console.log("ActionStart", result);
// ExecuteConcurrently
return successMessage(result, "执行文案相关任务成功", 'Writing_ActionStart');
} catch (error) {

View File

@ -9,7 +9,6 @@ const { v4: uuidv4 } = require('uuid'); // 引入UUID库来生成唯一标识符
const EventEmitter = require('events');
import { define } from "../define/define";
import axios from "axios";
const { machineId } = require('node-machine-id')
import { DEFINE_STRING } from "../define/define_string";
import { ClipDraft } from "./Public/clipDraft";
import { Tools } from "./tools";
@ -882,25 +881,6 @@ async function DeleteImageTaskList(value) {
}
/**
* 获取指定的机械码
*/
async function GetMachineId() {
try {
let id = await machineId(true);
global.machineId = id;
return {
code: 1,
value: id
}
} catch (error) {
return {
code: 0,
message: error.toString()
}
}
}
/**
* 获取不想要的提示词
@ -1127,7 +1107,6 @@ export const func = {
DeleteVideoConfig,
AddImageTask,
DeleteImageTaskList,
GetMachineId,
GetBadPrompt,
SaveBadPrompt,
DeleteBadPrompt,

View File

@ -1,7 +1,5 @@
import fspromises from 'fs/promises'
import { v4 as uuidv4 } from 'uuid'
import { version } from '../../package.json'
import { graphics } from 'systeminformation'
import { app, shell, BrowserWindow, ipcMain, dialog, nativeTheme, session } from 'electron'
import path, { join } from 'path'
@ -16,7 +14,7 @@ import { ImageGenerate } from './ReverseManage/imageGenerate.js'
import { Setting } from './setting/setting.js'
import { has, isEmpty } from 'lodash'
import { AutoSync } from './setting/autoSync.js'
import { TaskManager } from './Service/taskManage'
import { TaskManager } from './Service/task/taskManage'
import { SoftWareServiceBasic } from './Service/ServiceBasic/softwareServiceBasic'
// ipc
@ -301,32 +299,6 @@ ipcMain.handle(DEFINE_STRING.ADD_DRAFT, async (event, value) => {
return res
})
// 获取当前版本
ipcMain.handle(DEFINE_STRING.GET_VERSION, async (event) => {
// 获取当前电脑的显卡信息
let da = await graphics()
for (let i = 0; i < da.controllers.length; i++) {
// 获取第一个英伟达或者是AMD的显卡信息
const element = da.controllers[i]
if (element.vendor.startsWith('NVIDIA')) {
global.gpu = element
global.gpu.type = 'NVIDIA'
break
} else if (element.vendor.startsWith('AMD') || element.vendor.startsWith('Advanced')) {
global.gpu = element
global.gpu.type = 'AMD'
break
} else {
global.gpu = {
name: 'OTHER'
}
global.gpu.type = 'OTHER'
}
}
return version + ' ' + (global.gpu?.name ? global.gpu.name : '')
})
// 监听保存SD配置
ipcMain.handle(DEFINE_STRING.SAVE_SD_CONFIG, async (event, value) => await func.SaveSDConfig(value))
@ -372,9 +344,6 @@ ipcMain.handle(
async (event, value) => await func.DeleteImageTaskList(value)
)
// 监听获取加密的机械码任务
ipcMain.handle(DEFINE_STRING.GET_MACHINE_ID, async (event, value) => await func.GetMachineId())
// 监听获取不想要的提示词任务
ipcMain.handle(DEFINE_STRING.GET_BAD_PROMPT, async (event) => await func.GetBadPrompt())

View File

@ -9,7 +9,7 @@ import { ImageSetting } from '../../define/setting/imageSetting'
import { DEFINE_STRING } from '../../define/define_string'
import { TagDefine } from '../../define/tagDefine'
import { errorMessage } from '../Public/generalTools'
import { TaskManager } from '../Service/taskManage'
import { TaskManager } from '../Service/task/taskManage'
import { SoftWareServiceBasic } from '../Service/ServiceBasic/softwareServiceBasic'
import { FLxuAPIImageType } from '../../define/enum/image'
@ -270,45 +270,6 @@ export class Setting {
}
}
/**
* 检查机器码是不是存在
* @param {*} value
* @returns
*/
async CheckMachineId(value) {
try {
// 判断机器码是不是存在
let res = await axios.post('http://api.yu-zhile.com/GetMachineStatus', {
machineId: value
})
// let res = await axios.get('http://lapi.laitool.cn/api/Machine/GetMachineStatus?machineId=' + value);
if (res.status != 200) {
throw new Error('请求错误')
}
if (res.data.code == 0) {
throw new Error(res.data.message)
}
this.global.endTime = res.data.endTime
this.global.permissions = res.data.permissions
this.global.CheckMachineId = true
// 这边初始化任务队列
if (!global.taskManager) {
global.taskManager = new TaskManager()
global.taskManager.InitListeners() // 启动监听
}
return {
code: 1
}
} catch (error) {
return {
code: 0,
message: error.toString()
}
}
}
/**
* 获取选择角色场景模式的options
* @returns

16
src/model/Setting/systemConfig.d.ts vendored Normal file
View File

@ -0,0 +1,16 @@
declare namespace SystemConfig {
/** 软件读取的系统信息,都是存储在这边 */
type SystemConfig = {
gpu: GpuMessage
}
/** GPU信息 */
type GpuMessage = {
name?: string;
type?: string;
vender?: string;
updateTime?: Date;
}
}

6
src/model/system.d.ts vendored Normal file
View File

@ -0,0 +1,6 @@
declare namespace SystemModel {
}

View File

@ -5,7 +5,7 @@ import { discord } from './discord.js'
import { mj } from './mj.js'
import { sd } from './sd'
import { img } from './img.js'
import { system } from './system.js'
import { system } from './system'
import { setting } from './setting.js'
import { prompt } from './prompt.js'
import { book } from './book'
@ -21,8 +21,6 @@ import { task } from './task'
let events = []
const api = {
//#region 基础状态
// 获取版本信息
GetVersion: async (callback) => callback(await ipcRenderer.invoke(DEFINE_STRING.GET_VERSION)),
//#endregion
// 保存通用设置
ModifySampleSetting: async (value, callback) =>
@ -231,12 +229,6 @@ const api = {
ipcRenderer.send(DEFINE_STRING.SHOW_NEW_WINDOW, value)
},
// 获取机械码
GetMachineId: async (callback) => {
let res = await ipcRenderer.invoke(DEFINE_STRING.GET_MACHINE_ID)
callback(res)
},
// 获取ADetalier配置列表
GetADetailerList: async (callback) => {
let res = await ipcRenderer.invoke(DEFINE_STRING.GET_ADETAILER_LIST)

View File

@ -1,14 +0,0 @@
import { ipcRenderer } from "electron"
import { DEFINE_STRING } from "../define/define_string"
const system = {
// 打开指定的文件
OpenFile: async (value, callback) => callback(ipcRenderer.send(DEFINE_STRING.SYSTEM.OPEN_FILE, value)),
// 打开指定的文件夹
OpenFolder: (value) => ipcRenderer.invoke(DEFINE_STRING.OPEN_FOLDER, value),
}
export {
system
}

19
src/preload/system.ts Normal file
View File

@ -0,0 +1,19 @@
import { ipcRenderer } from 'electron'
import { DEFINE_STRING } from '../define/define_string'
const system = {
/**打开指定的文件 */
OpenFile: async (value, callback) =>
callback(ipcRenderer.send(DEFINE_STRING.SYSTEM.OPEN_FILE, value)),
/** 打开指定的文件夹 */
OpenFolder: (value) => ipcRenderer.invoke(DEFINE_STRING.OPEN_FOLDER, value),
/** 获取软件的版本信息和电脑的GPU信息24小时只获取一次 */
GetViosionAndGpuMessage: () => ipcRenderer.invoke(DEFINE_STRING.SYSTEM.GET_VISION_AND_GPU_MESSAGE),
/** 获取系统的机器码 */
GetMachineId: () => ipcRenderer.invoke(DEFINE_STRING.SYSTEM.GET_MACHINE_ID),
/** 检查机器码状态 */
CheckMachineStatus: (value: string) => ipcRenderer.invoke(DEFINE_STRING.SYSTEM.CHECK_MACHINE_STATUS, value)
}
export { system }

View File

@ -1,8 +1,15 @@
import { ipcRenderer } from 'electron'
import { DEFINE_STRING } from '../define/define_string'
import { BookBackTaskType, TaskExecuteType } from '../define/enum/bookEnum'
import { BookBackTaskStatus, BookBackTaskType, TaskExecuteType } from '../define/enum/bookEnum'
const task = {
/**
*
* @param isGiveUp
* @returns
*/
StartBackTask: async (isGiveUp: boolean) => await ipcRenderer.invoke(DEFINE_STRING.TASK.START_BACK_TASK, isGiveUp),
/**
*
* @param bookId ID
@ -20,12 +27,14 @@ const task = {
responseMessageName: string = null) =>
await ipcRenderer.invoke(DEFINE_STRING.TASK.ADD_BOOK_BACK_TASK, bookId, taskType, executeType, bookTaskId, bookTaskDetailId, responseMessageName),
/**
*
*
* @param task
*/
AddMultiBookBackTask: async (task: TaskModal.Task[]) =>
await ipcRenderer.invoke(DEFINE_STRING.TASK.ADD_MULTI_BOOK_BACK_TASK, task),
/** 获取等待中的任务 */
GetAllStatusTaskCount: async (value: BookBackTaskStatus[]) => await ipcRenderer.invoke(DEFINE_STRING.TASK.GET_ALL_STATUS_TASK_COUNT, value),
}
export { task }

View File

@ -44,7 +44,7 @@ export default defineComponent({
let softwareStore = useSoftwareStore()
onMounted(async () => {
debugger
softwareStore.SoftColor = SoftColor
window.api.getSettingDafultData(async (value) => {
await window.darkMode.toggle(value.theme)

View File

@ -18,9 +18,9 @@ export default defineComponent({
onMounted(() => {
const webview = document.getElementById('lai-api')
if (webview) {
debugger
const handleNewWindow = (event) => {
debugger
event.preventDefault()
alert(123)
const protocol = new URL(event.url).protocol

View File

@ -250,7 +250,7 @@ async function imageDragOver(e) {
}
async function ModifyLock() {
debugger
if (!data.value.imageLock) {
//
if (!outImagePath.value) {

View File

@ -83,7 +83,6 @@ export default defineComponent({
* 提示词菜单下拉操作
*/
async function ReverseSelect(key) {
debugger
switch (key) {
case 'remove_reverse': //
let res = await window.book.ResetGptReverseData(
@ -162,7 +161,6 @@ export default defineComponent({
//
function TranslateBatchParams(from, to) {
debugger
let translateData = []
for (let i = index.value; i < reverseManageStore.selectBookTaskDetail.length; i++) {
const element = reverseManageStore.selectBookTaskDetail[i]
@ -208,7 +206,6 @@ export default defineComponent({
//
async function TranslateOne(key) {
debugger
let translateData = []
switch (key) {
case 'translate_english':
@ -243,7 +240,6 @@ export default defineComponent({
* 重选反推提示词
*/
async function SelectReversePrompt() {
debugger
//
if (!data.value.reversePrompt || data.value.reversePrompt.length <= 0) {
message.error('当前没有反推提示词')

View File

@ -114,7 +114,7 @@ export default defineComponent({
style: `width : ${dialogWidth}px; height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {
debugger
console.log(selectStyleRef)
//
// reverseManageStore.selectBookTask.styleList = toRaw(selectStyleRef.value.selectStyle)

View File

@ -61,7 +61,7 @@ export default defineComponent({
setup(props) {
let hh = props.height
let maxHeight = props.height - 80
debugger
let data = ref(JSON.parse(JSON.stringify(props.initData)))
const message = useMessage()
let dialog = useDialog()
@ -210,7 +210,7 @@ export default defineComponent({
style: `width : ${dialogWidth}px; min-height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {
debugger
console.log(wenkeRef.value.word)
let word = wenkeRef.value.data
if (word == null || word == '') {
@ -565,7 +565,7 @@ export default defineComponent({
})
}
} else if (type.value == 'mj_reverse' || type.value == 'sd_reverse') {
debugger
if (data.value.length != reverseManageStore.selectBookTaskDetail.length) {
message.error('检测到导入的字幕数据和分镜对不上,请先对齐')
return

View File

@ -188,7 +188,7 @@ export default defineComponent({
// MP4
await window.api.SelectFile(ext, (value) => {
debugger
if (value.code == 0) {
message.error(value.message)
return
@ -227,7 +227,7 @@ export default defineComponent({
oldVideoPath: {
required: true,
validator(rule, value) {
debugger
if (isEmpty(value)) {
//
if (
@ -253,7 +253,7 @@ export default defineComponent({
message.error('请检查必填字段')
return
}
debugger
loading.value = true
let res = await reverseManageStore.SaveSelectBook(cloneDeep(reverseManageStore.selectBook))
loading.value = false
@ -286,7 +286,7 @@ export default defineComponent({
*/
async function OpenFolder(param) {
let res = null
debugger
if (param == 'imageFolder') {
res = await window.system.OpenFolder({
folderPath: reverseManageStore.selectBook.imageFolder,

View File

@ -108,7 +108,7 @@ async function DeleteBookData(e) {
negativeText: '取消',
onPositiveClick: async () => {
da?.destroy()
debugger
softwareStore.spin.spinning = true
softwareStore.spin.tip = '正在删除小说数据。。。'
let res = await window.book.DeleteBookData(book.value.id)
@ -117,7 +117,7 @@ async function DeleteBookData(e) {
message.error(res.message)
return
}
debugger
//
reverseManageStore.bookData = reverseManageStore.bookData.filter(
(item) => item.id != book.value.id

View File

@ -48,7 +48,7 @@ export default defineComponent({
props: ['bookTask'],
setup(props) {
debugger
let message = useMessage()
let dialog = useDialog()
let bookTask = ref(props.bookTask)
@ -63,7 +63,7 @@ export default defineComponent({
* @param e
*/
async function ReSetBookTaskDetail(e) {
debugger
e.stopPropagation()
dialog.warning({
title: '重置小说任务',
@ -171,7 +171,7 @@ export default defineComponent({
*/
async function ClipDraft(e) {
e.stopPropagation()
debugger
dialog.info({
closeOnEsc: false,
title: '生成草稿前检查',

View File

@ -103,7 +103,7 @@ export default defineComponent({
*/
async function DataTableStripedUpdate() {
//
debugger
//
let res = await softwareStore.SaveSoftware()
console.log(res)
@ -115,7 +115,7 @@ export default defineComponent({
//
async function SelectDropdown(key) {
debugger
console.log(key)
softwareStore.softWare.reverse_data_table_size = key
//

View File

@ -16,7 +16,7 @@ import { ref, onMounted, defineComponent, onUnmounted, toRaw, nextTick, watchEff
import { useMessage, NLog } from 'naive-ui'
import Artplayer from '../../../Components/Artplayer.vue'
import { useReverseManageStore } from '../../../../../../stores/reverseManage.ts'
import { DEFINE_STRING } from '../../../../../../define/define_string.ts'
import { DEFINE_STRING } from '../../../../../../define/define_string'
export default defineComponent({
components: { Artplayer, NLog },
@ -47,7 +47,7 @@ export default defineComponent({
onMounted(async () => {
//
window.api.setEventListen([DEFINE_STRING.SYSTEM.RETURN_LOGGER], (value) => {
debugger
debuger
if (value.code == 0) {
message.error('添加日志输出失败,但是不影响使用')
logger.value += value.message + '\n'

View File

@ -73,7 +73,7 @@ export default defineComponent({
props: ['bookTask', 'type'],
setup(props) {
let bookTask = ref(props.bookTask)
debugger
let type = ref(props.type)
let backgroundMusicOptions = ref([])
let message = useMessage()
@ -133,7 +133,7 @@ export default defineComponent({
bookTask.value.id,
OperateBookType.BOOKTASK
)
debugger
if (res.code == 0) {
message.error(res.message)
} else {

View File

@ -657,7 +657,7 @@ export default defineComponent({
* @param to 目标语言
*/
async function TranslateService(from, to) {
debugger
let translateData = []
for (let i = 0; i < reverseManageStore.selectBookTaskDetail.length; i++) {
const element = reverseManageStore.selectBookTaskDetail[i]
@ -743,7 +743,7 @@ export default defineComponent({
let tempData = []
for (let i = 0; i < reverseManageStore.selectBookTaskDetail.length; i++) {
debugger
const element = reverseManageStore.selectBookTaskDetail[i]
tempData.push({
no: element.no,

View File

@ -50,6 +50,7 @@
>
</div>
</n-form-item>
<div style="color: red;">注意人物提示词英文才是实际合并的提示词数据请和出图的提示词语言保持一致中文或英文</div>
<n-form-item label="人物提示词(英文)" path="prompt">
<n-input
type="textarea"

View File

@ -27,6 +27,7 @@
>翻译提示词</n-button
>
</n-form-item>
<div style="color: red;">注意场景提示词描述英文 才是实际合并的提示词数据请和出图的提示词语言保持一致中文或英文</div>
<n-form-item label="场景提示词描述(英文)" path="prompt">
<n-input
type="textarea"

View File

@ -36,6 +36,7 @@
</n-tooltip>
</div>
</n-form-item>
<div style="color: red;">注意风格提示词描述英文 才是实际合并的提示词数据请和出图的提示词语言保持一致中文或英文</div>
<n-form-item label="风格提示词描述(英文)" path="prompt">
<n-input
type="textarea"
@ -247,7 +248,7 @@ export default defineComponent({
}
imageLoading.value = true
await window.sd.txt2img(JSON.stringify([d]), async (value) => {
debugger
if (value.code == 0) {
message.error(value.message)
imageLoading.value = false

View File

@ -51,7 +51,7 @@ export default defineComponent({
//
let showReversePrompt = computed(() => {
debugger
let res = []
for (let i = 0; i < data.value.reversePrompt?.length; i++) {
let item = data.value.reversePrompt[i]

View File

@ -133,7 +133,7 @@ export default defineComponent({
]
onMounted(async () => {
debugger
calcHeight()
setTimeout(() => {
@ -155,7 +155,7 @@ export default defineComponent({
})
function calcHeight() {
debugger
//
let height = window.innerHeight
maxHeight.value = height - 120

View File

@ -82,7 +82,7 @@ export default defineComponent({
}
pagination.value.pageCount = res_count
debugger
//
let bookTask = await reverseManageStore.GetBookTaskDataFromDB({
bookId: reverseManageStore.selectBook.id
@ -99,7 +99,7 @@ export default defineComponent({
async function InitData() {
try {
//
debugger
await GetBookByCondition()
} catch (error) {
message.error(error.message)

View File

@ -43,7 +43,7 @@ export default defineComponent({
},
setup() {
debugger
let message = useMessage()
let softwareStore = useSoftwareStore()
let reverseManageStore = useReverseManageStore()

View File

@ -105,7 +105,7 @@ export default defineComponent({
width: 215,
fixed: 'right',
render(row, index) {
debugger
return h(BookTaskListAction, {
bookTask: row
})

View File

@ -132,7 +132,7 @@ onMounted(() => {})
let UpdateCharacterTagsDebounced = debounce(UpdateCharacterTags, 500)
async function UpdateCharacterTags(character, index) {
debugger
//
let checkedCharacterTags = characterTags.value
.filter((item) => item.checked)
@ -154,7 +154,7 @@ async function UpdateCharacterTags(character, index) {
let UpdateSceneTagsDebounced = debounce(UpdateSceneTags, 500)
async function UpdateSceneTags(scene, index) {
debugger
console.log('1233', scene, index)
//
let checkedSceneTags = sceneTags.value.filter((item) => item.checked).map((item) => item.id)

View File

@ -288,7 +288,7 @@ async function SelectStyle() {
style: `width : ${dialogWidth}px; height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {
debugger
console.log(selectStyleRef)
//
// reverseManageStore.selectBookTask.styleList = toRaw(selectStyleRef.value.selectStyle)

View File

@ -178,7 +178,7 @@ async function SingleGenerateImage() {
//
async function NextGenerateImage() {
debugger
let res = undefined
let bookTaskDetails = reverseManageStore.selectBookTaskDetail.filter(
(item, index) => index >= props.index && !item.imageLock

View File

@ -165,7 +165,7 @@ async function CharacterLibrary() {
let dialogWidth = window.innerWidth * 0.6
let dialogHeight = window.innerHeight * 0.9
let word = '' // word
debugger
let temp_arr = []
for (let i = 0; i < reverseManageStore.selectBookTaskDetail.length; i++) {
const element = reverseManageStore.selectBookTaskDetail[i]
@ -235,7 +235,7 @@ async function ResetGPTPrompt() {
onPositiveClick: async () => {
da?.destroy()
softwareStore.spin.spinning = true
debugger
softwareStore.spin.tip = '正在重置推理提示词,请稍后。。。'
let res = await window.book.ResetGptReverseData(
reverseManageStore.selectBookTask.id,
@ -373,7 +373,7 @@ async function GetPromptAll() {
* @param {Boolean} cover - 是否覆盖现有图像
*/
async function AddFluxImageAll(type, cover) {
debugger
let messageName = DEFINE_STRING.BOOK.FLUX_API_IMAGE_GENERATE_RETURN
let taskType = BookBackTaskType.FLUX_API_IMAGE
if (type == BookImageCategory.FLUX_FORGE) {

View File

@ -96,7 +96,6 @@ const createColumns = ({}) => {
className: 'empty-margin',
fixed: 'left',
render(row, index) {
console.log('row', row, index)
return h(DatatableAfterGpt, { initData: row, index: index })
}
},

View File

@ -31,7 +31,7 @@ export default defineComponent({
onMounted(() => {})
onUnmounted(() => {
debugger
reverseManageStore.selectBookTaskDetail = undefined
})

View File

@ -2,7 +2,12 @@
<div style="height: 200px">
<div style="height: 40px"></div>
<div style="display: flex">
<n-input :disabled="true" v-model:value="machineId" type="text" placeholder="唯一码" />
<n-input
:disabled="true"
v-model:value="systemStore.machineId"
type="text"
placeholder="唯一码"
/>
<n-popover trigger="click">
<template #trigger>
<n-button text style="width: 24px; font-size: 24px; color: skyblue; display: flex; heigh">
@ -14,7 +19,23 @@
<span>VXxiangbie88</span>
</n-popover>
</div>
<div style="color: red; margin: 10px">
<div style="margin: 10px">
<strong>怎么激活 --> </strong>
<strong
style="color: #e18a3b; margin-left: 10px"
@click="OpenTeach('activate')"
class="url_class"
>软件激活教程 -->
</strong>
<strong
style="margin-left: 10px; color: #ea5514"
@click="OpenTeach('lms')"
class="url_class"
>
后台入口
</strong>
</div>
<!-- <div style="margin: 10px; color: red">
如未激活将上面的码给管理员激活
<n-popover trigger="hover" raw :show-arrow="false">
<template #trigger>
@ -26,7 +47,7 @@
preview-disabled
/>
</n-popover>
</div>
</div> -->
<div style="margin: 10px; font-size: large; color: red">
教程视频<span class="url_class" @click="OpenTeach('video')">向北-LAITool</span>
</div>
@ -39,62 +60,46 @@
</div>
</template>
<script>
<script setup>
import { defineComponent, ref, h, onMounted, toRaw } from 'vue'
import { useMessage, NInput, NButton, NIcon, NPopover, NImage, NTag } from 'naive-ui'
import { InformationCircle } from '@vicons/ionicons5'
import { useSystemStore } from '../../../../stores/system'
export default defineComponent({
components: {
NInput,
NButton,
NIcon,
InformationCircle,
NPopover,
NImage,
NTag
},
setup() {
let machineId = ref('')
let message = useMessage()
let machineId = ref('')
let message = useMessage()
const systemStore = useSystemStore()
onMounted(async () => {
//
await window.api.GetMachineId((value) => {
if (value.code == 0) {
message.error(value.message)
return
}
machineId.value = value.value
})
})
onMounted(async () => {})
function OpenTeach(type) {
switch (type) {
case 'doc':
window.api.OpenUrl(
'https://rvgyir5wk1c.feishu.cn/docx/RZYCdG7ZpoKsIzxBEzccNEIFn8f?from=from_copylink'
)
break
case 'video':
window.api.OpenUrl('https://space.bilibili.com/110586931')
default:
break
}
}
function OpenQueDoc() {
function OpenTeach(type) {
switch (type) {
case 'doc':
window.api.OpenUrl(
'https://pvwu1oahp5m.feishu.cn/sheets/G5s3sX0KahH1XQtWDazcF70anUb?from=from_copylink'
'https://rvgyir5wk1c.feishu.cn/docx/RZYCdG7ZpoKsIzxBEzccNEIFn8f?from=from_copylink'
)
}
return {
machineId,
OpenQueDoc,
OpenTeach
}
break
case 'video':
window.api.OpenUrl('https://space.bilibili.com/110586931')
break
case 'activate':
window.api.OpenUrl(
'https://rvgyir5wk1c.feishu.cn/docx/RNijdu3w4o4tRlxBhdccWhRpnfg?from=from_copylink'
)
break
case "lms" :
window.api.OpenUrl('https://lms.laitool.cn')
break
default:
break
}
})
}
function OpenQueDoc() {
window.api.OpenUrl(
'https://pvwu1oahp5m.feishu.cn/sheets/G5s3sX0KahH1XQtWDazcF70anUb?from=from_copylink'
)
}
</script>
<style>

View File

@ -208,14 +208,14 @@ export default defineComponent({
//
async function InitStyleData() {
debugger
if (!props.imageStyle || !props.customizeImageStyle) {
return
}
selectStyle.value = []
//
await window.api.GetImageStyleInfomation(JSON.stringify(props.imageStyle), (value) => {
debugger
if (value.code == 0) {
message.error(value.message)
return
@ -276,7 +276,7 @@ export default defineComponent({
}
async function closeTag(image) {
debugger
let index = selectStyle.value.findIndex((item) => item.id == image.id)
if (index != -1) {
selectStyle.value.splice(index, 1)

View File

@ -56,7 +56,7 @@ export default defineComponent({
onMounted(async () => {})
async function closeTag(image) {
debugger
let index = selectStyle.value.findIndex((item) => item.id == image.id)
if (index != -1) {
selectStyle.value.splice(index, 1)

View File

@ -75,10 +75,16 @@
/>
</div>
</div>
<div style="display: flex; justify-content: flex-end; align-items: center; margin-right: 20px">
<n-button type="primary" @click="FormatOutput()"> 格式化 </n-button>
<div style="color: red; margin-left: 5px">
注意由于GPT输出的格式化有太多的不确定不一定可以完全格式需要手动检查
</div>
</div>
</div>
</template>
<script>
<script setup>
import { ref, onMounted, defineComponent, onUnmounted, toRaw, watch, h } from 'vue'
import {
useMessage,
@ -98,192 +104,184 @@ import { useSoftwareStore } from '../../../../stores/software'
import { isEmpty } from 'lodash'
import { DEFINE_STRING } from '../../../../define/define_string'
export default defineComponent({
components: {
NForm,
NFormItem,
NInput,
NSelect,
NButton,
NIcon,
SettingsOutline,
NCheckbox,
NInputNumber
},
setup() {
let message = useMessage()
let dialog = useDialog()
let formValue = ref({
gptType: undefined,
gptData: undefined,
gptAI: undefined,
isStream: true,
isSplit: false,
splitNumber: 1000
})
let oldWord = ref(undefined)
let newWord = ref(undefined)
let gptTypeOptions = ref([])
let gptDataOptions = ref([])
let gptAllData = undefined
let formRef = ref(null)
let gptOptions = ref([
{ label: 'LAI API', value: 'laiapi' },
{ label: 'KIMI', value: 'kimi' },
{ label: 'DouBao', value: 'doubao' }
])
let softwareStore = useSoftwareStore()
let allPromptDataOptions = ref([])
let message = useMessage()
let dialog = useDialog()
let formValue = ref({
gptType: undefined,
gptData: undefined,
gptAI: undefined,
isStream: true,
isSplit: false,
splitNumber: 1000
})
let oldWord = ref('')
let newWord = ref('')
let gptTypeOptions = ref([])
let gptDataOptions = ref([])
let gptAllData = undefined
let formRef = ref(null)
let gptOptions = ref([
{ label: 'LAI API', value: 'laiapi' },
{ label: 'KIMI', value: 'kimi' }
])
let softwareStore = useSoftwareStore()
let allPromptDataOptions = ref([])
//
async function InitServerGptOptions() {
let gptRes = await window.gpt.InitServerGptOptions()
if (gptRes.code == 0) {
message.error(gptRes.message)
return
}
gptAllData = gptRes.data
//
gptTypeOptions.value = gptRes.data.promptType.map((item) => {
return { label: item.name, value: item.id }
})
//
async function InitServerGptOptions() {
let gptRes = await window.gpt.InitServerGptOptions()
if (gptRes.code == 0) {
message.error(gptRes.message)
return
}
gptAllData = gptRes.data
//
gptTypeOptions.value = gptRes.data.promptType.map((item) => {
return { label: item.name, value: item.id }
})
gptDataOptions.value = gptRes.data.promptData.map((item) => {
return { label: item.name, value: item.id }
})
allPromptDataOptions.value = gptRes.data.promptData
}
gptDataOptions.value = gptRes.data.promptData.map((item) => {
return { label: item.name, value: item.id }
})
allPromptDataOptions.value = gptRes.data.promptData
}
function debounce(func, wait) {
let timeoutId
let shouldExecute = true
function debounce(func, wait) {
let timeoutId
let shouldExecute = true
return function (...args) {
const context = this
if (shouldExecute) {
func.apply(context, args)
shouldExecute = false
timeoutId = setTimeout(() => {
shouldExecute = true
}, wait)
} else {
clearTimeout(timeoutId)
timeoutId = setTimeout(() => {
shouldExecute = true
}, wait)
}
}
}
let UpdateWord = debounce((value) => {
newWord.value = value
}, 500)
onMounted(async () => {
await InitServerGptOptions()
//
window.api.setEventListen([DEFINE_STRING.GPT.GPT_STREAM_RETURN], (value) => {
UpdateWord(value)
})
})
onUnmounted(() => {
window.api.removeEventListen(DEFINE_STRING.GPT.GPT_STREAM_RETURN)
})
let ruleObj = (errorMessage) => {
return [
{
required: true,
validator(rule, value) {
if (value == null || value == '') return new Error(errorMessage)
return true
},
trigger: ['input', 'blur', 'change']
}
]
}
let rules = {
gptAI: ruleObj('必选提示词类型'),
gptData: ruleObj('必选提示词预设'),
gptType: ruleObj('必填提示词AI')
}
/**
* AI设置相关
*/
async function AISetting() {
//
//
let dialogWidth = 800
let dialogHeight = 600
dialog.create({
title: 'AI设置',
showIcon: false,
closeOnEsc: false,
content: () => h(ManageAISetting, { type: formValue.value.gptAI }),
style: `width : ${dialogWidth}px; min-height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {}
})
}
/**
* 开始执行GPT
*/
async function ActionStart() {
//
if (
isEmpty(formValue.value.gptType) ||
isEmpty(formValue.value.gptData) ||
isEmpty(formValue.value.gptAI)
) {
message.error('请选择完整的数据')
return
}
softwareStore.spin.spinning = true
softwareStore.spin.tip = '生成中......'
let res = await window.write.ActionStart(toRaw(formValue.value), oldWord.value)
softwareStore.spin.spinning = false
if (res.code == 0) {
message.error(res.message)
softwareStore.spin.spinning = false
return
}
newWord.value = res.data
}
/**
* 选择的提示词类型发生变化时删选提示词预设
* @param value
* @param options
*/
async function UpdateSelectPromptType(value, options) {
gptDataOptions.value = allPromptDataOptions.value
.filter((item) => {
return item.promptTypeId == value
})
.map((item) => {
return { label: item.name, value: item.id }
})
}
return {
formValue,
gptTypeOptions,
gptDataOptions,
UpdateSelectPromptType,
oldWord,
newWord,
rules,
formRef,
AISetting,
gptOptions,
softwareStore,
ActionStart,
allPromptDataOptions
return function (...args) {
const context = this
if (shouldExecute) {
func.apply(context, args)
shouldExecute = false
timeoutId = setTimeout(() => {
shouldExecute = true
}, wait)
} else {
clearTimeout(timeoutId)
timeoutId = setTimeout(() => {
shouldExecute = true
}, wait)
}
}
}
let UpdateWord = debounce((value) => {
newWord.value = value
}, 300)
onMounted(async () => {
await InitServerGptOptions()
//
window.api.setEventListen([DEFINE_STRING.GPT.GPT_STREAM_RETURN], (value) => {
UpdateWord(value)
})
})
onUnmounted(() => {
window.api.removeEventListen(DEFINE_STRING.GPT.GPT_STREAM_RETURN)
})
let ruleObj = (errorMessage) => {
return [
{
required: true,
validator(rule, value) {
if (value == null || value == '') return new Error(errorMessage)
return true
},
trigger: ['input', 'blur', 'change']
}
]
}
async function FormatOutput() {
let splitData = newWord.value.split('\n').filter((item) => {
return !isEmpty(item)
})
let isNumberedFormat = (str) => {
return /^\d+\./.test(str)
}
let isTextFormat = (str) => {
return /^【文本】/.test(str)
}
let type = undefined
splitData = splitData.map((item) => {
if (isNumberedFormat(item)) {
type = 'startNumber'
return item.replace(/^\d+\./, '')
} else if (isTextFormat(item)) {
type = 'startText'
return item.replace('&【', '\n【')
} else {
return item
}
})
if (type == 'startNumber') {
newWord.value = splitData.join('\n')
} else {
newWord.value = splitData.join('\n\n')
}
}
/**
* AI设置相关
*/
async function AISetting() {
//
//
let dialogWidth = 800
let dialogHeight = 600
dialog.create({
title: 'AI设置',
showIcon: false,
closeOnEsc: false,
content: () => h(ManageAISetting, { type: formValue.value.gptAI }),
style: `width : ${dialogWidth}px; min-height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {}
})
}
/**
* 开始执行GPT
*/
async function ActionStart() {
//
if (
isEmpty(formValue.value.gptType) ||
isEmpty(formValue.value.gptData) ||
isEmpty(formValue.value.gptAI)
) {
message.error('请选择完整的数据')
return
}
softwareStore.spin.spinning = true
softwareStore.spin.tip = '生成中......'
let res = await window.write.ActionStart(toRaw(formValue.value), oldWord.value)
softwareStore.spin.spinning = false
if (res.code == 0) {
message.error(res.message)
softwareStore.spin.spinning = false
return
}
newWord.value = res.data
}
/**
* 选择的提示词类型发生变化时删选提示词预设
* @param value
* @param options
*/
async function UpdateSelectPromptType(value, options) {
gptDataOptions.value = allPromptDataOptions.value
.filter((item) => {
return item.promptTypeId == value
})
.map((item) => {
return { label: item.name, value: item.id }
})
}
</script>

View File

@ -17,7 +17,7 @@
<n-input v-model:value="aiSetting.laiapi.model" type="text" placeholder="请输入Model" />
</div>
</n-card>
<n-card title="豆包设置">
<!-- <n-card title="豆包设置">
<div style="display: flex">
<n-input
v-model:value="aiSetting.doubao.gpt_url"
@ -37,7 +37,7 @@
placeholder="请输入豆包的模型"
/>
</div>
</n-card>
</n-card> -->
<n-card title="KIMI设置">
<div style="display: flex">
<n-input
@ -86,7 +86,7 @@ export default defineComponent({
})
onMounted(async () => {
debugger
// AIsetting
let res = await window.gpt.GetAISetting()
if (res.code == 0) {

View File

@ -1,33 +1,36 @@
<template>
<n-space vertical>
<n-layout has-sider style="height: 100vh; position: relative">
<n-layout-sider
bordered
collapse-mode="width"
:collapsed-width="64"
:width="220"
:collapsed="collapsed"
show-trigger
@collapse="collapsed = true"
@expand="collapsed = false"
style="position: relative"
>
<n-menu
:collapsed="collapsed"
<n-spin :show="show">
<n-space vertical>
<n-layout has-sider style="height: 100vh; position: relative">
<n-layout-sider
bordered
collapse-mode="width"
:collapsed-width="64"
:collapsed-icon-size="22"
:options="menuOptions"
:render-icon="renderMenuIcon"
:expand-icon="expandIcon"
:width="220"
:collapsed="collapsed"
show-trigger
@collapse="collapsed = true"
@expand="collapsed = false"
style="position: relative"
>
</n-menu>
</n-layout-sider>
<n-layout-content content-style="padding: 5px 5px 5px 10px; height:100%">
<!-- <Setting></Setting> -->
<router-view></router-view>
</n-layout-content>
</n-layout>
</n-space>
<n-menu
:collapsed="collapsed"
:collapsed-width="64"
:collapsed-icon-size="22"
:options="menuOptions"
:render-icon="renderMenuIcon"
:expand-icon="expandIcon"
>
</n-menu>
</n-layout-sider>
<n-layout-content content-style="padding: 5px 5px 5px 10px; height:100%">
<!-- <Setting></Setting> -->
<router-view></router-view>
</n-layout-content>
</n-layout>
</n-space>
<template #description> 你不知道你有多幸运 </template>
</n-spin>
</template>
<script>
@ -47,7 +50,8 @@ import {
NSwitch,
NButton,
NFloatButton,
NBadge
NBadge,
NSpin
} from 'naive-ui'
import {
@ -67,6 +71,9 @@ import InputDialogContent from '../Original/Components/InputDialogContent.vue'
import APIIcon from '../Icon/APIIcon.vue'
import BackTaskIcon from '../Icon/BackTaskIcon.vue'
import BackTask from '../Components/BackTask/BackTask.vue'
import { useSystemStore } from '../../../../stores/system'
import { TimeDelay } from '../../../../define/Tools/time'
import { BookBackTaskStatus } from '../../../../define/enum/bookEnum'
export default defineComponent({
components: {
@ -82,7 +89,8 @@ export default defineComponent({
APIIcon,
NFloatButton,
NBadge,
Layers
Layers,
NSpin
},
setup() {
let collapsed = ref(false)
@ -90,9 +98,12 @@ export default defineComponent({
let machineRef = ref()
let message = useMessage()
let notification = useNotification()
let show = ref(true)
const systemStore = useSystemStore()
let key_down_ref = ref(null)
//
function renderMenuIcon(option) {
if (option.key === 'sheep-man') return true
if (option.key === 'food') return null
@ -115,12 +126,121 @@ export default defineComponent({
)
if (option.key == 'TTS_Services') return h(NIcon, null, { default: () => h(RadioOutline) })
}
//
async function StartBackTask(isGiveUp) {
let startRes = await window.task.StartBackTask(isGiveUp)
if (startRes.code == 0) {
message.error(startRes.message)
} else {
message.success(startRes.message)
}
}
/** 判断是不是还是后台任务,用户确认是不是丢弃 */
async function CheckWaitTask() {
await TimeDelay(1000)
let getWaitTaskCountRes = await window.task.GetAllStatusTaskCount([
BookBackTaskStatus.WAIT,
BookBackTaskStatus.RECONNECT
])
//
if (getWaitTaskCountRes.code == 0) {
message.error(getWaitTaskCountRes.message)
await StartBackTask(true)
return
}
if (getWaitTaskCountRes.data && getWaitTaskCountRes.data > 0) {
//
dialog.warning({
title: '后台任务',
content: `检测到后台未完成的任务,任务数量为 ${getWaitTaskCountRes.data},请选择操作!`,
positiveText: '继续执行',
negativeText: '丢弃所有',
onPositiveClick: async () => {
//
await StartBackTask(false)
},
onNegativeClick: async () => {
//
await StartBackTask(true)
}
})
} else {
//
await StartBackTask(true)
}
}
/** 校验机器码的逻辑 */
async function GetMachineStatus() {
try {
//
const machineRes = await window.system.GetMachineId()
if (machineRes.code == 0) {
message.error(machineRes.message)
return
}
systemStore.machineId = machineRes.data
const checkMachineSatatusRes = await window.system.CheckMachineStatus(machineRes.data)
if (checkMachineSatatusRes.code == 1) {
//
message.success('自动检测机器码成功')
//
await CheckWaitTask()
return
} else {
message.error('自动检测机器码失败,请手动确认')
}
//
//
const da = dialog.create({
showIcon: false,
content: () => h(CheckMachineId, { ref: machineRef }),
style: `width : 400px; height: 300px`,
maskClosable: false,
positiveText: '确定',
onClose: () => {
//
window.api.QuitApp()
return false
},
onEsc: () => {
//
window.api.QuitApp()
return false
},
onPositiveClick: async () => {
const checkMachineSatatusRes = await window.system.CheckMachineStatus(machineRes.data)
if (checkMachineSatatusRes.code == 1) {
//
message.success('机器码校验成功')
da.destroy()
//
await CheckWaitTask()
} else {
message.error(checkMachineSatatusRes.message)
return false
}
}
})
} catch (error) {
message.error('获取机器状态码失败,请联系管理员,错误信息如下:' + error.toString())
} finally {
show.value = false
}
}
onMounted(async () => {
//
await window.api.GetVersion((value) => {
document.title = 'LAITool ' + value
})
let res = await window.system.GetViosionAndGpuMessage()
console.log(res)
if (res.code == 1) {
document.title = 'LAITool ' + res.data
} else {
message.success(res.message)
}
// ctrl + alt + l
window.addEventListener('keydown', (e) => {
@ -215,36 +335,7 @@ export default defineComponent({
}
})
//
dialog.create({
showIcon: false,
content: () => h(CheckMachineId, { ref: machineRef }),
style: `width : 400px; height: 300px`,
maskClosable: false,
positiveText: '确定',
onClose: () => {
//
window.api.QuitApp()
return false
},
onEsc: () => {
//
window.api.QuitApp()
return false
},
onPositiveClick: async () => {
await new Promise(async (resolve, reject) => {
await window.api.CheckMachineId(toRaw(machineRef.value.machineId), (value) => {
if (value.code == 0) {
message.error(value.message)
reject()
} else {
resolve()
}
})
})
}
})
await GetMachineStatus()
window.api.getSettingDafultData(async (value) => {
window.config = value
@ -546,7 +637,9 @@ export default defineComponent({
menuOptions,
expandIcon,
OpneBackTask,
collapsed
collapsed,
show,
systemStore
}
}
})

View File

@ -247,7 +247,7 @@ export default defineComponent({
}
imageLoading.value = true
await window.sd.txt2img(JSON.stringify([d]), async (value) => {
debugger
if (value.code == 0) {
message.error(value.message)
imageLoading.value = false

View File

@ -386,7 +386,7 @@ export default defineComponent({
negativeText: '取消',
onPositiveClick: async () => {
if (data.value.mj_message) {
debugger
//
// success error
if (data.value.mj_message.status == 'error') {

View File

@ -207,7 +207,7 @@ export default defineComponent({
style: `width : ${dialogWidth}px; min-height : ${dialogHeight}px`,
maskClosable: false,
onClose: async () => {
debugger
console.log(wenkeRef.value.word)
let word = wenkeRef.value.data
if (word == null || word == '') {

View File

@ -752,7 +752,7 @@ export default defineComponent({
* @param {*} row
*/
async function NextGenerateImage(row, ca = 'sd') {
debugger
let index = data.value.findIndex((item) => item.id == row.id)
let tempData = []
for (let i = index; i < data.value.length; i++) {
@ -851,7 +851,7 @@ export default defineComponent({
*/
async function TranslateAll(key, index = -1) {
//
debugger
if (key == 'english') {
let tmp_d = []
for (let i = 0; i < data.value.length; i++) {

View File

@ -146,11 +146,11 @@ export default defineComponent({
message.error(value.message)
return
}
debugger
console.log(value.value)
//
await window.pmpt.OpenPromptFileTxt(value.value, (res) => {
debugger
console.log(res)
if (res.code == 0) {
message.error(res.message)
@ -165,7 +165,7 @@ export default defineComponent({
positiveText: '继续',
negativeText: '取消',
onPositiveClick: async () => {
debugger
//
for (let i = 0; i < data.value.length && i < res.data.length; i++) {
const element = res.data[i]

View File

@ -217,7 +217,7 @@ export default defineComponent({
* 生成所有的图片
*/
async function GenerateImageAll() {
debugger
let tmpData = cloneDeep(toRaw(data.value))
tmpData = tmpData.filter((item) => {
return item.imageLock == null || item.imageLock == false
@ -363,11 +363,11 @@ export default defineComponent({
message.error(value.message)
return
}
debugger
console.log(value.value)
//
await window.pmpt.OpenPromptFileTxt(value.value, (res) => {
debugger
console.log(res)
if (res.code == 0) {
message.error(res.message)
@ -382,7 +382,7 @@ export default defineComponent({
positiveText: '继续',
negativeText: '取消',
onPositiveClick: async () => {
debugger
//
for (let i = 0; i < data.value.length && i < res.data.length; i++) {
const element = res.data[i]

View File

@ -118,13 +118,13 @@ export default defineComponent({
},
setup() {
let message = useMessage()
debugger
let settingStore = useSettingStore()
let addRef = ref(null)
let loading = ref(false)
onMounted(async () => {
debugger
console.log(settingStore)
})
let rules = {
@ -137,7 +137,7 @@ export default defineComponent({
* 创建账号
*/
async function CreateAccount(e) {
debugger
e.preventDefault()
addRef.value?.validate(async (errors) => {
if (errors) {

View File

@ -289,7 +289,7 @@ export default defineComponent({
//
async function InitData() {
debugger
//
let res = await window.setting.GetMJSettingTreeData()
if (res.code == 0) {
@ -360,7 +360,7 @@ export default defineComponent({
onMounted(async () => {
//
window.api.setEventListen([DEFINE_STRING.DISCORD.OPERATE_REFRASH_DISCORD_URL], (value) => {
debugger
if (value.code == 0) {
message.error(value.message)
return
@ -412,7 +412,7 @@ export default defineComponent({
*/
async function SaveMjSetting(e) {
//
debugger
e.preventDefault()
sampleRef.value?.validate(async (errors) => {
if (errors) {

View File

@ -144,8 +144,8 @@ export default defineComponent({
* 保存翻译设置
*/
async function SaveTranslateSetting() {
debugger
//
//
let selectModel = translateSetting.value.selectModel
let settingIndex = translateSetting.value.translates.findIndex(
(item) => item.name == selectModel

View File

@ -73,7 +73,7 @@ export default defineComponent({
* 切换角色的时候修改角色的配置
*/
function ChangeCharacter(value) {
debugger
let role = roleOptions.value.find(
(item) => item.value === value
)

View File

@ -73,7 +73,7 @@ async function handlePageChange(currentPage) {
async function handleUpdateRow(row, index) {
if (row == null) {
debugger
// data.value.splice(index, 1)
//
await GetTTSHistoryData(pagination.page)

View File

@ -140,7 +140,7 @@ export default defineComponent({
let audioUrl = ref(null)
onMounted(async () => {
debugger
ttsOptions.value = GetTTSSelect()
// TTSTTS
@ -276,7 +276,7 @@ export default defineComponent({
message.error(generateRes.message)
return
}
debugger
audioUrl.value = generateRes.mp3Path
softwareStore.spin.spinning = false
}

View File

@ -366,7 +366,7 @@ export default defineComponent({
})
return
}
debugger
GetCurrentFrameTextLodding.value = true
if (
type.value == SubtitleSavePositionType.MAIN_VIDEO ||

View File

@ -341,7 +341,7 @@ export default defineComponent({
* 回撤
*/
async function undo() {
debugger
if (step <= 0) {
//
imageContext.value.clearRect(
@ -411,7 +411,7 @@ export default defineComponent({
* 查看效果
*/
async function Check() {
debugger
//
if (canvasHistory.length == 0) {
message.error('请先选择去水印的区域')
@ -446,7 +446,7 @@ export default defineComponent({
}
async function SaveMask() {
debugger
//
if (canvasHistory.length <= 0) {
message.error('请先选择去水印的区域')

View File

@ -43,7 +43,7 @@ export default defineComponent({
}
async function selectImage(value) {
debugger
let img = await getBase64(value.file.file)
props.modifyImage(img)
}

View File

@ -65,7 +65,7 @@ export const useReverseManageStore = defineStore('reverseManage', {
*/
async GetBookDataFromDB(condition) {
try {
debugger
//@ts-ignore
let res = await window.book.GetBookData(condition)
if (res.code == 0) {
@ -85,7 +85,7 @@ export const useReverseManageStore = defineStore('reverseManage', {
// 获取小说任务数据
async GetBookTaskDataFromDB(condition) {
try {
debugger
this.bookTaskData = []
//@ts-ignore
let res = await window.book.GetBookTaskData(condition)
@ -203,7 +203,7 @@ export const useReverseManageStore = defineStore('reverseManage', {
//@ts-ignore
save_res = await window.book.AddOrModifyBook({ ...book })
}
debugger
if (save_res.code == 0) {
throw new Error(save_res.message)
}

View File

@ -60,7 +60,6 @@ export const useSoftwareStore = defineStore('software', {
// 获取组件尺寸(判断当前是不是存在,不存在的话到主线程拿)
async GetComponentSize() {
debugger
if (this.componentSize.length == 0) {
//@ts-ignore
let res = await window.setting.GetComponentSize()

Some files were not shown because too many files have changed in this diff Show More