V 2.2.9 自动匹配，手动排序

src/define/define_string.js

@@ -6,6 +6,7 @@ export const DEFINE_STRING = {
     GET_DEFINE_CONFIG_JSON_BY_PROPERTY: "GET_DEFINE_CONFIG_JSON_BY_PROPERTY",
     GET_IMAGE_GENERATE_CATEGORY: "GET_IMAGE_GENERATE_CATEGORY",
     SHOW_MAIN_NOTIFICATION: "SHOW_MAIN_NOTIFICATION",
+    SHOW_GLOABAL_MESSAGE: "SHOW_GLOABAL_MESSAGE",
     CHECK_MACHINE_ID: "CHECK_MACHINE_ID",
     GET_CUSTOMIZE_GPT_PROMPT: "GET_CUSTOMIZE_GPT_PROMPT",
     GENERATE_GPT_EXAMPLE_OUT: "GENERATE_GPT_EXAMPLE_OUT",
@@ -159,7 +160,9 @@ export const DEFINE_STRING = {
         GET_GENERATED_MJ_IMAGE_AND_SPLIT: "GET_GENERATED_MJ_IMAGE_AND_SPLIT",
         DOWNLOAD_IMAGE_URL_AND_SPLIT: "DOWNLOAD_IMAGE_URL_AND_SPLIT",
         GET_MJ_IMAGE_SCALE: 'GET_MJ_IMAGE_SCALE',
-        GET_MJ_IMAGE_ROBOT_MODEL: "GET_MJ_IMAGE_ROBOT_MODEL"
+        GET_MJ_IMAGE_ROBOT_MODEL: "GET_MJ_IMAGE_ROBOT_MODEL",
+        MACTH_USER_RETURN: "MACTH_USER_RETURN",
+        AUTO_MATCH_USER: "AUTO_MATCH_USER",
     },
     DISCORD: {
         OPERATE_REFRASH_DISCORD_URL: "OPERATE_REFRASH_DISCORD_URL",
@@ -188,5 +191,15 @@ export const DEFINE_STRING = {
     },
     SYSTEM: {
         OPEN_FILE: "OPEN_FILE",
+    },
+    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",
+        DELETE_DATA_BY_TYPE_AND_PROPERTY: "DELETE_DATA_BY_TYPE_AND_PROPERTY",
+    },
+    PROMPT: {
+        GET_SORT_OPTIONS: "GET_SORT_OPTIONS",
+        SAVE_PROMPT_SORT_DATA: "SAVE_PROMPT_SORT_DATA",
+        GET_PROMPT_SORT_DATA: "GET_PROMPT_SORT_DATA"
     }
 }

src/define/logger_define.js

@@ -1,3 +1,15 @@
 export const LOGGER_DEFINE = {
+
     REMOVE_WATERMARK: "去除水印",
+    ORIGINAL_AUTO_MATCH_USER: "原创自动匹配用户",
+
+    PROMPT: {
+        GET_PROMPT_SORT_OPTIONS: "获取所有的排序选项",
+        SAVE_PROMPT_SORT_DATA: "保存提示词排序的数据",
+        GET_PROMPT_SORT_DATA: "获取提示词排序的数据"
+    },
+
+    GLOBAL: {
+        PARAM_ERROR: "参数错误",
+    }
 }

src/define/setting/dynamicSetting.js

@@ -2,6 +2,7 @@
 let fspromises = require('fs').promises;
 import { get, cloneDeep } from 'lodash';
 import { define } from '../define';
+import { errorMessage } from '../../main/generalTools';
 
 export class DynamicSetting {
     constructor(global) {
@@ -114,6 +115,71 @@ export class DynamicSetting {
             throw error;
         }
     }
+}
 
+// 初始化一个对象
+let dynamic = new DynamicSetting(global);
 
+/**
+ * 将传入的数据和当前的数据进行拼接返回，判断类型
+ * @param {*} value 
+ */
+export async function GetDataByTypeAndProperty(value) {
+    try {
+        // 判断value的类型是不是string
+        if (typeof value == "string") {
+            value = JSON.parse(value);
+        }
+        // 判断必要的数据是不是存在
+        if (!value.mainType || !value.property) {
+            throw new Error("传入的数据不完整");
+        }
+        value.defaultData = value.defaultData ? value.defaultData : [];
+        let res = await dynamic.getDataByTypeAndProperty('dynamic', value.mainType, value.property, [], []);
+        return res;
+
+    } catch (error) {
+        return errorMessage(error.toString());
+    }
+
+}
+
+/**
+ * 保存数据，注意，这里不能传递回调函数
+ * @param {*} value 
+ */
+export async function SaveDataByTypeAndProperty(value) {
+    try {
+        if (typeof value == "string") {
+            value = JSON.parse(value);
+        }
+        // 判断必要的数据是不是存在
+        if (!value.mainType || !value.property || !value.data) {
+            throw new Error("传入的数据不完整");
+        }
+        let res = await dynamic.saveDataByTypeAndProperty(value.data, value.mainType, value.property, null);
+        return res;
+    } catch (error) {
+        return errorMessage(error.toString());
+    }
+}
+
+/**
+ * 删除数据
+ * @param {*} value 
+ */
+export async function DeleteDataByTypeAndProperty(value) {
+    try {
+        if (typeof value == "string") {
+            value = JSON.parse(value);
+        }
+        // 判断必要的数据是不是存在
+        if (!value.id || !value.mainType || !value.property) {
+            throw new Error("传入的数据不完整");
+        }
+        let res = await dynamic.deleteDataByTypeAndProperty(value.id, value.mainType, value.property);
+        return res;
+    } catch (error) {
+        return errorMessage(error.toString());
+    }
 }

src/define/setting/imageSetting.js

@@ -214,8 +214,8 @@ export const ImageSetting = {
      * @param {*} value 
      * 0 define中的指定属性（指定的配置文件）
      * 1 要获取的什么属性信息 property，property 为null，赶回当前配置文件的所有数据
-     * 2 是不是要校验属性不存在
-     * 3 属性没有找到的默认值
+     * 2 要写入的值
+     * 3 是不是要校验属性不存在
      */
     async SaveDefineConfigJsonByProperty(value) {
         try {