yakuza0 2.22.34-beta.8 → 2.22.34-beta.9
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 +1 -1
- package/server/proxy/tire.js +6 -7
package/package.json
CHANGED
package/server/proxy/tire.js
CHANGED
|
@@ -92,7 +92,7 @@ exports.default = function () {
|
|
|
92
92
|
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(_ref) {
|
|
93
93
|
var config = _ref.config;
|
|
94
94
|
|
|
95
|
-
var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath, conf;
|
|
95
|
+
var appConf, guPort, appConfPort, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _th, th, basePath, conf, _pathRewrite;
|
|
96
96
|
|
|
97
97
|
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
|
98
98
|
while (1) {
|
|
@@ -447,6 +447,10 @@ exports.default = function () {
|
|
|
447
447
|
});
|
|
448
448
|
|
|
449
449
|
if (_config2.default.security.isTire) {
|
|
450
|
+
try {
|
|
451
|
+
(0, _child_process.exec)(_config2.default.server.tire.guPath + ' -s stop');
|
|
452
|
+
// spawn(yConf.server.tire.guPath, ['-s', 'stop']);
|
|
453
|
+
} catch (e) {}
|
|
450
454
|
th = (_th = {}, (0, _defineProperty3.default)(_th, _def.variable.ipHeader, '127.0.0.1'), (0, _defineProperty3.default)(_th, _def.variable.childKeyHeader, _config2.default.childKey), (0, _defineProperty3.default)(_th, _def.variable.appCodeHeader, config.appConf.appCode), (0, _defineProperty3.default)(_th, _def.variable.appKeyHeader, config.appKey), (0, _defineProperty3.default)(_th, _def.variable.shareRuleHeader, (0, _stringify2.default)(_config2.default.shareRule)), _th);
|
|
451
455
|
basePath = _server._.bothAddFix(config.appConf.server.basePath, "/");
|
|
452
456
|
|
|
@@ -463,18 +467,13 @@ exports.default = function () {
|
|
|
463
467
|
});
|
|
464
468
|
|
|
465
469
|
_paths2.default.write(_config2.default.server.tire.clnConf, conf);
|
|
466
|
-
|
|
467
|
-
try {
|
|
468
|
-
(0, _child_process.exec)(_config2.default.server.tire.guPath + ' -s stop');
|
|
469
|
-
// spawn(yConf.server.tire.guPath, ['-s', 'stop']);
|
|
470
|
-
} catch (e) {}
|
|
471
470
|
(0, _child_process.exec)(_config2.default.server.tire.guPath + ' -c ' + _config2.default.server.tire.guConf + ' -g "daemon off;"');
|
|
472
471
|
// spawn(yConf.server.tire.guPath, ['-c', yConf.server.tire.guConf]);
|
|
473
472
|
} else {
|
|
474
473
|
app.use(basePath + "apiv1", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
|
|
475
474
|
target: _config2.default.server.orbProtocol.http + "//" + _config2.default.server.orbHost + ":" + _config2.default.server.orbPort,
|
|
476
475
|
headers: th,
|
|
477
|
-
pathRewrite: (0, _defineProperty3.default)(
|
|
476
|
+
pathRewrite: (_pathRewrite = {}, (0, _defineProperty3.default)(_pathRewrite, "^" + basePath + "apiv1/feapiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/feapiv1"), (0, _defineProperty3.default)(_pathRewrite, "^" + basePath + "apiv1", "/" + _config2.default.proxyServer.apiKey + "/" + _config2.default.name + "/client/backend"), _pathRewrite)
|
|
478
477
|
})));
|
|
479
478
|
|
|
480
479
|
app.use(basePath + "apiv2", createProxyMiddleware((0, _extends5.default)({}, baseConfig, {
|