zero-ai 0.3.32 → 0.3.34

package/README.md

@@ -1,6 +1,7 @@
 # Zero工具箱
 
-Zero工具箱为一个工具类型的项目，主要为后端项目和前端项目打造的辅助开发人员进行快速开发的命令行工具，该工具可以帮助开发人员执行`Zero/Zero Ui`
+Zero工具箱为一个工具类型的项目，主要为后端项目和前端项目打造的辅助开发人员进行快速开发的命令行工具，该工具可以帮助开发人员执行
+`Zero/Zero Ui`
 的智能化开发，版本会持续发布到npm社区。
 
 * 详细文档：[Zero Ai命令](http://www.vertxai.cn/document/doc-web/index.html)
@@ -26,31 +27,13 @@ npm install -g zero-ai
 
 ```
 /usr/local/bin/ai -> /usr/local/lib/node_modules/vertx-ai/src/ai.js
-/usr/local/bin/aj -> /usr/local/lib/node_modules/vertx-ai/src/aj.js
-/usr/local/bin/art -> /usr/local/lib/node_modules/vertx-ai/src/ar.js
 + zero-ai@0.3.25
 added 77 packages from 119 contributors in 8.417s
 ```
 
 ## 2. 常用命令说明
 
-### 2.1. 三大命令
-
-- ai：标准命令
-- aj：后端专用命令（For Java）
-- art：前端开发命令（For React）
-
-### 2.2. 工程初始化
-
-```shell
-# 前端工程初始化
-ai init -name <name>
-# 前端工程更新
-ai sync
-
-# 后端工程初始化
-aj init
-```
+核心命令处理：`ai <command> [options]`
 
 
 

package/package.json

@@ -1,12 +1,10 @@
 {
     "name": "zero-ai",
-    "version": "0.3.32",
+    "version": "0.3.34",
     "description": "Zero Ecotope AI",
     "main": "src/ai.js",
     "bin": {
-        "ai": "./src/ai.js",
-        "aj": "./src/aj.js",
-        "art": "./src/art.js"
+        "ai": "./src/ai.js"
     },
     "scripts": {
         "test": "src/index.test.js"
@@ -33,6 +31,7 @@
         "commander": "^11.0.0",
         "crypto-js": "^4.1.1",
         "dox": "^1.0.0",
+        "ejs": "^3.1.10",
         "exceljs": "^4.3.0",
         "extend": "^3.0.2",
         "handlebars": "^4.7.7",

package/run-authorize.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-export ROOT=/Users/lang/zero-cloud/vertx-zero/vertx-pin
+export ROOT=/Users/lang/zero-cloud/web-app/workshop/zero-ws/zero-extension
 echo "拷贝 zero-ambient 权限"
 cp -rf ${ROOT}/zero-ambient/src/main/resources/plugin/ambient/oob/role/ADMIN.SUPER/* ./src/cab/perm/
 echo "拷贝 zero-atom 权限"

package/src/_template/SERVICE/database/database-reinit.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+mysql -u zero -P 3306 -h ox.engine.cn < database-reinit.sql
+echo "[OX] 重建 ZDB 数据库成功!";

package/src/_template/SERVICE/database/database-reinit.sql

@@ -0,0 +1,5 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+-- 删除原来的数据库
+DROP DATABASE IF EXISTS ZDB;
+CREATE DATABASE IF NOT EXISTS ZDB DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_bin;

package/src/_template/SERVICE/database/init-db.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+mysql -u r2mo -P 3306 -h ox.engine.cn < database/database-reinit.sql
+mvn install -DskipTests=true -Dmaven.javadoc.skip=true
+mvn liquibase:update -e
+echo "数据库初始化完成！"

package/src/_template/SERVICE/pom.xml.ejs

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.zerows</groupId>
+        <artifactId>zero-plugins-extension</artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId><%= id %></artifactId>
+    <name>(POM) 📚️ - Zero::Extension::<%= name %></name>
+    <modules>
+        <module><%= id %>-domain</module>
+        <module><%= id %>-provider</module>
+        <module><%= id %>-api</module>
+    </modules>
+    <packaging>pom</packaging>
+</project>

package/src/_template/SERVICE/source-api/pom.xml.ejs

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.zerows</groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId><%= id %>-api</artifactId>
+    <name>Zero::Extension💎 - <%= name %>::Api</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.zerows</groupId>
+            <artifactId><%= id %>-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

package/src/_template/SERVICE/source-domain/pom.xml.ejs

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.zerows</groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId><%= id %>-domain</artifactId>
+    <name>Zero::Extension💎 - <%= name %>::Domain</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.zerows</groupId>
+            <artifactId>zero-extension-skeleton</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.liquibase</groupId>
+                <artifactId>liquibase-maven-plugin</artifactId>
+                <configuration>
+                    <propertyProviderClass>io.zerows.plugins.liquibase.LiquibaseEncryptionZero</propertyProviderClass>
+                    <!-- 配置文件路径 -->
+                    <propertyFile>plugins/${project.parent.artifactId}/database/MYSQL.properties</propertyFile>
+                    <changeLogFile>plugins/${project.parent.artifactId}/database/MYSQL.yml</changeLogFile>
+                    <!-- 配置参数 -->
+                    <promptOnNonLocalDatabase>false</promptOnNonLocalDatabase>
+                    <outputFileEncoding>UTF-8</outputFileEncoding>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

package/src/_template/SERVICE/source-provider/pom.xml.ejs

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.zerows</groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0.0</version>
+    </parent>
+
+    <artifactId><%= id %>-provider</artifactId>
+    <name>Zero::Extension💎 - <%= name %>::Provider</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.zerows</groupId>
+            <artifactId><%= id %>-domain</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

package/src/ai.js

@@ -1,11 +1,17 @@
 #!/usr/bin/env node
 const Ec = require('./epic');
+const Ut = require('./commander-shared');
 const Executor = require('./commander-ai');
-Ec.executeHeader("<标准工具>");
+
+
+// 输出头部
+Ec.executeHeader("Rachel Momo Command");
+
+
 // 读取配置文件
-let configArr = Ec.parseZero(__dirname + '/commander/ai.zero');
-configArr = Ec.itArray(configArr, (config) => Ec.itCompress(config, "option"));
-// Commander的执行
+const configArr = Ut.parseMetadata();
 Ec.executeBody(configArr, Executor);
-// 解析参数专用
+
+
+// 输出尾部
 Ec.executeEnd();

package/src/commander/ai.zero

@@ -1,12 +1,8 @@
 A;
-command,    executor,       description,                                option1,option2, option3, option4
-uuid,       executeUuid,    生成UUID的值，可直接拷贝,                      n=「20」生成的数量
-csv,        executeCsv,     将JsonArray数据转换成csv,                     p=输入数据文件路径, c=配置文件路径, s=分割符
-uk,         executeUk,      检查数据文件中的Data数据是否符合唯一值规范,       p=输入数据文件路径, f=需要检查的字段名
-data,       executeData,    根据配置文件生成数据,                          c=配置文件路径, o=「.」输出文件基本路径, j=「false」是否Array, n=「23」如果是Array则生效
-key,        executeKey,     为数据模板添加key属性（UUID格式）,              p=输入数据文件路径, f=「key」标识key的字段名
-str,        executeString,  生成随机字符串，可直接拷贝,                     n=「1」生成的数量, l=「64」长度信息（默认64）
-md5,        executeMD5,     加密字符串，可直接拷贝,                        i=输入字符串
-init,       executeInit,    初始化Zero Ui工程,                           n=项目名称（必须填写，最终写入package.json）
-sync,       executeSync,    同步Zero Ui最新框架,                         p=配置文件路径，前端项目根目录,m=是否本地模式
-
+command,    executor,               description,                                option1,option2, option3, option4
+uuid,       executeUuid,            生成UUID的值，可直接拷贝,                      n=「20」生成的数量
+str,        executeString,          生成随机字符串，可直接拷贝,                     n=「1」生成的数量, l=「64」长度信息（默认64）,f=是否完全生成
+md5,        executeMD5,             加密字符串，可直接拷贝,                        i=输入字符串
+sync,       executeFrontendSync,    同步Zero Ui最新框架,                          p=配置文件路径，前端项目根目录,m=是否本地模式
+app,        executeApp,             生成Zero 微服务实例,                          p=配置文件路径,n=名称（最小模式）
+mod,        executeMod,             生成Zero 扩展模块实例,                        p=配置文件路径,n=名称（完整模式）

package/src/commander/app.json

@@ -0,0 +1,18 @@
+{
+    "executor": "executeApp",
+    "description": "（后端）创建一个新的 Zero App 脚手架！",
+    "command": "app",
+    "options": [
+        {
+            "name": "name",
+            "alias": "n",
+            "description": "创建应用的名称！"
+        },
+        {
+            "name": "path",
+            "alias": "p",
+            "description": "默认应用的输出路径，若不制定为当前路径！",
+            "default": "."
+        }
+    ]
+}

package/src/commander/help.json

@@ -0,0 +1,7 @@
+{
+    "executor": "executeHelp",
+    "description": "显示帮助的详细信息！",
+    "command": "help",
+    "options": [
+    ]
+}

package/src/commander/md5.json

@@ -0,0 +1,12 @@
+{
+    "executor": "executeMD5",
+    "description": "直接针对输入内容生成 MD5 加密值",
+    "command": "md5",
+    "options": [
+        {
+            "name": "input",
+            "alias": "i",
+            "description": "加密输入的字符串的值"
+        }
+    ]
+}

package/src/commander/mod.json

@@ -0,0 +1,24 @@
+{
+    "executor": "executeMod",
+    "description": "（后端）创建一个新的 Zero Extension 模块脚手架！",
+    "command": "mod",
+    "options": [
+        {
+            "name": "module",
+            "alias": "m",
+            "description": "创建模块的名称！"
+        },
+        {
+            "name": "config",
+            "alias": "c",
+            "description": "配置文件路径，默认读取 mod.json 文件！",
+            "default": "mod.json"
+        },
+        {
+            "name": "output",
+            "alias": "o",
+            "description": "默认应用的输出路径，若不制定为当前路径！",
+            "default": "."
+        }
+    ]
+}

package/src/commander/option.zero

@@ -18,4 +18,5 @@ r=role
 i=input
 l=length
 e=extension
+f=full
 w=write

package/src/commander/str.json

@@ -0,0 +1,25 @@
+{
+    "executor": "executeString",
+    "description": "生成随机字符串",
+    "command": "str",
+    "options": [
+        {
+            "name": "number",
+            "alias": "n",
+            "description": "生成随机数的数量，默认 1 个",
+            "default": 1
+        },
+        {
+            "name": "length",
+            "alias": "l",
+            "description": "生成随机字符串的长度，默认 10 个字符",
+            "default": 10
+        },
+        {
+            "name": "full",
+            "alias": "f",
+            "description": "是否使用全字符集，默认 false，只使用字母和数字",
+            "default": false
+        }
+    ]
+}

package/src/commander/sync.json

@@ -0,0 +1,19 @@
+{
+    "executor": "executeFrontendSync",
+    "description": "同步 Zero Ui 的最新框架",
+    "command": "sync",
+    "options": [
+        {
+            "name": "path",
+            "alias": "p",
+            "description": "本地配置文件路径，默认 .zero",
+            "default": ".zero"
+        },
+        {
+            "name": "mode",
+            "alias": "m",
+            "description": "指定同步模块的模式，是否本地同步",
+            "default": false
+        }
+    ]
+}

package/src/commander/uuid.json

@@ -0,0 +1,13 @@
+{
+    "executor": "executeUuid",
+    "description": "生成 UUID 的值，可直接拷贝",
+    "command": "uuid",
+    "options": [
+        {
+            "name": "number",
+            "alias": "n",
+            "description": "生成 UUID 的数量，默认 1 个",
+            "default": 1
+        }
+    ]
+}

package/src/commander/web.json

@@ -0,0 +1,12 @@
+{
+    "executor": "executeWeb",
+    "description": "（前端）创建一个新的 Zero Ui 的脚手架！",
+    "command": "web",
+    "options": [
+        {
+            "name": "name",
+            "alias": "n",
+            "description": "创建 Web 应用的名称！"
+        }
+    ]
+}

package/src/commander-ai/fn.help.metadata.js

@@ -0,0 +1,20 @@
+const Ec = require('../epic');
+const os = require('os');
+const Ut = require("../commander-shared");
+module.exports = (options) => {
+    const metadata = Ut.parseMetadata();
+    metadata.forEach(runner => {
+        Ec.execute(`命令：` + `ai ${runner.command} [-options]`.green);
+        Ec.execute(`说明：${runner.description}`.yellow);
+        runner.options.forEach(option => {
+            if (option.hasOwnProperty('default')) {
+                const str = option.default + '';
+                Ec.execute(`\t-${option.alias},--${option.name}`.red + `\t${option.description}, 默认值：\uD83C\uDF37 ` + str.blue);
+            } else {
+                Ec.execute(`\t-${option.alias},--${option.name}`.red + `\t${option.description}`);
+            }
+        })
+        Ec.execute();
+    });
+    Ec.info("命令执行完成！")
+}

package/src/commander-ai/{fn.md5.js → fn.random.md5.js}

@@ -1,28 +1,22 @@
 const Ec = require('../epic');
 const os = require('os');
+const Ut = require("../commander-shared");
 
 const os_compatible = ['darwin', 'win32'];
 
-module.exports = () => {
-    /*
-     * 参数解析
-     */
-    const actual = Ec.executeInput(
-        ['-i', '--input'],
-        [
-            ["-i", "--input"]
-        ]
-    );
+module.exports = (options) => {
+    const parsed = Ut.parseArgument(options);
     /*
      * 基本信息
      */
-    const input = actual.input;
+    const input = parsed.input;
     const platform = os.platform();
     Ec.info(`当前操作系统：${platform}`);
 
     if (os_compatible.indexOf(platform) > -1) {
         const content = Ec.strMD5(input);
-        console.info(content);
+        Ec.execute(`明文值：${input}`)
+        Ec.execute(`加密值：${content}`);
         Ec.outCopy(content)
             .then(sign => Ec.info(`加密的字符串已经成功拷贝到剪切板中！`))
     } else {

package/src/commander-ai/{fn.random.js → fn.random.string.js}

@@ -1,31 +1,28 @@
 const Ec = require('../epic');
 const os = require('os');
+const Ut = require("../commander-shared");
 
-module.exports = () => {
+const os_compatible = ['darwin', 'win32'];
+
+module.exports = (options) => {
     /*
      * 参数解析
      */
-    const actual = Ec.executeInput(
-        [],
-        [
-            ['-n', '--number', 1],
-            ['-l', '--length', 64]
-        ]
-    );
+    const parsed = Ut.parseArgument(options);
     /*
      * 基本信息
      */
-    const number = actual.number;
-    const length = actual.length;
+    const number = parsed.number;
+    const length = parsed.length;
     const platform = os.platform();
     Ec.info(`随机字符串，生成数量：${number}，长度：${length}`);
     Ec.info(`当前操作系统：${platform}`);
 
-    if ("darwin" === platform) {
+    if (os_compatible.indexOf(platform) > -1) {
         const content = [];
         for (let idx = 0; idx < number; idx++) {
-            const generated = Ec.strRandom(length);
-            console.info(generated);
+            const generated = Ec.strRandom(length, parsed.full);
+            Ec.execute(generated);
             content.push(generated);
         }
         Ec.outCopy(content.join('\n'))

package/src/commander-ai/{fn.uuid.js → fn.random.uuid.js}

@@ -1,22 +1,18 @@
 const Ec = require('../epic');
+const Ut = require("../commander-shared");
 const os = require('os');
 
 const os_compatible = ['darwin', 'win32'];
 
-module.exports = () => {
+module.exports = (options) => {
     /*
      * 参数解析
      */
-    const actual = Ec.executeInput(
-        [],
-        [
-            ['-n', '--number', 20]
-        ]
-    );
+    const parsed = Ut.parseArgument(options);
     /*
      * 基本信息
      */
-    const number = actual.number;
+    const number = parsed.number;
     const platform = os.platform();
     Ec.info(`UUID生成器，生成数量：${number}`);
     Ec.info(`当前操作系统：${platform}`);
@@ -24,7 +20,7 @@ module.exports = () => {
         const content = [];
         for (let idx = 0; idx < number; idx++) {
             const generated = Ec.strUuid();
-            console.info(generated);
+            Ec.execute(generated);
             content.push(generated);
         }
         Ec.outCopy(content.join('\n'))

package/src/commander-ai/fn.source.app.js

@@ -0,0 +1,15 @@
+const Ec = require("../epic");
+const Ut = require("../commander-shared");
+
+module.exports = (options) => {
+    /*
+     * 参数解析
+     */
+    const parsed = Ut.parseArgument(options);
+    /*
+     * 基本信息验证
+     */
+    const name = parsed.name;
+    console.log(parsed);
+    Ec.info(`生成应用信息，应用名称：${name}`);
+}