@jayfong/x-server 2.70.0 → 2.71.0
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.
package/lib/_cjs/cli/cli.js
CHANGED
|
@@ -230,6 +230,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
|
|
|
230
230
|
host: deployEnv.HOST,
|
|
231
231
|
user: deployEnv.USER,
|
|
232
232
|
key: deployEnv.KEY,
|
|
233
|
+
pass: deployEnv.PASSWORD,
|
|
233
234
|
token: appEnv.APP_TOKEN,
|
|
234
235
|
port: appEnv.APP_PORT,
|
|
235
236
|
env: appEnv
|
|
@@ -240,6 +241,7 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
|
|
|
240
241
|
host: deployEnv.HOST,
|
|
241
242
|
user: deployEnv.USER,
|
|
242
243
|
key: deployEnv.KEY,
|
|
244
|
+
pass: deployEnv.PASSWORD,
|
|
243
245
|
dir: deployEnv.DIR,
|
|
244
246
|
cmd: deployEnv.CMD,
|
|
245
247
|
memory: deployEnv.MEMORY,
|
|
@@ -18,7 +18,8 @@ class DeployUtil {
|
|
|
18
18
|
await ssh.connect({
|
|
19
19
|
host: options.host,
|
|
20
20
|
username: options.user,
|
|
21
|
-
privateKey: options.key
|
|
21
|
+
privateKey: options.key,
|
|
22
|
+
password: options.pass
|
|
22
23
|
});
|
|
23
24
|
const appName = pkgContent.name;
|
|
24
25
|
const appDir = `./${appName}`;
|
|
@@ -52,7 +53,8 @@ class DeployUtil {
|
|
|
52
53
|
await ssh.connect({
|
|
53
54
|
host: options.host,
|
|
54
55
|
username: options.user,
|
|
55
|
-
privateKey: options.key
|
|
56
|
+
privateKey: options.key,
|
|
57
|
+
password: options.pass
|
|
56
58
|
});
|
|
57
59
|
await ssh.execCommand((0, _vtils.dedent)`
|
|
58
60
|
set -ex
|
package/lib/cli/cli.js
CHANGED
|
@@ -227,6 +227,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
|
|
|
227
227
|
host: deployEnv.HOST,
|
|
228
228
|
user: deployEnv.USER,
|
|
229
229
|
key: deployEnv.KEY,
|
|
230
|
+
pass: deployEnv.PASSWORD,
|
|
230
231
|
token: appEnv.APP_TOKEN,
|
|
231
232
|
port: appEnv.APP_PORT,
|
|
232
233
|
env: appEnv
|
|
@@ -237,6 +238,7 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
|
|
|
237
238
|
host: deployEnv.HOST,
|
|
238
239
|
user: deployEnv.USER,
|
|
239
240
|
key: deployEnv.KEY,
|
|
241
|
+
pass: deployEnv.PASSWORD,
|
|
240
242
|
dir: deployEnv.DIR,
|
|
241
243
|
cmd: deployEnv.CMD,
|
|
242
244
|
memory: deployEnv.MEMORY,
|
package/lib/cli/deploy_util.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ export interface DeployOptions {
|
|
|
2
2
|
cwd: string;
|
|
3
3
|
host: string;
|
|
4
4
|
user: string;
|
|
5
|
-
key
|
|
5
|
+
key?: string;
|
|
6
|
+
pass?: string;
|
|
6
7
|
dir: string;
|
|
7
8
|
memory?: string;
|
|
8
9
|
cron?: string;
|
|
@@ -11,7 +12,8 @@ export interface DeployOptions {
|
|
|
11
12
|
export interface DeployEnvOptions {
|
|
12
13
|
host: string;
|
|
13
14
|
user: string;
|
|
14
|
-
key
|
|
15
|
+
key?: string;
|
|
16
|
+
pass?: string;
|
|
15
17
|
port: number;
|
|
16
18
|
token: string;
|
|
17
19
|
env: Record<string, any>;
|
package/lib/cli/deploy_util.js
CHANGED
|
@@ -13,7 +13,8 @@ export class DeployUtil {
|
|
|
13
13
|
await ssh.connect({
|
|
14
14
|
host: options.host,
|
|
15
15
|
username: options.user,
|
|
16
|
-
privateKey: options.key
|
|
16
|
+
privateKey: options.key,
|
|
17
|
+
password: options.pass
|
|
17
18
|
});
|
|
18
19
|
const appName = pkgContent.name;
|
|
19
20
|
const appDir = `./${appName}`;
|
|
@@ -47,7 +48,8 @@ export class DeployUtil {
|
|
|
47
48
|
await ssh.connect({
|
|
48
49
|
host: options.host,
|
|
49
50
|
username: options.user,
|
|
50
|
-
privateKey: options.key
|
|
51
|
+
privateKey: options.key,
|
|
52
|
+
password: options.pass
|
|
51
53
|
});
|
|
52
54
|
await ssh.execCommand(dedent`
|
|
53
55
|
set -ex
|