yakuza0 2.20.6 → 2.20.7

package/cli/index.js

@@ -433,9 +433,10 @@ var run = exports.run = function () {
               }, _callee9, undefined);
             })));
 
-            _commander2.default.command('verify <cmd>').option('-e, --edit <envName>', 'commit msg').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('husky').action(function () {
+            _commander2.default.command('verify <cmd>').option('-ed, --edit <envName>', 'commit file').option('-m, --msg <msg>', 'commit msg').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('husky').action(function () {
               var _ref17 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(cmd, _ref16) {
                 var edit = _ref16.edit,
+                    msg = _ref16.msg,
                     yk0BuildApp = _ref16.yk0BuildApp,
                     env = _ref16.env;
                 return _regenerator2.default.wrap(function _callee10$(_context10) {
@@ -452,7 +453,7 @@ var run = exports.run = function () {
 
                       case 3:
                         _context10.t0 = cmd;
-                        _context10.next = _context10.t0 === "commit-init" ? 6 : _context10.t0 === "commit-eslint" ? 9 : _context10.t0 === "commit-msg" ? 12 : 15;
+                        _context10.next = _context10.t0 === "commit-init" ? 6 : 9;
                         break;
 
                       case 6:
@@ -467,14 +468,12 @@ var run = exports.run = function () {
                         return (0, _verify.commitEsLint)({ edit: edit });
 
                       case 11:
-                        return _context10.abrupt('break', 15);
-
-                      case 12:
-                        _context10.next = 14;
-                        return (0, _verify.commitMsg)({ edit: edit });
+                        _context10.next = 13;
+                        return (0, _verify.commitStyleLint)({ edit: edit });
 
-                      case 14:
-                        return _context10.abrupt('break', 15);
+                      case 13:
+                        _context10.next = 15;
+                        return (0, _verify.commitMsg)({ edit: msg });
 
                       case 15:
                       case 'end':
@@ -487,7 +486,17 @@ var run = exports.run = function () {
               return function (_x10, _x11) {
                 return _ref17.apply(this, arguments);
               };
-            }());
+            }()
+            // case "commit-eslint":
+            //   await commitEsLint({edit});
+            //   break;
+            // case "commit-stylelint":
+            //   await commitStyleLint({edit});
+            //   break;
+            // case "commit-msg":
+            //   await commitMsg({edit});
+            //   break;
+            );
 
             _commander2.default.command('server <cmd>').alias('s').option('-y0ba, --yk0-build-app <appName>', 'Building a specified application').option('-e, --env <envName>', 'yk server env').description('service control').action(function () {
               var _ref19 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee12(cmd, _ref18) {

package/nuxt/build/index.js

@@ -186,6 +186,10 @@ exports.default = function (config) {
     //     console.log(p.constructor.name);
     //   });
     // }
+
+    if (ctx.loaders && ctx.loaders.scss) {
+      ctx.loaders.scss.additionalData = '@use "sass:math";\n@use "sass:color";\n@use "sass:list";\n@use "sass:map";\n@use "sass:meta";\n@use "sass:selector";\n@use "sass:string";\n';
+    }
   };
 
   // config.build.vendor = ['babel-polyfill'];

package/nuxt/buildModules/logger.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var consola = require('consola');
+
+module.exports = consola.withScope('yk:stylelint');

package/nuxt/buildModules/stylelint.js

@@ -0,0 +1,58 @@
+'use strict';
+
+var _extends2 = require('babel-runtime/helpers/extends');
+
+var _extends3 = _interopRequireDefault(_extends2);
+
+var _paths = require('../../config/paths');
+
+var _paths2 = _interopRequireDefault(_paths);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+// const { resolve } = require('path')
+var _require = require('./utils'),
+    moduleExists = _require.moduleExists;
+
+var logger = require('./logger');
+
+
+module.exports = function (moduleOptions) {
+  if (!moduleExists('stylelint')) {
+    logger.warn('The dependency `stylelint` not found.', 'Please run `pxnpm install stylelint --save-dev` or `npm install stylelint --save-dev`');
+    return;
+  }
+
+  var options = (0, _extends3.default)({
+    context: this.options.srcDir,
+    // configFile: paths.appDirectory + paths.sep + ".stylelintrc.js",
+    files: [this.options.dir.assets + '/**/*.{s?(a|c)ss,less,stylus}', '{components,' + this.options.dir.layouts + ',' + this.options.dir.pages + '}/**/*.vue']
+  }, this.options.stylelint, moduleOptions);
+
+  var filesToWatch = ['.stylelintignore', '.stylelintrc', '.stylelintrc.json', '.stylelintrc.yaml', '.stylelintrc.yml', '.stylelintrc.js', 'stylelint.config.js'];
+
+  filesToWatch.forEach(function (p) {
+    var v = _paths2.default.appDirectory + _paths2.default.sep + p;
+    if (_paths2.default.access(v)) {
+      options.configFile = v;
+    }
+  });
+
+  // this.options.watch.push(
+  //   ...filesToWatch.map(p => (paths.appDirectory + paths.sep + p))
+  // )
+
+  console.warn = function () {};
+  this.extendBuild(function (config, _ref) {
+    var isDev = _ref.isDev,
+        isClient = _ref.isClient;
+
+    if (isDev && isClient) {
+      var StylelintPlugin = require('stylelint-webpack-plugin');
+
+      config.plugins.push(new StylelintPlugin(options));
+    }
+  });
+};
+
+// module.exports.meta = require('../package.json')

package/nuxt/buildModules/utils.js

@@ -0,0 +1,13 @@
+"use strict";
+
+var moduleExists = function moduleExists(name) {
+  try {
+    return require.resolve(name);
+  } catch (e) /* istanbul ignore next */{
+    return false;
+  }
+};
+
+module.exports = {
+  moduleExists: moduleExists
+};

package/nuxt/store/index.js

@@ -2,10 +2,17 @@
 
 var _yakuza = require('yakuza1');
 
+var _init = require('yakuza0/nuxt/store/init');
+
+var ykInit = _interopRequireWildcard(_init);
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
+
 var commonStore = require.context('$common.store/', true, /\.js$/);
 var store = require.context('~/store/', true, /\.js$/);
 
 var storeObj = {};
+storeObj['__yk_init__'] = ykInit;
 
 var errStateFile = [];
 

package/nuxt/store/init.js

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var namespaced = exports.namespaced = true;
+var state = exports.state = function state() {
+  return {
+    gu: {
+      group: '',
+      name: '',
+      ver: ''
+    }
+  };
+};
+var mutations = exports.mutations = {
+  SET_GU: function SET_GU(state, gu) {
+    state.gu = gu;
+  }
+};
+var actions = exports.actions = {
+  setGU: function setGU(_ref, gu) {
+    var commit = _ref.commit;
+
+    commit('SET_GU', gu);
+  }
+};

package/nuxt/style.js

@@ -26,10 +26,22 @@ var _config = require('../config');
 
 var _config2 = _interopRequireDefault(_config);
 
+var _paths = require('../config/paths');
+
+var _paths2 = _interopRequireDefault(_paths);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 exports.default = function (config) {
+  var stylelint = _config2.default.extend.plugins.stylelint;
+
   config.buildModules = ['@rdc/nuxtjs-style-resources'];
+
+  if (stylelint.enabled) {
+    var sm = ['yakuza0/nuxt/buildModules/stylelint', stylelint.options];
+    config.buildModules.push(sm);
+  }
+
   var globalStyle = (0, _extends3.default)({
     compile: [],
     sass: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.20.6",
+  "version": "2.20.7",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -27,6 +27,7 @@
     "@commitlint/load": "^12.1.1",
     "@commitlint/read": "^12.1.1",
     "@nuxtjs/eslint-config": "^3.0.0",
+    "@nuxtjs/stylelint-module": "^4.0.0",
     "@rdc/nuxt": "2.15.8-0",
     "@rdc/nuxtjs-style-resources": "^1.0.0",
     "address": "^1.0.3",
@@ -71,16 +72,26 @@
     "less": "^3.10.3",
     "less-loader": "^5.0.0",
     "markdown-loader": "^6.0.0",
-    "node-sass": "^4.9.3",
     "node-ssh": "5",
     "path-match": "^1.2.4",
     "pm2": "^4.2.0",
     "react-dev-utils": "^11.0.4",
     "require-from-string": "^2.0.2",
     "rimraf": "^2.6.3",
-    "sass-loader": "^7.1.0",
+    "sass": "^1.43.4",
+    "sass-loader": "^10",
     "semver": "^6.3.0",
     "socket.io-client": "^2.2.0",
+    "stylelint": "^14.1.0",
+    "stylelint-config-prettier": "^9.0.3",
+    "stylelint-config-rational-order": "^0.1.2",
+    "stylelint-config-recommended-vue": "^1.0.0",
+    "stylelint-config-standard": "^24.0.0",
+    "stylelint-config-standard-scss": "^2.0.1",
+    "stylelint-declaration-block-no-ignored-properties": "^2.5.0",
+    "stylelint-order": "^5.0.0",
+    "stylelint-scss": "^4.0.0",
+    "stylelint-webpack-plugin": "^3.1.0",
     "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
     "tcp-port-used": "^1.0.1",

package/server/proxy/csrf.js

@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _regenerator = require('babel-runtime/regenerator');
-
-var _regenerator2 = _interopRequireDefault(_regenerator);
-
 var _keys = require('babel-runtime/core-js/object/keys');
 
 var _keys2 = _interopRequireDefault(_keys);
 
+var _regenerator = require('babel-runtime/regenerator');
+
+var _regenerator2 = _interopRequireDefault(_regenerator);
+
 var _toConsumableArray2 = require('babel-runtime/helpers/toConsumableArray');
 
 var _toConsumableArray3 = _interopRequireDefault(_toConsumableArray2);
@@ -165,13 +165,13 @@ var ssrReqAllow = function ssrReqAllow(ctx) {
 var ddos = {};
 
 exports.default = function () {
-  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(_ref2) {
+  var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee11(_ref2) {
     var app = _ref2.app,
         config = _ref2.config;
     var cspConnectSrcVerify, appCp, appCpApiV1, jwtVerC, omConf, cm;
-    return _regenerator2.default.wrap(function _callee10$(_context10) {
+    return _regenerator2.default.wrap(function _callee11$(_context11) {
       while (1) {
-        switch (_context10.prev = _context10.next) {
+        switch (_context11.prev = _context11.next) {
           case 0:
             // if (yConf.security.isTire) {
             //   const proxy = httpProxy.createServer({
@@ -336,10 +336,55 @@ exports.default = function () {
 
             app.use(function () {
               var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(ctx, next) {
-                var keys;
                 return _regenerator2.default.wrap(function _callee$(_context) {
                   while (1) {
                     switch (_context.prev = _context.next) {
+                      case 0:
+                        if (!(ctx.method.toUpperCase() === 'GET' && ctx.path === '/sys/health-check')) {
+                          _context.next = 5;
+                          break;
+                        }
+
+                        ctx.status = 200;
+                        ctx.body = {
+                          response_status: 200,
+                          data: 'alive'
+                        };
+                        _context.next = 7;
+                        break;
+
+                      case 5:
+                        _context.next = 7;
+                        return next();
+
+                      case 7:
+                      case 'end':
+                        return _context.stop();
+                    }
+                  }
+                }, _callee, undefined);
+              }));
+
+              return function (_x3, _x4) {
+                return _ref4.apply(this, arguments);
+              };
+            }()
+            // if (ctx.method !== "/") {
+            //   const keys =  [...Object.keys(yConf.proxyServer.proxy), yConf.proxyServer.apiKey];
+            //   keys.forEach((key) => {
+            //     const tk = _.trim(key);
+            //     ctx.path = ctx.path.replace(config.appConf.server.basePath + "/" + tk, tk);
+            //   })
+            // }
+            // await next()
+            );
+
+            app.use(function () {
+              var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx, next) {
+                var keys;
+                return _regenerator2.default.wrap(function _callee2$(_context2) {
+                  while (1) {
+                    switch (_context2.prev = _context2.next) {
                       case 0:
                         if (config.appConf.server.basePath !== "/") {
                           keys = [].concat((0, _toConsumableArray3.default)((0, _keys2.default)(_config2.default.proxyServer.proxy)), [_config2.default.proxyServer.apiKey]);
@@ -349,19 +394,19 @@ exports.default = function () {
                             ctx.path = ctx.path.replace(config.appConf.server.basePath + "/" + tk, tk);
                           });
                         }
-                        _context.next = 3;
+                        _context2.next = 3;
                         return next();
 
                       case 3:
                       case 'end':
-                        return _context.stop();
+                        return _context2.stop();
                     }
                   }
-                }, _callee, undefined);
+                }, _callee2, undefined);
               }));
 
-              return function (_x3, _x4) {
-                return _ref4.apply(this, arguments);
+              return function (_x5, _x6) {
+                return _ref5.apply(this, arguments);
               };
             }());
 
@@ -381,69 +426,69 @@ exports.default = function () {
               _server.global.__cpm__ = (0, _httpProxyMiddleware.createProxyMiddleware)((0, _extends3.default)({}, cm));
 
               appCp(function () {
-                var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(ctx, next) {
-                  return _regenerator2.default.wrap(function _callee2$(_context2) {
+                var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx, next) {
+                  return _regenerator2.default.wrap(function _callee3$(_context3) {
                     while (1) {
-                      switch (_context2.prev = _context2.next) {
+                      switch (_context3.prev = _context3.next) {
                         case 0:
                           if (!(0, _om.isOmOpen)(ctx.req)) {
-                            _context2.next = 9;
+                            _context3.next = 9;
                             break;
                           }
 
                           if (!((0, _keys2.default)(omConf.router).length > 0)) {
-                            _context2.next = 6;
+                            _context3.next = 6;
                             break;
                           }
 
-                          _context2.next = 4;
+                          _context3.next = 4;
                           return (0, _koa2Connect2.default)(_server.global.__cpm__)(ctx, next);
 
                         case 4:
-                          _context2.next = 7;
+                          _context3.next = 7;
                           break;
 
                         case 6:
                           ctx.body = _msg.errMsg['server.om.target.none'];
 
                         case 7:
-                          _context2.next = 11;
+                          _context3.next = 11;
                           break;
 
                         case 9:
-                          _context2.next = 11;
+                          _context3.next = 11;
                           return next();
 
                         case 11:
                         case 'end':
-                          return _context2.stop();
+                          return _context3.stop();
                       }
                     }
-                  }, _callee2, undefined);
+                  }, _callee3, undefined);
                 }));
 
-                return function (_x5, _x6) {
-                  return _ref5.apply(this, arguments);
+                return function (_x7, _x8) {
+                  return _ref6.apply(this, arguments);
                 };
               }());
             }
 
             appCp(function () {
-              var _ref6 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(ctx, next) {
-                return _regenerator2.default.wrap(function _callee3$(_context3) {
+              var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx, next) {
+                return _regenerator2.default.wrap(function _callee4$(_context4) {
                   while (1) {
-                    switch (_context3.prev = _context3.next) {
+                    switch (_context4.prev = _context4.next) {
                       case 0:
                         if (!(ctx.method === 'GET' || ctx.method === 'POST' || jwtVerC(ctx.path))) {
-                          _context3.next = 5;
+                          _context4.next = 5;
                           break;
                         }
 
-                        _context3.next = 3;
+                        _context4.next = 3;
                         return next();
 
                       case 3:
-                        _context3.next = 6;
+                        _context4.next = 6;
                         break;
 
                       case 5:
@@ -454,26 +499,26 @@ exports.default = function () {
 
                       case 6:
                       case 'end':
-                        return _context3.stop();
+                        return _context4.stop();
                     }
                   }
-                }, _callee3, undefined);
+                }, _callee4, undefined);
               }));
 
-              return function (_x7, _x8) {
-                return _ref6.apply(this, arguments);
+              return function (_x9, _x10) {
+                return _ref7.apply(this, arguments);
               };
             }());
 
             app.use(function () {
-              var _ref7 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(ctx, next) {
+              var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx, next) {
                 var isInclude, include, exclude, referer;
-                return _regenerator2.default.wrap(function _callee4$(_context4) {
+                return _regenerator2.default.wrap(function _callee5$(_context5) {
                   while (1) {
-                    switch (_context4.prev = _context4.next) {
+                    switch (_context5.prev = _context5.next) {
                       case 0:
                         if (!_config2.default.server.hotLinking.enabled) {
-                          _context4.next = 21;
+                          _context5.next = 21;
                           break;
                         }
 
@@ -501,51 +546,51 @@ exports.default = function () {
                         // console.log(ctx.href, referer, ctx.href.indexOf(jsUrl('hostname', referer)), 11);
 
                         if (!isInclude) {
-                          _context4.next = 17;
+                          _context5.next = 17;
                           break;
                         }
 
                         if (!(typeof referer === 'string' && referer !== '' && ctx.href.indexOf((0, _server.jsUrl)('hostname', referer)) !== -1)) {
-                          _context4.next = 14;
+                          _context5.next = 14;
                           break;
                         }
 
-                        _context4.next = 12;
+                        _context5.next = 12;
                         return next();
 
                       case 12:
-                        _context4.next = 15;
+                        _context5.next = 15;
                         break;
 
                       case 14:
                         ctx.status = 404;
 
                       case 15:
-                        _context4.next = 19;
+                        _context5.next = 19;
                         break;
 
                       case 17:
-                        _context4.next = 19;
+                        _context5.next = 19;
                         return next();
 
                       case 19:
-                        _context4.next = 23;
+                        _context5.next = 23;
                         break;
 
                       case 21:
-                        _context4.next = 23;
+                        _context5.next = 23;
                         return next();
 
                       case 23:
                       case 'end':
-                        return _context4.stop();
+                        return _context5.stop();
                     }
                   }
-                }, _callee4, undefined);
+                }, _callee5, undefined);
               }));
 
-              return function (_x9, _x10) {
-                return _ref7.apply(this, arguments);
+              return function (_x11, _x12) {
+                return _ref8.apply(this, arguments);
               };
             }()
             // if (!yConf.security.stupid) {
@@ -557,16 +602,16 @@ exports.default = function () {
 
             if (config.appConf.server.sslify.redirect && !config.appConf.server.generate.enabled) {
               appCp(function () {
-                var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(ctx, next) {
+                var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx, next) {
                   var isRedirected;
-                  return _regenerator2.default.wrap(function _callee5$(_context5) {
+                  return _regenerator2.default.wrap(function _callee6$(_context6) {
                     while (1) {
-                      switch (_context5.prev = _context5.next) {
+                      switch (_context6.prev = _context6.next) {
                         case 0:
                           isRedirected = (ctx.req.headers.cookie || '').indexOf(_config2.default.server.sslify.openKey) !== -1;
 
                           if (isRedirected) {
-                            _context5.next = 7;
+                            _context6.next = 7;
                             break;
                           }
 
@@ -574,37 +619,37 @@ exports.default = function () {
                             signed: false,
                             sameSite: _config2.default.server.cookieSameSite
                           });
-                          _context5.next = 5;
+                          _context6.next = 5;
                           return (0, _koaSslify2.default)((0, _extends3.default)({}, _config2.default.server.sslify.options))(ctx, next);
 
                         case 5:
-                          _context5.next = 9;
+                          _context6.next = 9;
                           break;
 
                         case 7:
-                          _context5.next = 9;
+                          _context6.next = 9;
                           return next();
 
                         case 9:
                         case 'end':
-                          return _context5.stop();
+                          return _context6.stop();
                       }
                     }
-                  }, _callee5, undefined);
+                  }, _callee6, undefined);
                 }));
 
-                return function (_x11, _x12) {
-                  return _ref8.apply(this, arguments);
+                return function (_x13, _x14) {
+                  return _ref9.apply(this, arguments);
                 };
               }());
             }
 
             appCp(function () {
-              var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee6(ctx, next) {
+              var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx, next) {
                 var parser, result, browserType, bt, bs, url, isNext;
-                return _regenerator2.default.wrap(function _callee6$(_context6) {
+                return _regenerator2.default.wrap(function _callee7$(_context7) {
                   while (1) {
-                    switch (_context6.prev = _context6.next) {
+                    switch (_context7.prev = _context7.next) {
                       case 0:
                         parser = new _uaParserJs2.default();
 
@@ -635,23 +680,23 @@ exports.default = function () {
                         }
 
                         if (!isNext) {
-                          _context6.next = 14;
+                          _context7.next = 14;
                           break;
                         }
 
-                        _context6.next = 14;
+                        _context7.next = 14;
                         return next();
 
                       case 14:
                       case 'end':
-                        return _context6.stop();
+                        return _context7.stop();
                     }
                   }
-                }, _callee6, undefined);
+                }, _callee7, undefined);
               }));
 
-              return function (_x13, _x14) {
-                return _ref9.apply(this, arguments);
+              return function (_x15, _x16) {
+                return _ref10.apply(this, arguments);
               };
             }());
 
@@ -668,11 +713,11 @@ exports.default = function () {
 
               if (_config2.default.security.stupid) {
                 appCpApiV1(function () {
-                  var _ref10 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee7(ctx, next) {
+                  var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx, next) {
                     var isNext, rHost, rOrigin, rReferer;
-                    return _regenerator2.default.wrap(function _callee7$(_context7) {
+                    return _regenerator2.default.wrap(function _callee8$(_context8) {
                       while (1) {
-                        switch (_context7.prev = _context7.next) {
+                        switch (_context8.prev = _context8.next) {
                           case 0:
                             isNext = true;
                             rHost = (0, _server.jsUrl)('hostname', ctx.get('host'));
@@ -684,15 +729,15 @@ exports.default = function () {
                             }
 
                             if (!isNext) {
-                              _context7.next = 10;
+                              _context8.next = 10;
                               break;
                             }
 
-                            _context7.next = 8;
+                            _context8.next = 8;
                             return next();
 
                           case 8:
-                            _context7.next = 11;
+                            _context8.next = 11;
                             break;
 
                           case 10:
@@ -703,14 +748,14 @@ exports.default = function () {
 
                           case 11:
                           case 'end':
-                            return _context7.stop();
+                            return _context8.stop();
                         }
                       }
-                    }, _callee7, undefined);
+                    }, _callee8, undefined);
                   }));
 
-                  return function (_x15, _x16) {
-                    return _ref10.apply(this, arguments);
+                  return function (_x17, _x18) {
+                    return _ref11.apply(this, arguments);
                   };
                 }()
                 // if (ctx.method === 'GET' || ctx.method === 'POST' || jwtVerC(ctx.path)) {
@@ -724,29 +769,29 @@ exports.default = function () {
                 );
 
                 app.use(function () {
-                  var _ref11 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee8(ctx, next) {
-                    return _regenerator2.default.wrap(function _callee8$(_context8) {
+                  var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx, next) {
+                    return _regenerator2.default.wrap(function _callee9$(_context9) {
                       while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context9.prev = _context9.next) {
                           case 0:
                             // ctx.set('Surrogate-Control', 'no-store');
                             // ctx.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
                             // ctx.set('Pragma', 'no-cache');
                             // ctx.set('Expires', '0');
                             (0, _control.noCache)(ctx);
-                            _context8.next = 3;
+                            _context9.next = 3;
                             return next();
 
                           case 3:
                           case 'end':
-                            return _context8.stop();
+                            return _context9.stop();
                         }
                       }
-                    }, _callee8, undefined);
+                    }, _callee9, undefined);
                   }));
 
-                  return function (_x17, _x18) {
-                    return _ref11.apply(this, arguments);
+                  return function (_x19, _x20) {
+                    return _ref12.apply(this, arguments);
                   };
                 }());
               }
@@ -760,10 +805,10 @@ exports.default = function () {
             }
 
             app.use(function () {
-              var _ref12 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(ctx, next) {
-                return _regenerator2.default.wrap(function _callee9$(_context9) {
+              var _ref13 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee10(ctx, next) {
+                return _regenerator2.default.wrap(function _callee10$(_context10) {
                   while (1) {
-                    switch (_context9.prev = _context9.next) {
+                    switch (_context10.prev = _context10.next) {
                       case 0:
                         // const csrfCookie = ctx.cookies.get(variable.csrfCookie, {signed: false});
                         // console.log(ctx.path, ctx.req.headers.cookie, 111);
@@ -779,28 +824,28 @@ exports.default = function () {
                           cookieDomain: config.appConf.cookieDomain || _server.Cookies.getDefCookieDomain(ctx.hostname)
                         }, ctx.req.crossParams);
 
-                        _context9.next = 3;
+                        _context10.next = 3;
                         return next();
 
                       case 3:
                       case 'end':
-                        return _context9.stop();
+                        return _context10.stop();
                     }
                   }
-                }, _callee9, undefined);
+                }, _callee10, undefined);
               }));
 
-              return function (_x19, _x20) {
-                return _ref12.apply(this, arguments);
+              return function (_x21, _x22) {
+                return _ref13.apply(this, arguments);
               };
             }());
 
-          case 15:
+          case 16:
           case 'end':
-            return _context10.stop();
+            return _context11.stop();
         }
       }
-    }, _callee10, undefined);
+    }, _callee11, undefined);
   }));
 
   return function (_x) {

package/server/proxy/tire.js

@@ -59,6 +59,8 @@ var express = require('express');
 var _require = require('http-proxy-middleware'),
     createProxyMiddleware = _require.createProxyMiddleware;
 
+var autoRefreshCapacity = {};
+
 var getCacheKey = function getCacheKey(str) {
   return str.split('?')[0];
 };
@@ -222,16 +224,18 @@ exports.default = function () {
             app.use((0, _compression2.default)());
 
             app.use(function (req, res, next) {
-              if (req.url !== '/__clearCache') {
-                next();
-              } else {
+              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 if (method === "GET" && path === '/__clearCache') {
                 (0, _secCache.secCacheClear)();
                 res.status(404).send("The page was not found ~~");
-                // if (!yConf.security.isTire) {
-                //   next()
-                // } else {
-                //
-                // }
+              } else {
+                next();
               }
             });
 
@@ -327,15 +331,22 @@ exports.default = function () {
 
                           res.send(data.body);
 
-                          if (server.generate.autoRefresh) {
+                          var arKey = req.url;
+                          autoRefreshCapacity[arKey] = autoRefreshCapacity[arKey] || 0;
+                          if (server.generate.autoRefresh && autoRefreshCapacity[arKey] < server.generate.capacity) {
+                            autoRefreshCapacity[arKey] += 1;
                             (0, _curl.curl)("http://127.0.0.1:" + config.appConf.port + req.url, {
                               method: 'GET',
                               headers: {
                                 "Cookie": req.get("cookie"),
                                 "x-gen-set": "true"
                               },
-                              timeout: timeout
-                            }).then();
+                              timeout: server.generate.autoRefreshTimeout
+                            }).then(function () {
+                              autoRefreshCapacity[arKey] -= 1;
+                            }).catch(function () {
+                              autoRefreshCapacity[arKey] -= 1;
+                            });
                           }
                         } else {
                           next();

package/template/yk.plugin.js

@@ -63,6 +63,7 @@ export default async (ctx, inject) => {
       ...nowProxyServer,
     },
     router,
+    gu: {},
     __options: {},
   }
 

package/utils/console.js

@@ -25,15 +25,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // import {variable} from "yakuza1/lib/config/def";
 var checkSecret = function checkSecret($yk, type) {
-  var localKey = _encrypt.mixin.getKey($yk.browser.key);
-  var fc = console[type];
-  _yakuza.global.console[type] = function () {
-    var key = localStorage.getItem(_config2.default.server.console.saveKey);
-    // if ($yk.__options && $yk.__options.consoleEnabled && localKey === key) {
-    if (localKey === key) {
-      fc.apply(undefined, arguments);
-    }
-  };
+  if ((0, _yakuza.checkServer)()) {
+    _yakuza.global.console[type] = function () {};
+  } else {
+    var localKey = _encrypt.mixin.getKey($yk.browser.key);
+    var fc = console[type];
+    _yakuza.global.console[type] = function () {
+      var key = localStorage.getItem(_config2.default.server.console.saveKey);
+      // if ($yk.__options && $yk.__options.consoleEnabled && localKey === key) {
+      if (localKey === key) {
+        fc.apply(undefined, arguments);
+      }
+    };
+  }
 };
 // import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
 // import {verifyHeaders} from "yakuza1/lib/safe";
@@ -45,13 +49,19 @@ var consoleFunc = exports.consoleFunc = function () {
         req = _ref.req,
         res = _ref.res,
         route = _ref.route;
-    var $console;
+    var condition, $console;
     return _regenerator2.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             // !$yk.dev &&
-            if (!$yk.dev && !(0, _yakuza.checkServer)() && _yakuza.global && _config2.default.server.console.enabled) {
+            condition = !$yk.dev && _yakuza.global && _config2.default.server.console.enabled;
+
+            if ((0, _yakuza.checkServer)()) {
+              condition = condition && _config2.default.server.console.serverClose;
+            }
+
+            if (condition) {
               _yakuza._.forEach(['log', 'info', 'warn'], function (key) {
                 checkSecret($yk, key);
               });
@@ -61,7 +71,7 @@ var consoleFunc = exports.consoleFunc = function () {
             _yakuza.global.$console = $console;
             return _context.abrupt("return", $console);
 
-          case 4:
+          case 6:
           case "end":
             return _context.stop();
         }

package/utils/gray.js

@@ -24,6 +24,6 @@ var set = exports.set = function set(_ref, ver, expires) {
     if ($yk.appConf && $yk.appConf.cookieDomain) {
       opt.domain = $yk.appConf.cookieDomain;
     }
-    _yakuza.Cookies.set(gray.cookie_key, _yakuza._.trim(ver), opt);
+    _yakuza.Cookies.set(gray.cookie_key, _yakuza._.trim(ver) + "__GU_", opt);
   }
 };

package/utils/inclusive.js

@@ -263,6 +263,7 @@ var render = function () {
                 orbPort: processEnv.ORBPORT || 5603,
                 orbHosts: processEnv.ORBHOSTS,
                 orbPorts: processEnv.ORBPORTS,
+                yk4Addr: '',
                 orbAddr: '',
                 infoTimeout: 1000,
                 orbSSL: false,
@@ -345,7 +346,8 @@ var render = function () {
                 console: {
                   enabled: true,
                   disabledOrigin: true,
-                  saveKey: ['log', 'Secre', 'tKey'].join('')
+                  saveKey: ['log', 'Secre', 'tKey'].join(''),
+                  serverClose: false
                   // ...mainConf.server && mainConf.server.log,
                   // ...ykConf.server && ykConf.server.log,
                 },
@@ -358,6 +360,8 @@ var render = function () {
                   clearCache: false,
                   personality: true,
                   autoRefresh: true,
+                  autoRefreshTimeout: 66666,
+                  capacity: 66,
                   maxAge: 60 * 60, // 1小时
                   keepAliveTimeout: 60 * 1000,
                   headersTimeout: 60 * 1000,
@@ -453,6 +457,10 @@ var render = function () {
                     // test: [],
                     // exclude: [],
                   },
+                  stylelint: {
+                    enabled: false,
+                    options: {}
+                  },
                   husky: {
                     enabled: false,
                     eslint: {
@@ -465,6 +473,10 @@ var render = function () {
                         ignorePath: '.gitignore'
                       }
                     },
+                    stylelint: {
+                      enabled: true,
+                      options: {}
+                    },
                     commitlint: {
                       enabled: true,
                       config: {
@@ -693,7 +705,9 @@ var render = function () {
             });
 
             // conf.router.config['app.examples'].enabled = true;
-
+            if (conf.server.yk4Addr) {
+              conf.server.orbAddr = conf.server.yk4Addr;
+            }
             if (conf.server.orbAddr) {
               if (conf.server.orbAddr.startsWith('https') || conf.server.orbAddr.startsWith('wss')) {
                 conf.server.orbSSL = true;
@@ -762,7 +776,7 @@ var render = function () {
 
             conf.server.csp.imgSrc = _yakuza._.uniq([].concat((0, _toConsumableArray3.default)(conf.server.csp.imgSrc || []), (0, _toConsumableArray3.default)(conf.server.tfs.fastdfs.domain)));
 
-            _context2.next = 47;
+            _context2.next = 48;
             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;
@@ -797,6 +811,7 @@ var render = function () {
 
                         v.proxyServer.baseURL = v.proxyServer.gateway[v.proxyServer.baseKey];
                         v.proxyServer.services.$ = v.proxyServer.services.$ || v.proxyServer.baseURL;
+                        v.proxyServer.services.$yk4 = "http://127.0.0.1:5000";
 
                         v.server = (0, _extends3.default)({}, conf.server, v.server, {
                           f5Offline: checkBool(conf.server.f5Offline, v.server && v.server.f5Offline),
@@ -841,38 +856,38 @@ var render = function () {
                         _context.t0 = v.port;
 
                         if (_context.t0) {
-                          _context.next = 24;
+                          _context.next = 25;
                           break;
                         }
 
-                        _context.next = 23;
+                        _context.next = 24;
                         return (0, _getPort2.default)({ port: pool });
 
-                      case 23:
+                      case 24:
                         _context.t0 = _context.sent;
 
-                      case 24:
+                      case 25:
                         v.port = _context.t0;
 
                         pool = _yakuza._.without(pool, v.port);
 
                         if (!v.server.generate.enabled) {
-                          _context.next = 32;
+                          _context.next = 33;
                           break;
                         }
 
-                        _context.next = 29;
+                        _context.next = 30;
                         return (0, _getPort2.default)({ port: appPool });
 
-                      case 29:
+                      case 30:
                         _context.t1 = _context.sent;
-                        _context.next = 33;
+                        _context.next = 34;
                         break;
 
-                      case 32:
+                      case 33:
                         _context.t1 = v.port;
 
-                      case 33:
+                      case 34:
                         v.appPort = _context.t1;
 
                         appPool = _yakuza._.without(appPool, v.appPort);
@@ -905,7 +920,7 @@ var render = function () {
 
                         conf.router.config[key] = v;
 
-                      case 38:
+                      case 39:
                       case 'end':
                         return _context.stop();
                     }
@@ -918,7 +933,7 @@ var render = function () {
               };
             }());
 
-          case 47:
+          case 48:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -999,7 +1014,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 54:
+          case 55:
           case 'end':
             return _context2.stop();
         }

package/utils/secret.js

@@ -54,13 +54,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 // import {server} from '../server/proxy/clientKey'
 var secret = {};
+// import {mixin} from "yakuza1/lib/encrypt";
+// import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
+
+var secret_gu = {};
 
 // const allowHeaders = {
 //   'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36',
 // }
 
-// import {mixin} from "yakuza1/lib/encrypt";
-// import {asymmetric, getKey, symmetry} from "yakuza1/lib/encrypt/sm";
 function getHostname(hn, router) {
   var _this = this;
 
@@ -155,7 +157,8 @@ var set = exports.set = function set(_ref3) {
       req = _ref3.req,
       res = _ref3.res,
       route = _ref3.route,
-      $redirect = _ref3.$redirect;
+      $redirect = _ref3.$redirect,
+      store = _ref3.store;
 
   return new _promise2.default(function () {
     var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee9(resolve, reject) {
@@ -214,6 +217,21 @@ var set = exports.set = function set(_ref3) {
                   type: result.browser.name + parseInt(result.browser.version, 10)
                 }, _yakuza._.omit(result, ['browser', 'ua']));
                 _yakuza.global.browserKey = $yk.browser.key;
+                if ((0, _yakuza.checkServer)()) {
+                  var h = req.headers;
+                  // const gu = {
+                  //   group: h['x-gu-route-group'] || secret_gu['x-gu-route-group'],
+                  //   name: h['x-gu-route-name'] || secret_gu['x-gu-route-name'],
+                  //   ver: h['x-gu-route-ver'] || secret_gu['x-gu-route-ver'],
+                  // };
+                  ['x-gu-route-group', 'x-gu-route-name', 'x-gu-route-ver'].forEach(function (v) {
+                    secret_gu[v] = h[v] || secret_gu[v];
+                  });
+                  store.dispatch('__yk_init__/setGU', secret_gu);
+                  $yk.gu = secret_gu;
+                } else {
+                  $yk.gu = store.state.__yk_init__ && store.state.__yk_init__.gu || {};
+                }
 
                 if (_yakuza.global.__enc_csrfInfo__) {
                   resolve();

package/utils/verify.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.commitMsg = exports.commitEsLint = exports.commitInit = undefined;
+exports.commitStyleLint = exports.commitMsg = exports.commitEsLint = exports.commitInit = undefined;
 
 var _extends2 = require('babel-runtime/helpers/extends');
 
@@ -35,6 +35,10 @@ var _paths2 = _interopRequireDefault(_paths);
 
 var _eslint = require('eslint');
 
+var _stylelint = require('stylelint');
+
+var _stylelint2 = _interopRequireDefault(_stylelint);
+
 var _server = require('yakuza1/server');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -45,7 +49,7 @@ var commitInit = exports.commitInit = function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _paths2.default.write(_paths2.default.gitHooksCommitMsg, '#!/bin/sh\n./node_modules/.bin/yk verify commit-eslint --edit "$(git status -s | awk \'{print $2}\' | xargs)"\n./node_modules/.bin/yk verify commit-msg --edit "$(cat $1)"\n', {
+            _paths2.default.write(_paths2.default.gitHooksCommitMsg, '#!/bin/sh\n./node_modules/.bin/yk verify commit --msg "$(cat $1)" --edit "$(git status -s | awk \'{print $2}\' | xargs)"\n', {
               mode: '744'
             });
 
@@ -194,4 +198,75 @@ var commitMsg = exports.commitMsg = function () {
   return function commitMsg(_x2) {
     return _ref3.apply(this, arguments);
   };
+}();
+
+var commitStyleLint = exports.commitStyleLint = function () {
+  var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(options) {
+    var yConf, opt, testPaths, filesToWatch, resultObject;
+    return _regenerator2.default.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            yConf = require('../config');
+
+            if (!(yConf.extend.plugins.husky.enabled && yConf.extend.plugins.husky.stylelint.enabled)) {
+              _context4.next = 12;
+              break;
+            }
+
+            opt = (0, _extends3.default)({
+              edit: ''
+            }, options, {
+              stylelint: yConf.extend.plugins.husky.stylelint
+            });
+            testPaths = [];
+
+
+            opt.edit.split(' ').forEach(function (path) {
+              if ((0, _server.minimatch)(path, '**/*.{s?(a|c)ss,less,stylus,vue}', { dot: true })) {
+                testPaths.push(path);
+              }
+            });
+
+            filesToWatch = ['.stylelintignore', '.stylelintrc', '.stylelintrc.json', '.stylelintrc.yaml', '.stylelintrc.yml', '.stylelintrc.js', 'stylelint.config.js'];
+
+
+            filesToWatch.forEach(function (p) {
+              var v = _paths2.default.appDirectory + _paths2.default.sep + p;
+              if (_paths2.default.access(v)) {
+                opt.stylelint.options.configFile = v;
+              }
+            });
+
+            if (!(testPaths.length > 0)) {
+              _context4.next = 12;
+              break;
+            }
+
+            _context4.next = 10;
+            return _stylelint2.default.lint((0, _extends3.default)({
+              formatter: "string",
+              files: testPaths
+            }, opt.stylelint.options));
+
+          case 10:
+            resultObject = _context4.sent;
+
+
+            if (resultObject.errored) {
+              console.log(resultObject.output);
+              process.exit(1);
+            }
+
+          case 12:
+          case 'end':
+            return _context4.stop();
+        }
+      }
+    }, _callee4, undefined);
+  }));
+
+  return function commitStyleLint(_x3) {
+    return _ref4.apply(this, arguments);
+  };
 }();