abler-api 0.1.55 → 0.1.57
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/dist/cjs/pp-util.js +10 -6
- package/package.json +1 -1
package/dist/cjs/pp-util.js
CHANGED
|
@@ -254,11 +254,15 @@ class apiUtil$2 {
|
|
|
254
254
|
*/
|
|
255
255
|
|
|
256
256
|
|
|
257
|
-
static apiFail(error, req) {
|
|
257
|
+
static apiFail(error, req, spOrderNum) {
|
|
258
258
|
configNeeded();
|
|
259
259
|
let response = err$2.ERROR(error, err$2.errorLangParamFlag + ppUtil$4.getMsgLang(req));
|
|
260
260
|
response.datetime = new Date();
|
|
261
261
|
|
|
262
|
+
if (spOrderNum) {
|
|
263
|
+
response.spOrderNum = spOrderNum;
|
|
264
|
+
}
|
|
265
|
+
|
|
262
266
|
if (req && req.headers) {
|
|
263
267
|
let userAgent = req.headers["user-agent"];
|
|
264
268
|
|
|
@@ -2105,11 +2109,11 @@ class schedule$1 {
|
|
|
2105
2109
|
|
|
2106
2110
|
let enabled = // PM2配置中指定了环境变量 SCHEDULE_ENABLED
|
|
2107
2111
|
!!process.env.SCHEDULE_ENABLED // 如果PM2启动了多个进程，则只在第一个进程执行
|
|
2108
|
-
&& process.env.NODE_APP_INSTANCE === '0'; // 如果有多台服务器，则只在第一台执行
|
|
2109
|
-
|
|
2110
|
-
|
|
2111
|
-
|
|
2112
|
-
|
|
2112
|
+
&& process.env.NODE_APP_INSTANCE === '0'; // // 如果有多台服务器，则只在第一台执行
|
|
2113
|
+
// if (enabled && conf.appSetting.serverHosts && (conf.appSetting.serverHosts.length > 1)) {
|
|
2114
|
+
// enabled = conf.myMsgAddr.indexOf(conf.appSetting.serverHosts[0]) === 0;
|
|
2115
|
+
// }
|
|
2116
|
+
// todo: 暂时取消此限制，要通过配置设定
|
|
2113
2117
|
|
|
2114
2118
|
return enabled;
|
|
2115
2119
|
}
|