yakuza0 2.22.1-beta.3 → 2.22.1

package/cli/index.js

@@ -207,7 +207,7 @@ var run = exports.run = function () {
                     env = _ref4.env,
                     mode = _ref4.mode;
 
-                var _ref6, apps;
+                var _ref6, apps, bin;
 
                 return _regenerator2.default.wrap(function _callee2$(_context2) {
                   while (1) {
@@ -222,21 +222,30 @@ var run = exports.run = function () {
                       case 4:
                         _ref6 = _context2.sent;
                         apps = _ref6.apps;
+                        bin = "yk-dev";
+                        _context2.t0 = _os2.default.type();
+                        _context2.next = _context2.t0 === "Linux" ? 10 : 12;
+                        break;
+
+                      case 10:
+                        bin = "yk";
+                        return _context2.abrupt('break', 12);
 
+                      case 12:
 
                         if (mode === "async") {
                           apps.forEach(function (key) {
-                            spawn('yk-dev', ['serve', key], { shell: true, stdio: 'inherit' });
+                            spawn(bin, ['serve', key], { shell: true, stdio: 'inherit' });
                           });
                         } else {
                           // await _.asyncMap(apps, async (key) => {
                           //   spawn(`yk-dev`, ['serve', key], { shell: true, stdio: 'inherit' });
                           //   // spawnSync(`yk-dev`, ['serve', key], { shell: true, stdio: 'inherit' });
                           // })
-                          spawn('yk-dev', ['serve', apps.join(',')], { shell: true, stdio: 'inherit' });
+                          spawn(bin, ['serve', apps.join(',')], { shell: true, stdio: 'inherit' });
                         }
 
-                      case 7:
+                      case 13:
                       case 'end':
                         return _context2.stop();
                     }

package/package.json

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

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, appHc, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
+    var appConf, appName, server, pIp, pHost, timeout, commonHeaders, getHeader, isFastDfs, apiVer, getUc, build, baseConfig, app, _headers;
 
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -98,25 +98,23 @@ 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);
-            }
+            // // health-check ssl use
+            // if (yConf.inImage) {
+            //   const appHc = express();
+            //   appHc.use((req, res, next) => {
+            //     const method = req.method.toUpperCase();
+            //     const 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(yConf.server.hcPort);
+            // }
 
             getHeader = function getHeader(req) {
               if (req && req.headers) {
@@ -128,7 +126,7 @@ exports.default = function () {
             };
 
             if (!server.generate.enabled) {
-              _context3.next = 27;
+              _context3.next = 26;
               break;
             }
 
@@ -248,14 +246,14 @@ exports.default = function () {
             }();
 
             if (_config2.default.security.isTire) {
-              _context3.next = 17;
+              _context3.next = 16;
               break;
             }
 
-            _context3.next = 17;
+            _context3.next = 16;
             return build();
 
-          case 17:
+          case 16:
             baseConfig = {
               // changeOrigin: true,
               secure: false,
@@ -571,7 +569,7 @@ exports.default = function () {
               }, server.generate.maxAge * 1000);
             }
 
-          case 27:
+          case 26:
           case "end":
             return _context3.stop();
         }

package/utils/inclusive.js

@@ -277,7 +277,7 @@ var render = function () {
                 host: processEnv.HOST || '127.0.0.1',
                 port: processEnv.PORT || 3000,
                 appPort: processEnv.PORT || 3100,
-                hcPort: 81,
+                // hcPort: 81,
                 orbHost: processEnv.ORBHOST || 'fe-dev.inner.px.nfjbill.ren',
                 orbPort: processEnv.ORBPORT || 5601,
                 orbHosts: processEnv.ORBHOSTS,