@pisell/common 1.0.24 → 1.0.26

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @pisell/common
 
+## 1.0.26
+
+### Patch Changes
+
+- Updated dependencies [a45e6cd5]
+  - @pisell/utils@1.0.27
+
+## 1.0.25
+
+### Patch Changes
+
+- Updated dependencies [961d44f7]
+  - @pisell/utils@1.0.26
+
 ## 1.0.24
 
 ### Patch Changes

package/es/script/constants/index.js

@@ -5,7 +5,7 @@ var outPathMap = {
     pre: '../data/release/project/my_pisel_shop'
   },
   admin: {
-    prod: '../../data/project/pisell2',
+    prod: '../data/release/project/pisell_v2',
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2'
   },

package/es/script/release/release.js

@@ -53,7 +53,8 @@ var Release = /*#__PURE__*/function () {
                 serverConfig = serverConfigMap.cn[this.env];
               }
               if (this.env === 'prod') {
-                serverConfig.privateKey = fs.readFileSync(path.join(process.env.HOME, '.ssh', 'id_rsa'));
+                serverConfig = serverConfigMap.aws.service[this.env];
+                serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
               }
               this.serverConfig = serverConfig;
             case 7:
@@ -118,7 +119,8 @@ var Release = /*#__PURE__*/function () {
               return releaseProject(this.conn, {
                 path: this.outPath,
                 fileName: "".concat(this.version),
-                isSSR: this.isSSR
+                isSSR: this.isSSR,
+                env: this.env
               });
             case 2:
               return _context3.abrupt("return", _context3.sent);

package/es/script/uploadCode/uploadCode.js

@@ -109,25 +109,26 @@ var UploadCode = /*#__PURE__*/function () {
 
               // pisell2.0正式环境使用亚马逊服务器
               if (this.env === "prod" && this.projectName === "admin") {
-                serverConfig = serverConfigMap.aws[this.env];
-                serverConfig.privateKey = fs.readFileSync("../../../pisell2.0.pem");
+                serverConfig = serverConfigMap.aws.service[this.env];
+                serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
               }
+              console.log(serverConfig, 'serverConfig');
               this.setConfig(serverConfig);
               if (serverConfig) {
-                _context.next = 21;
+                _context.next = 22;
                 break;
               }
               console.log("您当前没有权限!");
               return _context.abrupt("return", false);
-            case 21:
+            case 22:
               _context.t0 = console;
-              _context.next = 24;
+              _context.next = 25;
               return getGitCurrentBranch();
-            case 24:
+            case 25:
               _context.t1 = _context.sent;
               _context.t0.log.call(_context.t0, "当前主项目分支", _context.t1);
               return _context.abrupt("return", true);
-            case 27:
+            case 28:
             case "end":
               return _context.stop();
           }
@@ -316,7 +317,7 @@ var UploadCode = /*#__PURE__*/function () {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               localPath = path.resolve(this.projectAbsolutePath, "".concat(this.currentVersion, ".zip"));
-              remotePath = "".concat(this.outPath, "/").concat(this.currentVersion, ".zip");
+              remotePath = "/tmp/".concat(this.projectName, "-").concat(this.currentVersion, ".zip");
               _context6.next = 4;
               return _serverUpload(this.conn, {
                 localPath: localPath,
@@ -351,8 +352,9 @@ var UploadCode = /*#__PURE__*/function () {
               return _serverUnpack(this.conn, {
                 path: this.outPath,
                 fileName: "".concat(this.currentVersion),
-                fullFileName: "".concat(this.currentVersion, ".zip"),
-                changelog: this.changelog
+                fullFileName: "".concat(this.projectName, "-").concat(this.currentVersion, ".zip"),
+                changelog: this.changelog,
+                env: this.env
               });
             case 2:
               return _context7.abrupt("return", _context7.sent);

package/es/script/utils/index.js

@@ -176,7 +176,8 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
   var path = _ref5.path,
     fileName = _ref5.fileName,
     fullFileName = _ref5.fullFileName,
-    changelog = _ref5.changelog;
+    changelog = _ref5.changelog,
+    env = _ref5.env;
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise(function (resolve, reject) {
@@ -186,7 +187,7 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
         reject(err);
         return;
       }
-      stream.end("\n             cd ".concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n            ") // 打开到path
+      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd /tmp\n             mv ").concat(fullFileName, " ").concat(path, "\n             cd ").concat(path, "\n             unzip ").concat(fullFileName, " -d ").concat(fileName, " && mv ").concat(fileName, "/dist/* ").concat(fileName, "/ && rmdir ").concat(fileName, "/dist\n             rm -rf ").concat(fullFileName, "\n             echo \"").concat(changelog, "\" > ./").concat(fileName, "/changelog.md\n             sh deleteOldVersion.sh\n             exit\n             ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
       // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
       // 删除1.0.0.zip
       // 写入changelog到changelog.md
@@ -209,7 +210,8 @@ var serverUnpack = function serverUnpack(conn, _ref5) {
 var releaseProject = function releaseProject(conn, _ref6) {
   var path = _ref6.path,
     fileName = _ref6.fileName,
-    isSSR = _ref6.isSSR;
+    isSSR = _ref6.isSSR,
+    env = _ref6.env;
   return new Promise(function (resolve, reject) {
     conn.shell(function (err, stream) {
       if (err) {
@@ -217,7 +219,7 @@ var releaseProject = function releaseProject(conn, _ref6) {
         reject(err);
         return;
       }
-      stream.end("\n             cd ".concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf master\n             cp -R next-master master\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ") // 打开到path
+      stream.end("  ".concat(env === 'prod' ? 'sudo -i' : '', "\n             cd ").concat(path, "\n             cp -R -f pre-master next-master\n             rm -rf pre-master\n             \\cp -R -f ").concat(fileName, "/* next-master\n             cp -R -f ").concat(fileName, " pre-master\n             rm -rf master\n             cp -R next-master master\n             rm -rf next-master\n             ").concat(isSSR ? 'pm2 restart server.js' : '', "\n             exit\n            ").concat(env === 'prod' ? 'exit' : '', "\n            ") // 打开到path
       // 复制pre-master到next-master
       // 删除pre-master
       // 复制1.0.0到next-master

package/lib/script/constants/index.js

@@ -31,7 +31,7 @@ var outPathMap = {
     pre: "../data/release/project/my_pisel_shop"
   },
   admin: {
-    prod: "../../data/project/pisell2",
+    prod: "../data/release/project/pisell_v2",
     release: "../data/release/project/pisell_v2",
     pre: "../data/release/project/pisell_v2"
   },

package/lib/script/release/release.js

@@ -46,9 +46,8 @@ var Release = class {
       serverConfig = serverConfigMap.cn[this.env];
     }
     if (this.env === "prod") {
-      serverConfig.privateKey = fs.readFileSync(
-        path.join(process.env.HOME, ".ssh", "id_rsa")
-      );
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
     }
     this.serverConfig = serverConfig;
   }
@@ -74,7 +73,8 @@ var Release = class {
     return await (0, import_utils.releaseProject)(this.conn, {
       path: this.outPath,
       fileName: `${this.version}`,
-      isSSR: this.isSSR
+      isSSR: this.isSSR,
+      env: this.env
     });
   }
   /**

package/lib/script/uploadCode/uploadCode.js

@@ -86,9 +86,10 @@ var UploadCode = class {
       serverConfig = this.setConfig(serverConfigMap["prod3"]);
     }
     if (this.env === "prod" && this.projectName === "admin") {
-      serverConfig = serverConfigMap.aws[this.env];
-      serverConfig.privateKey = fs.readFileSync("../../../pisell2.0.pem");
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
     }
+    console.log(serverConfig, "serverConfig");
     this.setConfig(serverConfig);
     if (!serverConfig) {
       console.log("您当前没有权限!");
@@ -174,7 +175,7 @@ var UploadCode = class {
       this.projectAbsolutePath,
       `${this.currentVersion}.zip`
     );
-    const remotePath = `${this.outPath}/${this.currentVersion}.zip`;
+    const remotePath = `/tmp/${this.projectName}-${this.currentVersion}.zip`;
     return await (0, import_utils.serverUpload)(this.conn, { localPath, remotePath });
   }
   /**
@@ -186,8 +187,9 @@ var UploadCode = class {
     return await (0, import_utils.serverUnpack)(this.conn, {
       path: this.outPath,
       fileName: `${this.currentVersion}`,
-      fullFileName: `${this.currentVersion}.zip`,
-      changelog: this.changelog
+      fullFileName: `${this.projectName}-${this.currentVersion}.zip`,
+      changelog: this.changelog,
+      env: this.env
     });
   }
   /**

package/lib/script/utils/index.js

@@ -118,7 +118,7 @@ var serverUpload = (conn, { localPath, remotePath }) => {
     });
   });
 };
-var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) => {
+var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog, env }) => {
   if (!conn)
     return Promise.reject("未连接服务器");
   return new Promise((resolve, reject) => {
@@ -129,13 +129,16 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) =>
         return;
       }
       stream.end(
-        `
+        `  ${env === "prod" ? "sudo -i" : ""}
+             cd /tmp
+             mv ${fullFileName} ${path2}
              cd ${path2}
              unzip ${fullFileName} -d ${fileName} && mv ${fileName}/dist/* ${fileName}/ && rmdir ${fileName}/dist
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
              exit
+             ${env === "prod" ? "exit" : ""}
             `
         // 打开到path
         // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
@@ -151,7 +154,7 @@ var serverUnpack = (conn, { path: path2, fileName, fullFileName, changelog }) =>
     });
   });
 };
-var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
+var releaseProject = (conn, { path: path2, fileName, isSSR, env }) => {
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -160,7 +163,7 @@ var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
         return;
       }
       stream.end(
-        `
+        `  ${env === "prod" ? "sudo -i" : ""}
              cd ${path2}
              cp -R -f pre-master next-master
              rm -rf pre-master
@@ -171,6 +174,7 @@ var releaseProject = (conn, { path: path2, fileName, isSSR }) => {
              rm -rf next-master
              ${isSSR ? "pm2 restart server.js" : ""}
              exit
+            ${env === "prod" ? "exit" : ""}
             `
         // 打开到path
         // 复制pre-master到next-master

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/common",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "sideEffects": [
     "*.less"
   ],
@@ -20,7 +20,7 @@
     "archiver": "^5.3.1",
     "dotenv": "^16.0.3",
     "ssh2": "^1.13.0",
-    "@pisell/utils": "1.0.25"
+    "@pisell/utils": "1.0.27"
   },
   "devDependencies": {
     "father": "^4.1.6"

package/src/script/constants/index.js

@@ -5,7 +5,7 @@ const outPathMap = {
     pre: '../data/release/project/my_pisel_shop',
   },
   admin: {
-    prod: '../../data/project/pisell2',
+    prod: '../data/release/project/pisell_v2',
     release: '../data/release/project/pisell_v2',
     pre: '../data/release/project/pisell_v2',
   },

package/src/script/release/release.js

@@ -39,9 +39,8 @@ class Release {
     }
 
     if (this.env === 'prod') {
-      serverConfig.privateKey = fs.readFileSync(
-        path.join(process.env.HOME, '.ssh', 'id_rsa'),
-      );
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
     }
 
     this.serverConfig = serverConfig;
@@ -71,6 +70,7 @@ class Release {
       path: this.outPath,
       fileName: `${this.version}`,
       isSSR: this.isSSR,
+      env: this.env,
     });
   }
 

package/src/script/uploadCode/uploadCode.js

@@ -88,10 +88,12 @@ class UploadCode {
 
     // pisell2.0正式环境使用亚马逊服务器
     if (this.env === "prod" && this.projectName === "admin") {
-      serverConfig = serverConfigMap.aws[this.env];
-      serverConfig.privateKey = fs.readFileSync("../../../pisell2.0.pem");
+      serverConfig = serverConfigMap.aws.service[this.env];
+      serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
     }
 
+    console.log(serverConfig,'serverConfig')
+
     this.setConfig(serverConfig);
 
     if (!serverConfig) {
@@ -188,7 +190,7 @@ class UploadCode {
       this.projectAbsolutePath,
       `${this.currentVersion}.zip`
     );
-    const remotePath = `${this.outPath}/${this.currentVersion}.zip`;
+    const remotePath = `/tmp/${this.projectName}-${this.currentVersion}.zip`;
     return await serverUpload(this.conn, { localPath, remotePath });
   }
 
@@ -201,8 +203,9 @@ class UploadCode {
     return await serverUnpack(this.conn, {
       path: this.outPath,
       fileName: `${this.currentVersion}`,
-      fullFileName: `${this.currentVersion}.zip`,
+      fullFileName: `${this.projectName}-${this.currentVersion}.zip`,
       changelog: this.changelog,
+      env: this.env,
     });
   }
 

package/src/script/utils/index.js

@@ -115,7 +115,7 @@ const serverUpload = (conn, { localPath, remotePath }) => {
  * @Describe:
  * @Author: Zsj
  */
-const serverUnpack = (conn, { path, fileName, fullFileName, changelog }) => {
+const serverUnpack = (conn, { path, fileName, fullFileName, changelog, env }) => {
   if (!conn) return Promise.reject('未连接服务器');
   // 文件全名
   return new Promise((resolve, reject) => {
@@ -127,13 +127,16 @@ const serverUnpack = (conn, { path, fileName, fullFileName, changelog }) => {
       }
       stream
         .end(
-          `
+          `  ${env === 'prod' ? 'sudo -i' : ''}
+             cd /tmp
+             mv ${fullFileName} ${path}
              cd ${path}
              unzip ${fullFileName} -d ${fileName} && mv ${fileName}/dist/* ${fileName}/ && rmdir ${fileName}/dist
              rm -rf ${fullFileName}
              echo "${changelog}" > ./${fileName}/changelog.md
              sh deleteOldVersion.sh
              exit
+             ${env === 'prod' ? 'exit' : ''}
             `,
           // 打开到path
           // 解压 1.0.0.zip 文件到 1.0.0 移动dist中内容到 1.0.0内 删除dist
@@ -157,7 +160,7 @@ const serverUnpack = (conn, { path, fileName, fullFileName, changelog }) => {
  * @Describe:
  * @Author: Zsj
  */
-const releaseProject = (conn, { path, fileName, isSSR }) => {
+const releaseProject = (conn, { path, fileName, isSSR, env }) => {
   return new Promise((resolve, reject) => {
     conn.shell((err, stream) => {
       if (err) {
@@ -167,7 +170,7 @@ const releaseProject = (conn, { path, fileName, isSSR }) => {
       }
       stream
         .end(
-          `
+          `  ${env === 'prod' ? 'sudo -i' : ''}
              cd ${path}
              cp -R -f pre-master next-master
              rm -rf pre-master
@@ -178,6 +181,7 @@ const releaseProject = (conn, { path, fileName, isSSR }) => {
              rm -rf next-master
              ${isSSR ? 'pm2 restart server.js' : ''}
              exit
+            ${env === 'prod' ? 'exit' : ''}
             `,
           // 打开到path
           // 复制pre-master到next-master