@pisell/common 3.0.1 → 3.0.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @pisell/common
 
+## 3.0.3
+
+### Patch Changes
+
+- 8c34062b6: xzero 正式上传调整
+
+## 3.0.2
+
+### Patch Changes
+
+- add57fee8: xzero 不上传 oss
+
 ## 3.0.1
 
 ### Patch Changes

package/es/script/uploadCode/index.js

@@ -163,7 +163,7 @@ function _init() {
           console.log('使用本地/dist');
         case 35:
           if (!(res.env === 'prod')) {
-            _context.next = 41;
+            _context.next = 42;
             break;
           }
           _fileName = res.project.fileName;
@@ -173,32 +173,35 @@ function _init() {
           if (_fileName === 'admin') {
             _fileName = 'my_pisell_v2';
           }
-          // 上传oss
-          _context.next = 41;
+          if (!(_fileName !== 'xzero')) {
+            _context.next = 42;
+            break;
+          }
+          _context.next = 42;
           return uploadStaticToOSS(_fileName);
-        case 41:
+        case 42:
           console.log('开始压缩');
-          _context.next = 44;
+          _context.next = 45;
           return uploadCode.compress();
-        case 44:
+        case 45:
           console.log('✅ 压缩完成');
           console.log('开始连接服务器');
-          _context.next = 48;
+          _context.next = 49;
           return uploadCode.connectServer();
-        case 48:
+        case 49:
           conn = _context.sent;
           console.log('✅ 连接服务器完成');
           console.log('开始上传');
-          _context.next = 53;
+          _context.next = 54;
           return uploadCode.serverUpload();
-        case 53:
+        case 54:
           console.log('✅ 上传完成');
           console.log('开始解压');
-          _context.next = 57;
+          _context.next = 58;
           return uploadCode.serverUnpack();
-        case 57:
+        case 58:
           if (!res.is_release) {
-            _context.next = 62;
+            _context.next = 63;
             break;
           }
           releaseInstance = new Release({
@@ -208,32 +211,32 @@ function _init() {
             conn: conn
           });
           console.log('开始发布');
-          _context.next = 62;
+          _context.next = 63;
           return releaseInstance.release();
-        case 62:
-          _context.next = 64;
+        case 63:
+          _context.next = 65;
           return uploadCode.disconnectServer();
-        case 64:
-          _context.next = 66;
+        case 65:
+          _context.next = 67;
           return $(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["git pull --no-edit"])));
-        case 66:
-          _context.next = 68;
+        case 67:
+          _context.next = 69;
           return $(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["git push --follow-tags"])));
-        case 68:
+        case 69:
           console.log('✅ 成功后推送到git');
-          _context.next = 80;
+          _context.next = 81;
           break;
-        case 71:
-          _context.prev = 71;
+        case 72:
+          _context.prev = 72;
           _context.t0 = _context["catch"](26);
           console.log(_context.t0, '执行出错 请排查重试');
-          _context.next = 76;
+          _context.next = 77;
           return $(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["git reset HEAD~1"])));
-        case 76:
-          _context.next = 78;
+        case 77:
+          _context.next = 79;
           return $(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["git tag -d v", ""])), uploadCode.currentVersion);
-        case 78:
-          _context.next = 80;
+        case 79:
+          _context.next = 81;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u5931\u8D25"),
             content: [{
@@ -247,8 +250,8 @@ function _init() {
               value: version || ''
             }]
           });
-        case 80:
-          _context.next = 82;
+        case 81:
+          _context.next = 83;
           return sendWebhook({
             title: "".concat(res.project.fileName, " ").concat(res.env, "\u73AF\u5883").concat(res.is_release ? '上传并发布' : '上传', "\u6210\u529F"),
             content: [{
@@ -262,13 +265,13 @@ function _init() {
               value: version || ''
             }]
           });
-        case 82:
-          uploadCode.deleteLocalZip();
         case 83:
+          uploadCode.deleteLocalZip();
+        case 84:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[26, 71]]);
+    }, _callee, null, [[26, 72]]);
   }));
   return _init.apply(this, arguments);
 }

package/es/script/uploadCode/uploadCode.js

@@ -107,6 +107,11 @@ var UploadCode = /*#__PURE__*/function () {
                 // );
               }
 
+              if (this.env === 'prod' && this.projectName === 'xzero') {
+                serverConfig = serverConfigMap.aws.service[this.env];
+                serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+              }
+
               // pisell2.0正式环境使用亚马逊服务器
               if (this.env === "prod" && this.projectName === "admin") {
                 serverConfig = serverConfigMap.aws.service[this.env];
@@ -115,20 +120,20 @@ var UploadCode = /*#__PURE__*/function () {
               console.log(serverConfig, 'serverConfig');
               this.setConfig(serverConfig);
               if (serverConfig) {
-                _context.next = 22;
+                _context.next = 23;
                 break;
               }
               console.log("您当前没有权限!");
               return _context.abrupt("return", false);
-            case 22:
+            case 23:
               _context.t0 = console;
-              _context.next = 25;
+              _context.next = 26;
               return getGitCurrentBranch();
-            case 25:
+            case 26:
               _context.t1 = _context.sent;
               _context.t0.log.call(_context.t0, "当前主项目分支", _context.t1);
               return _context.abrupt("return", true);
-            case 28:
+            case 29:
             case "end":
               return _context.stop();
           }

package/lib/script/uploadCode/index.js

@@ -153,7 +153,9 @@ async function init() {
       if (_fileName === "admin") {
         _fileName = "my_pisell_v2";
       }
-      await (0, import_aws.uploadStaticToOSS)(_fileName);
+      if (_fileName !== "xzero") {
+        await (0, import_aws.uploadStaticToOSS)(_fileName);
+      }
     }
     console.log("开始压缩");
     await uploadCode.compress();

package/lib/script/uploadCode/uploadCode.js

@@ -85,6 +85,10 @@ var UploadCode = class {
     if (this.env === "prod") {
       serverConfig = this.setConfig(serverConfigMap["prod3"]);
     }
+    if (this.env === "prod" && this.projectName === "xzero") {
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+    }
     if (this.env === "prod" && this.projectName === "admin") {
       serverConfig = serverConfigMap.aws.service[this.env];
       serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "sideEffects": [
     "*.less"
   ],

package/src/script/uploadCode/index.js

@@ -146,8 +146,10 @@ async function init() {
       if (_fileName === 'admin') {
         _fileName = 'my_pisell_v2'
       }
-      // 上传oss
-      await uploadStaticToOSS(_fileName);
+      if (_fileName !== 'xzero') {
+        // 上传oss
+        await uploadStaticToOSS(_fileName);
+      }
     }
 
     console.log('开始压缩');

package/src/script/uploadCode/uploadCode.js

@@ -86,6 +86,11 @@ class UploadCode {
       // );
     }
 
+    if (this.env === 'prod' && this.projectName === 'xzero') {
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
+    }
+
     // pisell2.0正式环境使用亚马逊服务器
     if (this.env === "prod" && this.projectName === "admin") {
       serverConfig = serverConfigMap.aws.service[this.env];