@pisell/common 3.0.2 → 3.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/es/script/uploadCode/uploadCode.js +10 -5
  3. package/lib/script/uploadCode/uploadCode.js +4 -0
  4. package/package.json +1 -1
  5. package/src/script/uploadCode/uploadCode.js +5 -0
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @pisell/common
2
2
 
3
+ ## 3.0.4
4
+
5
+ ### Patch Changes
6
+
7
+ - bee46472d: feat: xzero 正式上传 privateKey 调整
8
+
9
+ ## 3.0.3
10
+
11
+ ### Patch Changes
12
+
13
+ - 8c34062b6: xzero 正式上传调整
14
+
3
15
  ## 3.0.2
4
16
 
5
17
  ### Patch Changes
package/es/script/uploadCode/uploadCode.js CHANGED
@@ -107,6 +107,11 @@ var UploadCode = /*#__PURE__*/function () {
107
107
  // );
108
108
  }
109
109
 
110
+ if (this.env === 'prod' && this.projectName === 'xzero') {
111
+ serverConfig = serverConfigMap.aws.service[this.env];
112
+ serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
113
+ }
114
+
110
115
  // pisell2.0正式环境使用亚马逊服务器
111
116
  if (this.env === "prod" && this.projectName === "admin") {
112
117
  serverConfig = serverConfigMap.aws.service[this.env];
@@ -115,20 +120,20 @@ var UploadCode = /*#__PURE__*/function () {
115
120
  console.log(serverConfig, 'serverConfig');
116
121
  this.setConfig(serverConfig);
117
122
  if (serverConfig) {
118
- _context.next = 22;
123
+ _context.next = 23;
119
124
  break;
120
125
  }
121
126
  console.log("您当前没有权限!");
122
127
  return _context.abrupt("return", false);
123
- case 22:
128
+ case 23:
124
129
  _context.t0 = console;
125
- _context.next = 25;
130
+ _context.next = 26;
126
131
  return getGitCurrentBranch();
127
- case 25:
132
+ case 26:
128
133
  _context.t1 = _context.sent;
129
134
  _context.t0.log.call(_context.t0, "当前主项目分支", _context.t1);
130
135
  return _context.abrupt("return", true);
131
- case 28:
136
+ case 29:
132
137
  case "end":
133
138
  return _context.stop();
134
139
  }
package/lib/script/uploadCode/uploadCode.js CHANGED
@@ -85,6 +85,10 @@ var UploadCode = class {
85
85
  if (this.env === "prod") {
86
86
  serverConfig = this.setConfig(serverConfigMap["prod3"]);
87
87
  }
88
+ if (this.env === "prod" && this.projectName === "xzero") {
89
+ serverConfig = serverConfigMap.aws.service[this.env];
90
+ serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
91
+ }
88
92
  if (this.env === "prod" && this.projectName === "admin") {
89
93
  serverConfig = serverConfigMap.aws.service[this.env];
90
94
  serverConfig.privateKey = fs.readFileSync("../../../pem/pisell-pro.pem");
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pisell/common",
3
- "version": "3.0.2",
3
+ "version": "3.0.4",
4
4
  "sideEffects": [
5
5
  "*.less"
6
6
  ],
package/src/script/uploadCode/uploadCode.js CHANGED
@@ -86,6 +86,11 @@ class UploadCode {
86
86
  // );
87
87
  }
88
88
 
89
+ if (this.env === 'prod' && this.projectName === 'xzero') {
90
+ serverConfig = serverConfigMap.aws.service[this.env];
91
+ serverConfig.privateKey = fs.readFileSync(serverConfig.privateKey);
92
+ }
93
+
89
94
  // pisell2.0正式环境使用亚马逊服务器
90
95
  if (this.env === "prod" && this.projectName === "admin") {
91
96
  serverConfig = serverConfigMap.aws.service[this.env];