diff --git a/napcat.webui/src/pages/NetWork.vue b/napcat.webui/src/pages/NetWork.vue
index b08f1f45..65d63160 100644
--- a/napcat.webui/src/pages/NetWork.vue
+++ b/napcat.webui/src/pages/NetWork.vue
@@ -149,8 +149,10 @@
-
+
diff --git a/napcat.webui/src/pages/network/HttpClientComponent.vue b/napcat.webui/src/pages/network/HttpClientComponent.vue
index b0fa36fe..2d2d3fa2 100644
--- a/napcat.webui/src/pages/network/HttpClientComponent.vue
+++ b/napcat.webui/src/pages/network/HttpClientComponent.vue
@@ -2,22 +2,22 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -34,14 +34,14 @@ const defaultConfig: HttpClientConfig = {
messagePostFormat: 'array',
reportSelfMessage: false,
token: '',
- debug: false
+ debug: false,
};
const props = defineProps<{
- config: HttpClientConfig;
+ config: { data: HttpClientConfig };
}>();
-const config = ref(Object.assign({}, defaultConfig, props.config));
+props.config.data = { ...defaultConfig, ...props.config.data };
const messageFormatOptions = ref([
{ label: 'Array', value: 'array' },
@@ -49,13 +49,13 @@ const messageFormatOptions = ref([
]);
watch(
- () => config.value.messagePostFormat,
+ () => props.config.data.messagePostFormat,
(newValue) => {
if (newValue !== 'array' && newValue !== 'string') {
- config.value.messagePostFormat = 'array';
+ props.config.data.messagePostFormat = 'array';
}
}
);
-
\ No newline at end of file
+
diff --git a/napcat.webui/src/pages/network/HttpServerComponent.vue b/napcat.webui/src/pages/network/HttpServerComponent.vue
index 36100ce8..51ea5066 100644
--- a/napcat.webui/src/pages/network/HttpServerComponent.vue
+++ b/napcat.webui/src/pages/network/HttpServerComponent.vue
@@ -2,28 +2,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -42,14 +42,14 @@ const defaultConfig: HttpServerConfig = {
enableWebsocket: true,
messagePostFormat: 'array',
token: '',
- debug: false
+ debug: false,
};
const props = defineProps<{
- config: HttpServerConfig;
+ config: { data: HttpServerConfig };
}>();
-const config = ref(Object.assign({}, defaultConfig, props.config));
+props.config.data = { ...defaultConfig, ...props.config.data };
const messageFormatOptions = ref([
{ label: 'Array', value: 'array' },
@@ -57,13 +57,13 @@ const messageFormatOptions = ref([
]);
watch(
- () => config.value.messagePostFormat,
+ () => props.config.data.messagePostFormat,
(newValue) => {
if (newValue !== 'array' && newValue !== 'string') {
- config.value.messagePostFormat = 'array';
+ props.config.data.messagePostFormat = 'array';
}
}
);
-
\ No newline at end of file
+
diff --git a/napcat.webui/src/pages/network/HttpSseServerComponent.vue b/napcat.webui/src/pages/network/HttpSseServerComponent.vue
index 3d1aa715..d86bf39f 100644
--- a/napcat.webui/src/pages/network/HttpSseServerComponent.vue
+++ b/napcat.webui/src/pages/network/HttpSseServerComponent.vue
@@ -2,31 +2,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -46,14 +46,14 @@ const defaultConfig: HttpSseServerConfig = {
messagePostFormat: 'array',
token: '',
debug: false,
- reportSelfMessage: false
+ reportSelfMessage: false,
};
const props = defineProps<{
- config: HttpSseServerConfig;
+ config: { data: HttpSseServerConfig };
}>();
-const config = ref(Object.assign({}, defaultConfig, props.config));
+props.config.data = { ...defaultConfig, ...props.config.data };
const messageFormatOptions = ref([
{ label: 'Array', value: 'array' },
@@ -61,13 +61,13 @@ const messageFormatOptions = ref([
]);
watch(
- () => config.value.messagePostFormat,
+ () => props.config.data.messagePostFormat,
(newValue) => {
if (newValue !== 'array' && newValue !== 'string') {
- config.value.messagePostFormat = 'array';
+ props.config.data.messagePostFormat = 'array';
}
}
);
-
\ No newline at end of file
+
diff --git a/napcat.webui/src/pages/network/WebsocketClientComponent.vue b/napcat.webui/src/pages/network/WebsocketClientComponent.vue
index 424a86f8..95a3137d 100644
--- a/napcat.webui/src/pages/network/WebsocketClientComponent.vue
+++ b/napcat.webui/src/pages/network/WebsocketClientComponent.vue
@@ -2,25 +2,25 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -39,14 +39,14 @@ const defaultConfig: WebsocketClientConfig = {
reconnectInterval: 5000,
token: '',
debug: false,
- heartInterval: 30000
+ heartInterval: 30000,
};
const props = defineProps<{
- config: WebsocketClientConfig;
+ config: { data: WebsocketClientConfig };
}>();
-const config = ref(Object.assign({}, defaultConfig, props.config));
+props.config.data = { ...defaultConfig, ...props.config.data };
const messageFormatOptions = ref([
{ label: 'Array', value: 'array' },
@@ -54,13 +54,13 @@ const messageFormatOptions = ref([
]);
watch(
- () => config.value.messagePostFormat,
+ () => props.config.data.messagePostFormat,
(newValue) => {
if (newValue !== 'array' && newValue !== 'string') {
- config.value.messagePostFormat = 'array';
+ props.config.data.messagePostFormat = 'array';
}
}
);
-
\ No newline at end of file
+
diff --git a/napcat.webui/src/pages/network/WebsocketServerComponent.vue b/napcat.webui/src/pages/network/WebsocketServerComponent.vue
index 6f93191c..41d1c5b7 100644
--- a/napcat.webui/src/pages/network/WebsocketServerComponent.vue
+++ b/napcat.webui/src/pages/network/WebsocketServerComponent.vue
@@ -2,31 +2,31 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -46,14 +46,14 @@ const defaultConfig: WebsocketServerConfig = {
token: '',
enableForcePushEvent: true,
debug: false,
- heartInterval: 30000
+ heartInterval: 30000,
};
const props = defineProps<{
- config: WebsocketServerConfig;
+ config: { data: WebsocketServerConfig };
}>();
-const config = ref(Object.assign({}, defaultConfig, props.config));
+props.config.data = { ...defaultConfig, ...props.config.data };
const messageFormatOptions = ref([
{ label: 'Array', value: 'array' },
@@ -61,13 +61,13 @@ const messageFormatOptions = ref([
]);
watch(
- () => config.value.messagePostFormat,
+ () => props.config.data.messagePostFormat,
(newValue) => {
if (newValue !== 'array' && newValue !== 'string') {
- config.value.messagePostFormat = 'array';
+ props.config.data.messagePostFormat = 'array';
}
}
);
-
\ No newline at end of file
+
diff --git a/src/core/external/face_config.json b/src/core/external/face_config.json
index d065e29e..d0c8685c 100644
--- a/src/core/external/face_config.json
+++ b/src/core/external/face_config.json
@@ -2406,6 +2406,193 @@
"AQLid": "211",
"QHide": "1",
"EMCode": "309"
+ },
+ {
+ "QSid": "424",
+ "QDes": "/续标识",
+ "IQLid": "424",
+ "AQLid": "424",
+ "EMCode": "10424",
+ "QHide": "0",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "52"
+ },
+ {
+ "QSid": "415",
+ "QDes": "/划龙舟",
+ "IQLid": "415",
+ "AQLid": "415",
+ "EMCode": "10415",
+ "QHide": "0",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "43"
+ },
+ {
+ "QSid": "416",
+ "QDes": "/中龙舟",
+ "IQLid": "416",
+ "AQLid": "416",
+ "EMCode": "10416",
+ "QHide": "1",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "44"
+ },
+ {
+ "QSid": "417",
+ "QDes": "/大龙舟",
+ "IQLid": "417",
+ "AQLid": "417",
+ "EMCode": "10417",
+ "QHide": "1",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "45"
+ },
+ {
+ "QSid": "425",
+ "QDes": "/求放过",
+ "IQLid": "425",
+ "AQLid": "425",
+ "EMCode": "10425",
+ "QHide": "0",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "53"
+ },
+ {
+ "QSid": "427",
+ "QDes": "/偷感",
+ "IQLid": "427",
+ "AQLid": "427",
+ "EMCode": "10427",
+ "QHide": "0",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "55"
+ },
+ {
+ "QSid": "426",
+ "QDes": "/玩火",
+ "IQLid": "426",
+ "AQLid": "426",
+ "EMCode": "10426",
+ "QHide": "0",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "54"
+ },
+ {
+ "QSid": "419",
+ "QDes": "/火车",
+ "IQLid": "419",
+ "AQLid": "419",
+ "EMCode": "10419",
+ "QHide": "0",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "47"
+ },
+ {
+ "QSid": "420",
+ "QDes": "/中火车",
+ "IQLid": "420",
+ "AQLid": "420",
+ "EMCode": "10420",
+ "QHide": "1",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "48"
+ },
+ {
+ "QSid": "421",
+ "QDes": "/大火车",
+ "IQLid": "421",
+ "AQLid": "421",
+ "EMCode": "10421",
+ "QHide": "1",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "49"
+ },
+ {
+ "QSid": "429",
+ "QDes": "/蛇年快乐",
+ "IQLid": "429",
+ "AQLid": "429",
+ "EMCode": "10429",
+ "QHide": "0",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "56"
+ },
+ {
+ "QSid": "430",
+ "QDes": "/蛇身",
+ "IQLid": "430",
+ "AQLid": "430",
+ "EMCode": "10430",
+ "QHide": "1",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "57"
+ },
+ {
+ "QSid": "431",
+ "QDes": "/蛇尾",
+ "IQLid": "431",
+ "AQLid": "431",
+ "EMCode": "10431",
+ "QHide": "1",
+ "AniStickerType": 3,
+ "AniStickerPackId": "1",
+ "AniStickerId": "56"
+ },
+ {
+ "QSid": "428",
+ "QDes": "/收到",
+ "IQLid": "428",
+ "AQLid": "428",
+ "EMCode": "10428",
+ "QHide": "0",
+ "AniStickerType": 0,
+ "AniStickerPackId": "0",
+ "AniStickerId": "0"
+ },
+ {
+ "QSid": "422",
+ "QDes": "/粽于等到你",
+ "IQLid": "422",
+ "AQLid": "422",
+ "EMCode": "10422",
+ "QHide": "1",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "50"
+ },
+ {
+ "QSid": "423",
+ "QDes": "/复兴号",
+ "IQLid": "423",
+ "AQLid": "423",
+ "EMCode": "10423",
+ "QHide": "1",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "51"
+ },
+ {
+ "QSid": "432",
+ "QDes": "/灵蛇献瑞",
+ "IQLid": "432",
+ "AQLid": "432",
+ "EMCode": "10432",
+ "QHide": "1",
+ "AniStickerType": 1,
+ "AniStickerPackId": "1",
+ "AniStickerId": "59"
}
],
"emoji": [