@opentapd/tplugin-cli 0.39.0 → 0.39.1-alpha.1

package/cli.js

@@ -89,13 +89,13 @@ program.command('encrypt <value>')
   .description('加密敏感变量')
   .action(actionRunner(value => require('./lib/encrypt')(value)));
 
-// resource 添加新的UI扩展模块
-program.command('resources')
-  .description('添加扩展模块模板')
-  .action(actionRunner(() => require('./lib/resources')()));
-
-// workspace 创建个人专属开发项目
 if (tpluginConf.tapd.pluginEnv !== 'cloud') {
+  // resource 添加新的UI扩展模块
+  program.command('resources')
+    .description('添加扩展模块模板')
+    .action(actionRunner(() => require('./lib/resources')()));
+
+  // workspace 创建个人专属开发项目
   program.command('workspace')
     .description('创建TAPD开发项目')
     .action(actionRunner(() => require('./lib/workspace')()));

package/lib/deploy.js

@@ -261,7 +261,7 @@ async function deploy(branch, commit, code, { nick } = {}) {
   spinner.start('部署中... ...');
   let i = 0;
   // 轮训等待部署任务结果
-  while (i++ < 60) {
+  while (i++ < 120) {
     let buildStatus = '';
     try {
       const { data } = await tapdsdk.request({ url: 'open_user_app/get_build_status', params: {

package/lib/serve.js

@@ -65,6 +65,51 @@ module.exports = async () => {
     workspaceId = session.getConfig('companyId');
   }
 
+  if (tpluginConf.tapd.pluginEnv === 'cloud') {
+    //获取当前公司信息
+    const { data } = await tapdsdk.request({ url: 'open_user_app/get_company_info', params: {}, method: 'POST' });
+
+    //获取公司信息失败
+    if (!data.status || !data.data) {
+      spinner.fail("获取公司信息失败");
+      process.exit(1);
+    }
+
+
+    if(!data.data.is_test) {
+      spinner.info("当前企业不是测试企业");
+      const { data } = await tapdsdk.request({ url: 'open_user_app/get_test_deploy_company_option', params: {}, method: 'POST' });
+      if (!data.status || !data.data) {
+        spinner.fail("获取测试公司信息失败");
+        process.exit(1);
+      }
+
+      if(Array.isArray(data.data.data_list) && data.data.data_list.length === 0) {
+        const { createTestCompany } = await inquirer.prompt({
+          type: 'confirm',
+          message: '是否创建测试企业',
+          name: 'createTestCompany',
+        });
+    
+        if (createTestCompany) {
+          spinner.info('开始创建测试企业');
+          const { data } = await tapdsdk.request({ url: 'open_user_app/register_test_company', params: {}, method: 'POST' });
+          if (!data.status) {
+            spinner.fail("创建测试企业失败");
+            process.exit(1);
+          }
+          spinner.succeed("创建测试企业成功，请重新登陆切换到测试企业");
+          process.exit(1);
+        } else {
+          spinner.info("请前往开放平台-＞开发者后台-＞应用测试创建测试企业");
+          process.exit(1);
+        }
+      } else {
+        spinner.fail("当前企业不是测试企业，请重新登陆切换到测试企业调试应用");
+        process.exit(1);
+      }
+    }
+}
 
   console.log(`\n  进入调试空间: ${chalk.red(`${tpluginConf.tapd.tapdHost}/${workspaceId}`)}`);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentapd/tplugin-cli",
-  "version": "0.39.0",
+  "version": "0.39.1-alpha.1",
   "description": "tplugin-cli",
   "bin": {
     "tplugin-cli": "index.js"
@@ -78,5 +78,5 @@
     "node": ">=14.13.0"
   },
   "main": "index.js",
-  "gitHead": "159fec2907a90f0d0d5a81f31cf4db9da9247c75"
+  "gitHead": "a75f75bc62555d69e3b39e1e179d62d6dee84070"
 }