jjb-cmd 1.0.1 → 1.0.4

package/.idea/modules.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/jjb-cli.iml" filepath="$PROJECT_DIR$/.idea/jjb-cli.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/jjb-cmd.iml" filepath="$PROJECT_DIR$/.idea/jjb-cmd.iml" />
     </modules>
   </component>
 </project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2022 jjb-front-team <https://www.cqjjb.cn>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2022 jjb-front-team <https://www.cqjjb.cn>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/bin/command.js

@@ -2,6 +2,7 @@
 
 const commander = require('commander');
 const cliScripts = require('../src/cli.pull.js');
+const MergeScripts = require('../src/cli.merge.js');
 
 commander.command('v').description('-- 查看版本').action(() => {
   console.log('当前版本 v1.0.0');
@@ -9,15 +10,15 @@ commander.command('v').description('-- 查看版本').action(() => {
 
 commander.command('help').description('-- 帮助').action(() => {
   console.log('使用方法：');
-  console.log('1.jjb-cli v -- 查看版本。');
-  console.log('2.jjb-cli help -- 帮助。');
-  console.log('3.jjb-cli view res -- 预览资源。');
-  console.log('4.jjb-cli [actionName (有效值 pull)] [...args] -- 基础功能。');
+  console.log('1.jjb-cmd v -- 查看版本。');
+  console.log('2.jjb-cmd help -- 帮助。');
+  console.log('3.jjb-cmd view res -- 预览资源。');
+  console.log('4.jjb-cmd [actionName (有效值 pull)] [...args] -- 基础功能。');
 });
 
 commander.command('view res').description('-- 预览资源').action(() => {
   console.log('当前可资源：');
-  console.log('[common, admin-components]');
+  console.log('[common, react-admin-component]');
 });
 
 // pull 命令
@@ -25,4 +26,15 @@ commander.command('pull -- <文件夹名称必填。>').description('-- 文件
   cliScripts(res);
 });
 
+//多省多应用命令
+commander.command('mp -- <multi prov多省多应用启动dev>').description('-- multi prov多省多应用合并').action(res => {
+  MergeScripts(res);
+  console.log('start test')
+});
+
+//多省单应用
+commander.command('sp -- <single prov多省单应用>').description('-- single prov多省单应用').action(res => {
+
+});
+
 commander.parse(process.argv);

package/package.json

@@ -1,19 +1,19 @@
-{
-  "name": "jjb-cmd",
-  "version": "1.0.1",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "node bin/command.js help"
-  },
-  "bin": {
-    "jjb-cli": "bin/command.js"
-  },
-  "author": "jjb-front-team",
-  "license": "MIT",
-  "dependencies": {
-    "request": "2.88.2",
-    "commander": "1.3.2",
-    "compressing": "^1.5.1"
-  }
-}
+{
+  "name": "jjb-cmd",
+  "version": "1.0.4",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "node bin/command.js help"
+  },
+  "bin": {
+    "jjb-cmd": "bin/command.js"
+  },
+  "author": "jjb-front-team",
+  "license": "MIT",
+  "dependencies": {
+    "request": "2.88.2",
+    "commander": "1.3.2",
+    "compressing": "^1.5.1"
+  }
+}

package/src/cli.merge.js

@@ -0,0 +1,69 @@
+const fs = require('fs');
+const path = require('path');
+const utils = require('./util.js');
+
+//项目路径
+let projectPath = '';
+//项目脚手架路径
+let vesselPath = '';
+//input传入参数 指令:地区:环境 start:chongqing:dev
+let commandArr = [];
+//application数据
+let applicationData = {};
+const fromFileData = {};
+
+/**
+ * input 指令:地区:环境 start:chongqing:dev
+ */
+module.exports = input => {
+  commandArr = input.split(':');
+  projectPath = path.resolve('./project');
+  vesselPath = path.resolve('./vessel/src');
+  const inputRegion = commandArr[1];
+  const settingJson = JSON.parse(fs.readFileSync(`${projectPath}/${inputRegion}/setting.json`).toString());
+  TileItems(settingJson.items, () => {
+    fromFileData.router.forEach(itemPath => {
+      const itemPathArr = itemPath.split(inputRegion);
+      console.log(itemPath)
+      const filePathArr = itemPathArr.split('/');
+      const application = filePathArr[1];
+      if (!applicationData[application]) {
+        applicationData[application] = {
+          routerConfig: [],
+          routerPath: []
+        };
+      }
+      applicationJson[application].routerConfig.push(`{ path: '${fromItem.path}', component: () => import('${fromItem.file}') }`);
+      applicationJson[application].routerPath.push(fromItem.path);
+      utils.CreatePaths(vesselPath, filePathArr.slice(2, filePathArr.length - 1)).then(() => {
+        const filePath = filePathArr.slice(2, filePathArr.length);
+        const fileContent = fs.readFileSync(`${projectPath}/${inputRegion}/${filePath.join('/')}`).toString();
+        fs.writeFileSync(`${projectPath}/${inputRegion}/${filePath.join('/')}`, fileContent);
+      });
+    });
+  });
+};
+
+/**
+ * 平铺，展开所有路径
+ * @param items
+ * @param cb
+ * @constructor
+ */
+function TileItems (items, cb) {
+  items.forEach((item, index) => {
+    const region = item.region;
+    item.from.forEach((from, fromIndex) => {
+      const pathArr = [];
+      utils.DeepScanner(projectPath + '/' + region + '/' + from.file, pathArr);
+      if (!fromFileData[from.fileType]) {
+        fromFileData[from.fileType] = pathArr;
+      } else {
+        fromFileData[from.fileType] = fromFileData[from.fileType].concat(pathArr);
+      }
+      if (index === items.length - 1 && fromIndex === item.from.length - 1) {
+        cb();
+      }
+    });
+  })
+}

package/src/cli.pull.js

@@ -17,9 +17,10 @@ const CLOUD_PROJECT = {
     token: 'G4HJRsHr9D7Ssmixegw2',
     projectId: 279
   },
-  'admin-components': {
-    token: '9S83hVV4PKDbsPY9yT5D',
-    projectId: 280
+  'react-admin-component': {
+    token: 'FT3pKzxpRynFkmddJ9Bs',
+    projectId: 340,
+    localName: 'components'
   }
 };
 
@@ -46,11 +47,9 @@ module.exports = input => {
                     const srcAll = fs.readdirSync(dirUnzip);
                     srcAll.forEach(dirName => {
                       if (dirName.indexOf('-master-') !== -1) {
-                        const nowName = dirName.split('-')[ 0 ];
-                        const nowPath = srcDir + '\\' + nowName;
+                        const nowPath = srcDir + '\\' + cloudObj.localName;
                         utils.DeleteDirAllFile(nowPath, () => {
                           fs.mkdirSync(nowPath);
-                          console.log(nowPath);
                           utils.CopyFolder(dirUnzip + dirName, nowPath);
                           setTimeout(() => {
                             const isMutilate = fs.existsSync(srcDir + '\\' + 'application');

package/.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>