yakuza0 2.21.11 → 2.22.1-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yakuza0",
-  "version": "2.21.11",
+  "version": "2.22.1-beta.0",
   "description": "yakuza0 with nuxt",
   "main": "index.js",
   "scripts": {
@@ -20,6 +20,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@alicloud/acm-sdk": "^1.0.1",
     "@babel/plugin-transform-runtime": "^7.12.10",
     "@commitlint/config-conventional": "^12.1.1",
     "@commitlint/format": "^12.1.1",

package/utils/inclusive.js

@@ -69,6 +69,10 @@ var _getPort = require('get-port');
 
 var _getPort2 = _interopRequireDefault(_getPort);
 
+var _acmSdk = require('@alicloud/acm-sdk');
+
+var _acmSdk2 = _interopRequireDefault(_acmSdk);
+
 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; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -189,7 +193,7 @@ var render = function () {
         ykPkg = _ref.pkg,
         dkyModeDef = _ref.dkyModeDef;
 
-    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
+    var _ykConfig, ykConf, processEnv, imageKeyOrigin, aliasDir, conf, cspLoop, setConfValue, setConfCSP, setConf, client, content, acmConf, hostname, port, ykServer, orbAddr, directives, tip, serverConfStr;
 
     return _regenerator2.default.wrap(function _callee2$(_context2) {
       while (1) {
@@ -484,6 +488,18 @@ var render = function () {
                     // ...mainConf.server && mainConf.server.om && mainConf.server.om.router,
                     // ...ykConf.server && ykConf.server.om && ykConf.server.om.router,
                   }
+                },
+                edas: {
+                  enabled: false,
+                  dataId: '',
+                  group: '',
+                  options: {
+                    // endpoint: '', // check this from acm console
+                    // namespace: '', // check this from acm console
+                    // accessKey: '', // check this from acm console
+                    // secretKey: '', // check this from acm console
+                    requestTimeout: 6000 // timeout(ms)，default 6s
+                  }
                 }
               },
               extend: {
@@ -682,11 +698,13 @@ var render = function () {
               });
             }
 
-            conf.router.config = _yakuza._.mapValues(conf.router.config, function (v) {
+            conf.router.config = _yakuza._.forEach(conf.router.config, function (v, k) {
               if (conf.inImage && conf.cmd === 'server container') {
                 v.enabled = false;
               }
-              return v;
+              // return v
+              delete conf.router.config[k];
+              conf.router.config[k.toLowerCase()] = _yakuza._.cloneDeep(v);
             });
 
             // env
@@ -715,38 +733,63 @@ var render = function () {
               }
             });
 
-            _context2.t0 = conf.dkyMode;
-            _context2.next = _context2.t0 === "dev" ? 17 : _context2.t0 === "normal" ? 20 : _context2.t0 === "prod" ? 23 : _context2.t0 === "stupid" ? 29 : _context2.t0 === "tire" ? 37 : 43;
+            if (!conf.server.edas.enabled) {
+              _context2.next = 27;
+              break;
+            }
+
+            _context2.prev = 15;
+            client = new _acmSdk2.default(conf.server.edas.options);
+            _context2.next = 19;
+            return client.getConfig(conf.server.edas.dataId, conf.server.edas.group);
+
+          case 19:
+            content = _context2.sent;
+            acmConf = JSON.parse(content);
+
+            setConf(acmConf);
+            _context2.next = 27;
+            break;
+
+          case 24:
+            _context2.prev = 24;
+            _context2.t0 = _context2['catch'](15);
+
+            console.log(_context2.t0);
+
+          case 27:
+            _context2.t1 = conf.dkyMode;
+            _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 17:
+          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', 43);
+            return _context2.abrupt('break', 56);
 
-          case 20:
+          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', 43);
+            return _context2.abrupt('break', 56);
 
-          case 23:
+          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', 43);
+            return _context2.abrupt('break', 56);
 
-          case 29:
+          case 42:
             conf.security.encrypt = "sm";
             conf.security.stupid = true;
             conf.security.helmet = true;
@@ -755,18 +798,18 @@ var render = function () {
             conf.server.csp.enabled = true;
             conf.server.sri.enabled = true;
             conf.dev = false;
-            return _context2.abrupt('break', 43);
+            return _context2.abrupt('break', 56);
 
-          case 37:
+          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', 43);
+            return _context2.abrupt('break', 56);
 
-          case 43:
+          case 56:
 
             // conf.router.config['app.examples'].enabled = true;
             if (conf.server.yk4Addr) {
@@ -866,7 +909,7 @@ var render = function () {
             conf.server.csp.directives = directives;
 
             // const appPortUsed = [];
-            _context2.next = 64;
+            _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;
@@ -1049,7 +1092,7 @@ var render = function () {
               };
             }());
 
-          case 64:
+          case 77:
             // console.log(conf.router.config);
 
             conf.shareRule.app = conf.shareRule.app.map(function (ap) {
@@ -1171,12 +1214,12 @@ var render = function () {
 
             return _context2.abrupt('return', { conf: conf });
 
-          case 75:
+          case 88:
           case 'end':
             return _context2.stop();
         }
       }
-    }, _callee2, undefined);
+    }, _callee2, undefined, [[15, 24]]);
   }));
 
   return function render(_x) {