diff --git a/package.json b/package.json index 8d018b4..ee85a8a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@kevisual/envision-cli", - "version": "0.0.37", + "version": "0.0.38", "description": "envision command tools", "main": "dist/app.mjs", "type": "module", diff --git a/src/command/login.ts b/src/command/login.ts index b6e1d27..79759be 100644 --- a/src/command/login.ts +++ b/src/command/login.ts @@ -73,7 +73,13 @@ const loginCommand = new Command('login') program.addCommand(loginCommand); const showMe = async (show = true) => { - let me = await queryLogin.getMe(); + const token = process.env.KEVISUAL_TOKEN; + const localToken = storage.getItem('token'); + if (!token && !localToken) { + console.log('请先登录'); + return; + } + let me = await queryLogin.getMe(token); if (me.code === 401) { me = await queryLogin.getMe(); } diff --git a/src/command/ls-token.ts b/src/command/ls-token.ts index 734ac04..4b799d0 100644 --- a/src/command/ls-token.ts +++ b/src/command/ls-token.ts @@ -4,10 +4,17 @@ import { queryLogin, storage } from '@/module/query.ts'; import inquirer from 'inquirer'; import util from 'util'; -const token = new Command('token').description('show token').action(async () => { - const token = storage.getItem('token'); - console.log('token', token); -}); +const token = new Command('token') + .option('-e, --env', 'show token in env') + .description('show token') + .action(async (opts) => { + const token = storage.getItem('token'); + if (opts.env) { + console.log('token', process.env.KEVISUAL_TOKEN); + } else { + console.log('token', token); + } + }); const tokenList = new Command('list') .description('show token list') // .option('-r --remove ', 'remove token by number') diff --git a/submodules/kevisual-query-login b/submodules/kevisual-query-login index f102494..f8af245 160000 --- a/submodules/kevisual-query-login +++ b/submodules/kevisual-query-login @@ -1 +1 @@ -Subproject commit f1024941eda4162b0ef5f9a4cd3b13c6645c7974 +Subproject commit f8af24506bdfdbd895be293c8fd8ce061c94e7af