yakuza0 2.21.4 → 2.21.5

package/package.json

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

package/utils/inclusive.js

@@ -188,7 +188,7 @@ var render = function () {
         ykPkg = _ref.pkg,
         dkyModeDef = _ref.dkyModeDef;
 
-    var _ykConfig, ykConf, processEnv, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
+    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -197,6 +197,7 @@ var render = function () {
             // const mainConf = mainConfFn() || {};
             _ykConfig = ykConfig(pkg), ykConf = _ykConfig.ykconfig;
             processEnv = process && process.env || {};
+            imageKeyOrigin = (0, _yakuza.md5)((processEnv.YK_DOCKERNAME || '').toString());
             aliasDir = aliasFn();
             conf = {
               version: ykPkg.version,
@@ -206,7 +207,8 @@ var render = function () {
               dev: dkyModeDef === 'dev',
               cmd: process.env.NODE_CMD,
               processKey: '.' + (0, _yakuza.md5)(appDirectory).substring(2, 18),
-              imageKey: (0, _yakuza.md5)((processEnv.YK_DOCKERNAME || '').toString()),
+              imageKeyOrigin: imageKeyOrigin,
+              imageKey: imageKeyOrigin,
               versionSha: (0, _yakuza.md5)((processEnv.YK_VERSIONSHA || new Date().getTime()).toString()),
               childKey: (0, _yakuza.md5)(appDirectory + pkg.name).substring(0, 6),
               scKey: '',
@@ -693,37 +695,37 @@ var render = function () {
             });
 
             _context2.t0 = conf.dkyMode;
-            _context2.next = _context2.t0 === "dev" ? 16 : _context2.t0 === "normal" ? 19 : _context2.t0 === "prod" ? 22 : _context2.t0 === "stupid" ? 28 : _context2.t0 === "tire" ? 36 : 42;
+            _context2.next = _context2.t0 === "dev" ? 17 : _context2.t0 === "normal" ? 20 : _context2.t0 === "prod" ? 23 : _context2.t0 === "stupid" ? 29 : _context2.t0 === "tire" ? 37 : 43;
             break;
 
-          case 16:
+          case 17:
             // 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', 42);
+            return _context2.abrupt('break', 43);
 
-          case 19:
+          case 20:
             // 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', 42);
+            return _context2.abrupt('break', 43);
 
-          case 22:
+          case 23:
             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', 42);
+            return _context2.abrupt('break', 43);
 
-          case 28:
+          case 29:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -732,18 +734,18 @@ var render = function () {
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
             conf.dev = false;
-            return _context2.abrupt('break', 42);
+            return _context2.abrupt('break', 43);
 
-          case 36:
+          case 37:
             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', 42);
+            return _context2.abrupt('break', 43);
 
-          case 42:
+          case 43:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -843,7 +845,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 63;
+            _context2.next = 64;
             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;
@@ -1025,7 +1027,7 @@ var render = function () {
               };
             }());
 
-          case 63:
+          case 64:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1090,9 +1092,9 @@ var render = function () {
               if (v.enabled) {
                 conf.proxyServer = v.proxyServer;
                 conf.server = v.server;
-                var scKeyStr = confStr + conf.childKey;
+                var scKeyStr = (0, _stringify2.default)(conf) + conf.childKey;
                 if (conf.inImage) {
-                  scKeyStr = k + conf.imageKey;
+                  scKeyStr = k + conf.imageKeyOrigin;
                 }
                 var scKey = (0, _yakuza.md5)(scKeyStr).substring(2, 8);
                 conf.scKey = scKey;
@@ -1134,7 +1136,7 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 73:
+          case 74:
           case 'end':
             return _context2.stop();
         }