yakuza0 2.22.1-beta.1 → 2.22.1-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.22.1-beta.1",
+  "version": "2.22.1-beta.3",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {

package/server/proxy/csrf.js

@@ -347,7 +347,7 @@ exports.default = function () {
                   while (1) {
                     switch (_context.prev = _context.next) {
                       case 0:
-                        if (!(ctx.method.toUpperCase() === 'GET' && ctx.path === '/sys/health-check')) {
+                        if (!(ctx.method.toUpperCase() === 'GET' && (ctx.path === '/sys/health-check' || ctx.path === config.appConf.server.basePathMU + 'sys/health-check'))) {
                           _context.next = 5;
                           break;
                         }

package/server/proxy/tire.js

@@ -84,7 +84,7 @@ exports.default = function () {
   var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(_ref) {
     var config = _ref.config;
 
-    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
+    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, appHc, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
 
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -98,6 +98,26 @@ exports.default = function () {
             timeout = _config2.default.server.infoTimeout + 5000;
             commonHeaders = {};
 
+            // health-check ssl use
+
+            if (_config2.default.inImage) {
+              appHc = express();
+
+              appHc.use(function (req, res, next) {
+                var method = req.method.toUpperCase();
+                var path = req.url;
+                if (method === "GET" && path === '/sys/health-check') {
+                  res.status(200).send({
+                    response_status: 200,
+                    data: 'alive'
+                  });
+                } else {
+                  res.status(404).send("The page was not found ~~");
+                }
+              });
+              appHc.listen(_config2.default.server.hcPort);
+            }
+
             getHeader = function getHeader(req) {
               if (req && req.headers) {
                 var _ref3;
@@ -108,7 +128,7 @@ exports.default = function () {
             };
 
             if (!server.generate.enabled) {
-              _context3.next = 26;
+              _context3.next = 27;
               break;
             }
 
@@ -228,14 +248,14 @@ exports.default = function () {
             }();
 
             if (_config2.default.security.isTire) {
-              _context3.next = 16;
+              _context3.next = 17;
               break;
             }
 
-            _context3.next = 16;
+            _context3.next = 17;
             return build();
 
-          case 16:
+          case 17:
             baseConfig = {
               // changeOrigin: true,
               secure: false,
@@ -551,7 +571,7 @@ exports.default = function () {
               }, server.generate.maxAge * 1000);
             }
 
-          case 26:
+          case 27:
           case "end":
             return _context3.stop();
         }

package/utils/inclusive.js

@@ -277,6 +277,7 @@ var render = function () {
                 host: processEnv.HOST || '127.0.0.1',
                 port: processEnv.PORT || 3000,
                 appPort: processEnv.PORT || 3100,
+                hcPort: 81,
                 orbHost: processEnv.ORBHOST || 'fe-dev.inner.px.nfjbill.ren',
                 orbPort: processEnv.ORBPORT || 5601,
                 orbHosts: processEnv.ORBHOSTS,
@@ -732,71 +733,62 @@ var render = function () {
             });
 
             if (!conf.server.edas.enabled) {
-              _context2.next = 33;
+              _context2.next = 27;
               break;
             }
 
             _context2.prev = 15;
-
-            console.log(1);
             client = new _acmSdk2.default(conf.server.edas.options);
-
-            console.log(2);
-            _context2.next = 21;
+            _context2.next = 19;
             return client.getConfig(conf.server.edas.dataId, conf.server.edas.group);
 
-          case 21:
+          case 19:
             content = _context2.sent;
-
-            console.log(3, content);
             acmConf = JSON.parse(content);
 
-            console.log(4, acmConf);
             setConf(acmConf);
-            console.log(5, conf);
-            _context2.next = 33;
+            _context2.next = 27;
             break;
 
-          case 29:
-            _context2.prev = 29;
+          case 24:
+            _context2.prev = 24;
             _context2.t0 = _context2['catch'](15);
 
-            console.log(6, _context2.t0);
             console.log(_context2.t0);
 
-          case 33:
+          case 27:
             _context2.t1 = conf.dkyMode;
-            _context2.next = _context2.t1 === "dev" ? 36 : _context2.t1 === "normal" ? 39 : _context2.t1 === "prod" ? 42 : _context2.t1 === "stupid" ? 48 : _context2.t1 === "tire" ? 56 : 62;
+            _context2.next = _context2.t1 === "dev" ? 30 : _context2.t1 === "normal" ? 33 : _context2.t1 === "prod" ? 36 : _context2.t1 === "stupid" ? 42 : _context2.t1 === "tire" ? 50 : 56;
             break;
 
-          case 36:
+          case 30:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isDev = true;
             conf.dev = true;
-            return _context2.abrupt('break', 62);
+            return _context2.abrupt('break', 56);
 
-          case 39:
+          case 33:
             // conf.security.encrypt = "none";
             // conf.security.stupid = false;
             // conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isNormal = true;
             conf.dev = false;
-            return _context2.abrupt('break', 62);
+            return _context2.abrupt('break', 56);
 
-          case 42:
+          case 36:
             conf.security.encrypt = "sm";
             conf.security.stupid = false;
             conf.security.helmet = true;
             // conf.server.f5Offline = false;
             conf.security.isProd = true;
             conf.dev = false;
-            return _context2.abrupt('break', 62);
+            return _context2.abrupt('break', 56);
 
-          case 48:
+          case 42:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -805,18 +797,18 @@ var render = function () {
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
             conf.dev = false;
-            return _context2.abrupt('break', 62);
+            return _context2.abrupt('break', 56);
 
-          case 56:
+          case 50:
             conf.security.encrypt = "none";
             conf.security.stupid = false;
             conf.security.helmet = false;
             // conf.server.f5Offline = false;
             conf.security.isTire = true;
             conf.dev = false;
-            return _context2.abrupt('break', 62);
+            return _context2.abrupt('break', 56);
 
-          case 62:
+          case 56:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -916,7 +908,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 83;
+            _context2.next = 77;
             return _yakuza._.asyncMap(conf.router.config, function () {
               var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(v, key) {
                 var name, arr, length, num;
@@ -1099,7 +1091,7 @@ var render = function () {
               };
             }());
 
-          case 83:
+          case 77:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1221,12 +1213,12 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 94:
+          case 88:
           case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, undefined, [[15, 29]]);
+    }, _callee2, undefined, [[15, 24]]);
   }));
 
   return function render(_x) {