zero-ai 0.3.34 → 0.3.35

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "zero-ai",
-    "version": "0.3.34",
+    "version": "0.3.35",
     "description": "Zero Ecotope AI",
     "main": "src/ai.js",
     "bin": {

package/src/_template/MODULE/database/MYSQL.properties

@@ -0,0 +1,4 @@
+url=jdbc:mysql://ox.engine.cn:3306/ZDB?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&failOverReadOnly=false&useSSL=false&allowPublicKeyRetrieval=true
+driver=com.mysql.cj.jdbc.Driver
+username=${R2MO_DB_MYSQL5_USERNAME}
+password=${R2MO_DB_MYSQL5_PASSWORD}

package/src/_template/MODULE/database/MYSQL.yml

@@ -0,0 +1,2 @@
+databaseChangeLog:
+  # 组织架构基本信息

package/src/_template/MODULE/source-domain/ExtensionGeneration.ejs

@@ -0,0 +1,7 @@
+package <%= packageName %>;
+
+import io.r2mo.vertx.jooq.generate.configuration.MetaGenerate;
+
+public class Extension<%= name %>Generation extends MetaGenerate {
+
+}

package/src/_template/MODULE/source-domain/configuration.yml.ejs

@@ -0,0 +1,3 @@
+shape:
+id: <%= id %>
+name: "Zero Extension / <%= name %>"

package/src/_template/MODULE/source-provider/ExtensionSource.ejs

@@ -0,0 +1,14 @@
+package <%= packageName %>;
+
+import io.zerows.extension.skeleton.boot.ExtensionLauncher;
+import io.zerows.platform.ENV;
+
+public class Extension<%= name %>Source {
+
+    public static void main(final String[] args) {
+        final ExtensionLauncher launcher = ExtensionLauncher.create(Extension<%= name %>Source.class, args);
+        final Extension<%= name %>Generation configuration = new Extension<%= name %>Generation();
+        configuration.resolver(ENV::parseVariable);
+        launcher.startGenerate(configuration);
+    }
+}

package/src/_template/SPRING/database/database-account.sql.ejs

@@ -0,0 +1,3 @@
+CREATE USER IF NOT EXISTS '<%= dbUser %>'@'%' IDENTIFIED BY '<%= dbPassword %>';
+GRANT ALL PRIVILEGES ON *.* TO '<%= dbUser %>'@'%' WITH GRANT OPTION;
+FLUSH PRIVILEGES;

package/src/_template/SPRING/database/database-reinit.sql.ejs

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

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

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+source $PWD/mvn-env.sh
+mysql -ur2mo -h"$R2MO_MYSQL_HOST" < "$PWD/database/${R2MO_CLOUD_DB_TYPE}/database-account.sql"
+mysql -ur2mo -h"$R2MO_MYSQL_HOST" < "$PWD/database/${R2MO_CLOUD_DB_TYPE}/database-reinit.sql"

package/src/_template/SPRING/mvn-build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+rm -rf generated/*
+mvn clean package install -Dquickly -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.compile.fork=true -T 16C

package/src/_template/SPRING/mvn-env.sh.ejs

@@ -0,0 +1,7 @@
+export R2MO_CLOUD_DB_TYPE=<%= dbType %>
+# MySQL Env
+export R2MO_MYSQL_DATABASE=<%= dbName %>
+export R2MO_MYSQL_HOST=<%= dbHost %>
+export R2MO_MYSQL_PORT=<%= dbPort %>
+export R2MO_MYSQL_USER=<%= dbUser %>
+export R2MO_MYSQL_PASS=<%= dbPassword %>

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

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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>r2mo-rapid</artifactId>
+        <version>1.0-M26</version>
+    </parent>
+    <groupId><%= group %></groupId>
+    <artifactId><%= id %></artifactId>
+    <version>1.0</version>
+    <name>App::<%= name %> / MOMO ${momo.version} | R2MO ${r2mo.version}</name>
+    <modules>
+        <module><%= id %>-domain</module>
+        <module><%= id %>-provider</module>
+        <module><%= id %>-api</module>
+    </modules>
+    <properties>
+        <momo.version>1.0.11</momo.version>
+        <r2mo.version>1.0-M26</r2mo.version>
+        <!-- 项目基本信息 -->
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <java.version>17</java.version>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!--
+            版本管理专用 Stack
+            -->
+            <dependency>
+                <groupId>io.zerows</groupId>
+                <artifactId>rachel-momo-stack</artifactId>
+                <version>${momo.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+    <packaging>pom</packaging>
+</project>

package/src/_template/SPRING/source-api/AppDev.java.ejs

@@ -0,0 +1,13 @@
+package <%= packageName %>;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.PropertySource;
+
+@SpringBootApplication
+@PropertySource("classpath:env.properties")
+public class <%= name %>AppDev {
+    public static void main(final String[] args) {
+        SpringApplication.run(<%= name %>AppDev.class, args);
+    }
+}

package/src/_template/SPRING/source-api/Application.java.ejs

@@ -0,0 +1,12 @@
+package <%= packageName %>;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class <%= name %>Application {
+
+    public static void main(final String[] args) {
+        SpringApplication.run(<%= name %>Application.class, args);
+    }
+}

package/src/_template/SPRING/source-api/application.yml.ejs

@@ -0,0 +1,64 @@
+server:
+  port: 9002
+  servlet:
+    context-path: /
+
+spring:
+  application:
+    name: <%= id %>
+  # 数据源配置
+  datasource:
+    dynamic:
+      primary: master
+      strict: false
+      datasource:
+        master:
+          url: ${spring.datasource.url}
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
+          driver-class-name: ${spring.datasource.driver-class-name}
+    url: jdbc:mysql://${R2MO_MYSQL_HOST}:${R2MO_MYSQL_PORT:3306}/${R2MO_MYSQL_DATABASE}?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true
+    username: ${R2MO_MYSQL_USER}
+    password: ${R2MO_MYSQL_PASS}
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    hikari:
+      minimum-idle: 5
+      maximum-pool-size: 20
+      auto-commit: true
+      idle-timeout: 30000
+      max-lifetime: 1800000
+      connection-timeout: 30000
+      connection-test-query: SELECT 1
+  # Flyway
+  flyway:
+    enabled: true
+    locations:
+      - classpath:${spring.application.name}/database/schema/
+    encoding: UTF-8
+    sql-migration-prefix: V
+    sql-migration-separator: __
+    sql-migration-suffixes: .sql
+    validate-on-migrate: false
+    baseline-on-migrate: true
+    baseline-version: 1
+    clean-disabled: true # 生产环境禁用
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    cache-enabled: false
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  global-config:
+    db-config:
+      id-type: auto
+      logic-delete-value: 1
+      logic-not-delete-value: 0
+  mapper-locations:
+    - classpath:${spring.application.name}/mapper/**/*.xml
+  mapperPackage: <%= packageName %>.mapper
+  type-handlers-package: io.r2mo.dbe.mybatisplus.core.typehandler
+
+logging:
+  level:
+    org.springframework.web: DEBUG
+    org.springframework.web.servlet.mvc.method.annotation: TRACE

package/src/_template/SPRING/source-api/env.properties.ejs

@@ -0,0 +1,7 @@
+R2MO_CLOUD_DB_TYPE=<%= dbType %>
+# MySQL Env
+R2MO_MYSQL_DATABASE=<%= dbName %>
+R2MO_MYSQL_HOST=<%= dbHost %>
+R2MO_MYSQL_PORT=<%= dbPort %>
+R2MO_MYSQL_USER=<%= dbUser %>
+R2MO_MYSQL_PASS=<%= dbPassword %>

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

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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><%= group %></groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId><%= id %>-api</artifactId>
+    <name>App::<%= name %>::Api</name>
+    <dependencies>
+        <dependency>
+            <groupId><%= group %></groupId>
+            <artifactId><%= id %>-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <!-- MySQL -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-undertow</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
+            <version>3.5.5</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator -->
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>9.0.1.Final</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass><%= packageName %>.<%= name %>Application</mainClass>
+                    <layout>JAR</layout>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>repackage</id>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>

package/src/_template/SPRING/source-domain/ActOperationCommon.ejs

@@ -0,0 +1,17 @@
+package <%= packageName %>.base;
+
+import io.r2mo.io.common.HFS;
+import io.r2mo.spring.mybatisplus.program.ActOperationMybatisPlus;
+
+public abstract class ActOperationCommon<T> extends ActOperationMybatisPlus<T> {
+    private final HFS hfs;
+
+    public ActOperationCommon() {
+        super();
+        this.hfs = HFS.of();
+    }
+
+    protected HFS fs() {
+        return this.hfs;
+    }
+}

package/src/_template/SPRING/source-domain/GenConfigApp.ejs

@@ -0,0 +1,22 @@
+package <%= packageName %>;
+
+import <%= packageName %>.base.ActOperationCommon;
+import io.r2mo.base.generator.GenMeta;
+import io.r2mo.base.generator.SourceStructure;
+import io.r2mo.dbe.mybatisplus.generator.config.GenConfigMybatisPlus;
+import io.r2mo.typed.enums.DatabaseType;
+
+public class GenConfigApp<%= name %> extends GenConfigMybatisPlus {
+
+    @Override
+    public GenMeta getMetadata() {
+        return GenMeta.builder()
+            .schema("V1__init_schema.sql")
+            .spi("GenMybatisPlus")
+            .database(DatabaseType.MYSQL_8)
+            .structure(SourceStructure.DPA)
+            .version("v1")
+            .baseAct(ActOperationCommon.class)
+            .build();
+    }
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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><%= group %></groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId><%= id %>-domain</artifactId>
+    <name>App::<%= name %>::Domain</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.zerows</groupId>
+            <artifactId>r2mo-boot-spring-default</artifactId>
+            <version>${r2mo.version}</version>
+        </dependency>
+    </dependencies>
+</project>

package/src/_template/SPRING/source-provider/GenAppModule.ejs

@@ -0,0 +1,12 @@
+package <%= packageName %>;
+
+
+import io.r2mo.boot.spring.generator.SourceGenerator;
+
+public class GenApp<%= name %>Module {
+
+    public static void main(final String[] args) {
+        final SourceGenerator generator = new SourceGenerator(GenConfigApp<%= name %>.class);
+        generator.generate();
+    }
+}

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

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         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><%= group %></groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId><%= id %>-provider</artifactId>
+    <name>App::<%= name %>::Provider</name>
+    <dependencies>
+        <dependency>
+            <groupId><%= group %></groupId>
+            <artifactId><%= id %>-domain</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+</project>

package/src/_template/SPRING/source-test/pom.xml.ejs

@@ -0,0 +1,28 @@
+<?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><%= group %></groupId>
+        <artifactId><%= id %></artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId><%= id %>-test</artifactId>
+    <name>APP::<%= name %>::Test</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.zerows</groupId>
+            <artifactId>r2mo-spring-junit5</artifactId>
+            <version>${r2mo.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId><%= group %></groupId>
+            <artifactId><%= id %>-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

package/src/commander/app.json

@@ -9,8 +9,14 @@
             "description": "创建应用的名称！"
         },
         {
-            "name": "path",
-            "alias": "p",
+            "name": "config",
+            "alias": "c",
+            "description": "配置文件路径，默认读取 app.json 文件！",
+            "default": "app.json"
+        },
+        {
+            "name": "output",
+            "alias": "o",
             "description": "默认应用的输出路径，若不制定为当前路径！",
             "default": "."
         }

package/src/commander/spring.json

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

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

@@ -9,7 +9,12 @@ module.exports = (options) => {
     /*
      * 基本信息验证
      */
-    const name = parsed.name;
-    console.log(parsed);
-    Ec.info(`生成应用信息，应用名称：${name}`);
+    if (!Ut.nameValid(parsed.name)) {
+        Ec.error("应用名称只能包含字母、数字、点（.）和短横线（-），且不能以数字、点（.）或短横线（-）开头！");
+        process.exit(1);
+    }
+    const configuration = Ut.initAppConfiguration(parsed);
+    Ec.info(`准备生成 Zero App 应用：${configuration.artifactId}`);
+    configuration.srcType = Symbol("APP");
+    Ut.initApp(configuration).then(() => Ec.info(`应用生成完成！`));
 }

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

@@ -9,7 +9,7 @@ module.exports = (options) => {
     /*
      * 基本信息验证
      */
-    const configuration = Ut.initConfiguration(parsed);
+    const configuration = Ut.initModuleConfiguration(parsed);
     Ec.info(`准备生成 Zero Extension 扩展模块：${configuration.artifactId}`);
     Ut.initMod(configuration).then(() => Ec.info(`模块生成完成！`));
 }

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

@@ -0,0 +1,20 @@
+const Ec = require("../epic");
+const Ut = require("../commander-shared");
+
+module.exports = (options) => {
+    /*
+     * 参数解析
+     */
+    const parsed = Ut.parseArgument(options);
+    /*
+     * 基本信息验证
+     */
+    if (!Ut.nameValid(parsed.name)) {
+        Ec.error("应用名称只能包含字母、数字、点（.）和短横线（-），且不能以数字、点（.）或短横线（-）开头！");
+        process.exit(1);
+    }
+    const configuration = Ut.initSpringConfiguration(parsed);
+    Ec.info(`准备生成 Rapid Spring App 应用：${configuration.artifactId}`);
+    configuration.srcType = Symbol("SPRING");
+    Ut.initSpring(configuration).then(() => Ec.info(`应用生成完成！`));
+}

package/src/commander-ai/index.js

@@ -6,6 +6,7 @@ const executeApp = require('./fn.source.app');
 const executeMod = require('./fn.source.mod');
 const executeHelp = require('./fn.help.metadata');
 const executeWeb = require('./fn.source.front');
+const executeSpring = require('./fn.source.spring');
 const exported = {
     executeUuid,                // ai uuid
     executeString,              // ai str
@@ -15,6 +16,7 @@ const exported = {
     executeMod,                 // ai mod
     executeHelp,                // ai help
     executeWeb,                 // ai web
+    executeSpring,              // ai spring
 };
 module.exports = exported;
 /**