@xrystal/core 3.24.0 → 3.24.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -96,7 +96,7 @@ export default class Controller extends BaseController {
|
|
|
96
96
|
if (!msg)
|
|
97
97
|
return '';
|
|
98
98
|
let content = String(msg);
|
|
99
|
-
let useDirect =
|
|
99
|
+
let useDirect = false;
|
|
100
100
|
if (content.startsWith('@')) {
|
|
101
101
|
content = content.substring(1);
|
|
102
102
|
useDirect = true;
|
|
@@ -107,6 +107,9 @@ export default class Controller extends BaseController {
|
|
|
107
107
|
if (useDirect) {
|
|
108
108
|
return t(key, params);
|
|
109
109
|
}
|
|
110
|
+
if (isError) {
|
|
111
|
+
return responseMessageHelper.unsuccessful(t(key), params.join(' '), t);
|
|
112
|
+
}
|
|
110
113
|
return responseMessageHelper.successfully(t(key), params.join(' '), t);
|
|
111
114
|
}
|
|
112
115
|
async schema({ checks, logic, response }) {
|
|
@@ -126,7 +129,7 @@ export default class Controller extends BaseController {
|
|
|
126
129
|
const checkResult = await checks(p);
|
|
127
130
|
if (checkResult !== true) {
|
|
128
131
|
const bizCode = checkResult?.code ?? 400;
|
|
129
|
-
const msg = checkResult?.message || (typeof checkResult === 'string' ? checkResult : '
|
|
132
|
+
const msg = checkResult?.message || (typeof checkResult === 'string' ? checkResult : 'unsuccessful');
|
|
130
133
|
let errorPayload = undefined;
|
|
131
134
|
if (checkResult?.payload) {
|
|
132
135
|
errorPayload = {
|
|
@@ -151,9 +154,10 @@ export default class Controller extends BaseController {
|
|
|
151
154
|
}
|
|
152
155
|
if (logicResult?.status === false) {
|
|
153
156
|
const bizCode = logicResult.code ?? 400;
|
|
157
|
+
const msg = logicResult.message || 'unsuccessful';
|
|
154
158
|
return currentRes.status(bizCode).send(new ResponseSchema({
|
|
155
159
|
status: false,
|
|
156
|
-
message: this.parseMessage(
|
|
160
|
+
message: this.parseMessage(msg, currentReq.t, true),
|
|
157
161
|
code: bizCode
|
|
158
162
|
}).getResponse);
|
|
159
163
|
}
|
|
@@ -211,7 +215,7 @@ export default class Controller extends BaseController {
|
|
|
211
215
|
this.logger?.log(LoggerLayerEnum.ERROR, `Controller Error: ${error.message}`);
|
|
212
216
|
return this.res.status(500).send(new ResponseSchema({
|
|
213
217
|
status: false,
|
|
214
|
-
message: error.message || '
|
|
218
|
+
message: error.message || 'unsuccessful',
|
|
215
219
|
code: 500
|
|
216
220
|
}).getResponse);
|
|
217
221
|
}
|