From fb50669a4c7d49e9f0394a95f8df06e0be700069 Mon Sep 17 00:00:00 2001 From: canonical Date: Sat, 18 Jan 2025 21:11:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/sql/mysql/_create_nop-auth.sql | 70 +- .../deploy/sql/mysql/_create_nop-batch.sql | 24 +- .../nop-spring-demo/reflect-config.json | 35 + .../src/main/resources/nop-vfs-index.txt | 10 + nop-dyn/deploy/sql/mysql/_create_nop-dyn.sql | 64 +- .../deploy/sql/mysql/_create_nop-file.sql | 4 +- nop-job/deploy/sql/mysql/_create_nop-job.sql | 18 +- .../nop/job/core/calendar/AnnualCalendar.java | 5 +- .../io/nop/job/core/trigger/TestTrigger.java | 4 +- .../deploy/sql/mysql/_create_nop-oauth.sql | 28 +- .../deploy/sql/mysql/_create_nop-report.sql | 16 +- .../nop/rpc/model/_gen/_ApiMethodModel.java | 28 + .../deploy/sql/mysql/_create_nop-rule.sql | 14 +- .../_vfs/nop/rule/model/nop-rule.api.xml | 3 +- .../deploy/sql/mysql/_add_tenant_nop-sys.sql | 5 + nop-sys/deploy/sql/mysql/_create_nop-sys.sql | 87 +- nop-sys/deploy/sql/mysql/_drop_nop-sys.sql | 1 + .../deploy/sql/oracle/_add_tenant_nop-sys.sql | 5 + nop-sys/deploy/sql/oracle/_create_nop-sys.sql | 51 + nop-sys/deploy/sql/oracle/_drop_nop-sys.sql | 1 + .../sql/postgresql/_add_tenant_nop-sys.sql | 5 + .../deploy/sql/postgresql/_create_nop-sys.sql | 51 + .../deploy/sql/postgresql/_drop_nop-sys.sql | 1 + nop-sys/model/nop-sys.orm.xlsx | Bin 49759 -> 52575 bytes .../sys/dao/entity/NopSysServiceInstance.java | 11 + .../entity/_gen/_NopSysServiceInstance.java | 874 ++++++++++++++++++ .../resources/_vfs/nop/sys/orm/_app.orm.xml | 38 + .../_templates/_NopSysServiceInstance.json | 17 + .../resources/_vfs/i18n/en/_nop-sys.i18n.yaml | 17 + .../_vfs/i18n/zh-CN/_nop-sys.i18n.yaml | 17 + .../NopSysServiceInstance.xmeta | 5 + .../_NopSysServiceInstance.xmeta | 82 ++ .../entity/NopSysServiceInstanceBizModel.java | 14 + .../_vfs/nop/sys/beans/_service.beans.xml | 2 + .../NopSysServiceInstance.xbiz | 5 + .../_NopSysServiceInstance.xbiz | 14 + .../nop/sys/auth/_nop-sys.action-auth.xml | 26 +- .../NopSysServiceInstance.lib.xjs | 10 + .../NopSysServiceInstance.view.xml | 20 + .../_gen/_NopSysServiceInstance.view.xml | 152 +++ .../NopSysServiceInstance/main.page.yaml | 3 + .../NopSysServiceInstance/picker.page.yaml | 3 + .../deploy/sql/mysql/_create_nop-task.sql | 30 +- nop-tcc/deploy/sql/mysql/_create_nop-tcc.sql | 22 +- nop-wf/deploy/sql/mysql/_create_nop-wf.sql | 70 +- .../_vfs/nop/wf/model/nop-wf.api.xml | 13 +- .../main/resources/_vfs/nop/schema/api.xdef | 2 +- 47 files changed, 1746 insertions(+), 231 deletions(-) create mode 100644 nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/NopSysServiceInstance.java create mode 100644 nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/_gen/_NopSysServiceInstance.java create mode 100644 nop-sys/nop-sys-meta/_templates/_NopSysServiceInstance.json create mode 100644 nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xmeta create mode 100644 nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xmeta create mode 100644 nop-sys/nop-sys-service/src/main/java/io/nop/sys/service/entity/NopSysServiceInstanceBizModel.java create mode 100644 nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xbiz create mode 100644 nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xbiz create mode 100644 nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.lib.xjs create mode 100644 nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.view.xml create mode 100644 nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/_gen/_NopSysServiceInstance.view.xml create mode 100644 nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/main.page.yaml create mode 100644 nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/picker.page.yaml diff --git a/nop-auth/deploy/sql/mysql/_create_nop-auth.sql b/nop-auth/deploy/sql/mysql/_create_nop-auth.sql index 681fa3189..c4dd96ad2 100644 --- a/nop-auth/deploy/sql/mysql/_create_nop-auth.sql +++ b/nop-auth/deploy/sql/mysql/_create_nop-auth.sql @@ -11,9 +11,9 @@ CREATE TABLE nop_auth_dept( DEL_FLAG TINYINT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_dept primary key (DEPT_ID) ); @@ -24,9 +24,9 @@ CREATE TABLE nop_auth_position( DEL_FLAG TINYINT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_position primary key (POSITION_ID) ); @@ -39,9 +39,9 @@ CREATE TABLE nop_auth_role( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint UK_NOP_AUTH_ROLE_NAME unique (ROLE_NAME), constraint PK_nop_auth_role primary key (ROLE_ID) @@ -57,9 +57,9 @@ CREATE TABLE nop_auth_site( CONFIG_VERSION VARCHAR(20) NULL COMMENT '配置版本', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_site primary key (SITE_ID) ); @@ -75,9 +75,9 @@ CREATE TABLE nop_auth_role_data_auth( DEL_FLAG TINYINT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_role_data_auth primary key (SID) ); @@ -91,9 +91,9 @@ CREATE TABLE nop_auth_tenant( DEL_FLAG TINYINT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_tenant primary key (TENANT_ID) ); @@ -131,9 +131,9 @@ CREATE TABLE nop_auth_user( VERSION INTEGER NOT NULL COMMENT '数据版本', TENANT_ID VARCHAR(32) NOT NULL COMMENT '租户ID', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint UK_NOP_AUTH_USER_NAME unique (USER_NAME), constraint PK_nop_auth_user primary key (USER_ID) @@ -164,9 +164,9 @@ CREATE TABLE nop_auth_resource( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_resource primary key (RESOURCE_ID) ); @@ -178,14 +178,14 @@ CREATE TABLE nop_auth_ext_login( EXT_ID VARCHAR(50) NOT NULL COMMENT '登录标识', CREDENTIAL VARCHAR(50) NULL COMMENT '登录密码', VERIFIED BOOLEAN NOT NULL COMMENT '是否已验证', - LAST_LOGIN_TIME TIMESTAMP(3) NULL COMMENT '上次登录时间', + LAST_LOGIN_TIME DATETIME(3) NULL COMMENT '上次登录时间', LAST_LOGIN_IP VARCHAR(20) NULL COMMENT '上次登录IP', DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_ext_login primary key (SID) ); @@ -195,9 +195,9 @@ CREATE TABLE nop_auth_user_role( ROLE_ID VARCHAR(50) NOT NULL COMMENT '角色ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_user_role primary key (USER_ID,ROLE_ID) ); @@ -211,9 +211,9 @@ CREATE TABLE nop_auth_user_substitution( END_TIME DATETIME NULL COMMENT '结束时间', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_user_substitution primary key (SID) ); @@ -227,9 +227,9 @@ CREATE TABLE nop_auth_session( LOGIN_DEVICE VARCHAR(100) NULL COMMENT '登录设备', LOGIN_APP VARCHAR(100) NULL COMMENT '应用程序', LOGIN_OS VARCHAR(100) NULL COMMENT '操作系统', - LOGIN_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '登录时间', + LOGIN_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '登录时间', LOGIN_TYPE INTEGER NOT NULL COMMENT '登录方式', - LOGOUT_TIME TIMESTAMP(3) NULL COMMENT '退出时间', + LOGOUT_TIME DATETIME(3) NULL COMMENT '退出时间', LOGOUT_TYPE INTEGER NOT NULL COMMENT '退出方式', LOGOUT_BY VARCHAR(100) NULL COMMENT '退出操作人', LAST_ACCESS_TIME DATETIME NULL COMMENT '最后访问时间', @@ -237,7 +237,7 @@ CREATE TABLE nop_auth_session( REFRESH_TOKEN VARCHAR(500) NULL COMMENT '刷新令牌', CACHE_DATA VARCHAR(4000) NULL COMMENT '缓存数据', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_session primary key (SESSION_ID) ); @@ -250,9 +250,9 @@ CREATE TABLE nop_auth_group( DEL_FLAG TINYINT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_group primary key (GROUP_ID) ); @@ -264,9 +264,9 @@ CREATE TABLE nop_auth_role_resource( DEL_FLAG TINYINT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_role_resource primary key (SID) ); @@ -278,7 +278,7 @@ CREATE TABLE nop_auth_op_log( SESSION_ID VARCHAR(100) NULL COMMENT '会话ID', OPERATION VARCHAR(800) NULL COMMENT '业务操作', DESCRIPTION VARCHAR(2000) NULL COMMENT '操作描述', - ACTION_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '操作时间', + ACTION_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '操作时间', USED_TIME BIGINT NOT NULL COMMENT '操作时长', RESULT_STATUS INTEGER NOT NULL COMMENT '操作状态', ERROR_CODE VARCHAR(200) NULL COMMENT '错误码', @@ -294,9 +294,9 @@ CREATE TABLE nop_auth_group_dept( INCLUDE_CHILD TINYINT default 0 NOT NULL COMMENT '是否包含下级', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_group_dept primary key (DEPT_ID,GROUP_ID) ); @@ -306,9 +306,9 @@ CREATE TABLE nop_auth_group_user( GROUP_ID VARCHAR(50) NOT NULL COMMENT '分组ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_auth_group_user primary key (USER_ID,GROUP_ID) ); diff --git a/nop-batch/deploy/sql/mysql/_create_nop-batch.sql b/nop-batch/deploy/sql/mysql/_create_nop-batch.sql index 56eb61caa..1ff508336 100644 --- a/nop-batch/deploy/sql/mysql/_create_nop-batch.sql +++ b/nop-batch/deploy/sql/mysql/_create_nop-batch.sql @@ -11,9 +11,9 @@ CREATE TABLE nop_batch_file( ACCEPT_DATE DATE NOT NULL COMMENT '文件接收时间', VERSION BIGINT NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_batch_file primary key (SID) ); @@ -23,15 +23,15 @@ CREATE TABLE nop_batch_task( TASK_NAME VARCHAR(50) NOT NULL COMMENT '任务名', TASK_KEY VARCHAR(100) NOT NULL COMMENT '唯一Key', TASK_STATUS INTEGER NOT NULL COMMENT '任务状态', - START_TIME TIMESTAMP(3) NULL COMMENT '任务启动时间', - END_TIME TIMESTAMP(3) NULL COMMENT '任务结束时间', + START_TIME DATETIME(3) NULL COMMENT '任务启动时间', + END_TIME DATETIME(3) NULL COMMENT '任务结束时间', TASK_PARAMS VARCHAR(4000) NULL COMMENT '任务参数', EXEC_COUNT INTEGER NOT NULL COMMENT '执行次数', WORKER_ID VARCHAR(100) NOT NULL COMMENT '执行者', INPUT_FILE_ID VARCHAR(32) NULL COMMENT '输入文件', FLOW_STEP_ID VARCHAR(50) NULL COMMENT '关联流程步骤ID', FLOW_ID VARCHAR(50) NULL COMMENT '关联流程ID', - RESTART_TIME TIMESTAMP(3) NULL COMMENT '重启时间', + RESTART_TIME DATETIME(3) NULL COMMENT '重启时间', RESULT_STATUS INTEGER NULL COMMENT '返回状态码', RESULT_CODE VARCHAR(100) NULL COMMENT '返回码', RESULT_MSG VARCHAR(500) NULL COMMENT '返回消息', @@ -46,9 +46,9 @@ CREATE TABLE nop_batch_task( WRITE_ITEM_COUNT BIGINT NOT NULL COMMENT '写入条目数量', VERSION BIGINT NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_batch_task primary key (SID) ); @@ -61,12 +61,12 @@ CREATE TABLE nop_batch_task_var( DECIMAL_VALUE DECIMAL(30,6) NULL COMMENT '浮点值', LONG_VALUE BIGINT NULL COMMENT '整数型', DATE_VALUE DATE NULL COMMENT '日期值', - TIMESTAMP_VALUE TIMESTAMP(3) NULL COMMENT '时间点值', + TIMESTAMP_VALUE DATETIME(3) NULL COMMENT '时间点值', VERSION BIGINT NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_batch_task_var primary key (BATCH_TASK_ID,FIELD_NAME) ); @@ -79,9 +79,9 @@ CREATE TABLE nop_batch_record_result( ERROR_STACK VARCHAR(4000) NULL COMMENT '错误堆栈', VERSION BIGINT NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_batch_record_result primary key (BATCH_TASK_ID,RECORD_KEY) ); diff --git a/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json b/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json index 500875205..475171b4e 100644 --- a/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json +++ b/nop-demo/nop-spring-demo/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json @@ -43761,6 +43761,16 @@ "methods": [], "name": "io.nop.sys.dao.entity.NopSysSequence" }, + { + "allDeclaredConstructors": true, + "allDeclaredMethods": true, + "allPublicConstructors": true, + "allPublicFields": true, + "allPublicMethods": true, + "fields": [], + "methods": [], + "name": "io.nop.sys.dao.entity.NopSysServiceInstance" + }, { "allDeclaredConstructors": true, "allDeclaredMethods": true, @@ -47036,6 +47046,21 @@ ], "name": "io.nop.sys.dao.entity._gen._NopSysSequence" }, + { + "allDeclaredConstructors": true, + "allDeclaredMethods": true, + "allPublicConstructors": true, + "allPublicFields": true, + "allPublicMethods": true, + "fields": [], + "methods": [ + { + "name": "newInstance", + "parameterTypes": [] + } + ], + "name": "io.nop.sys.dao.entity._gen._NopSysServiceInstance" + }, { "allDeclaredConstructors": true, "allDeclaredMethods": true, @@ -47812,6 +47837,16 @@ "methods": [], "name": "io.nop.sys.service.entity.NopSysSequenceBizModel" }, + { + "allDeclaredConstructors": true, + "allDeclaredMethods": true, + "allPublicConstructors": true, + "allPublicFields": true, + "allPublicMethods": true, + "fields": [], + "methods": [], + "name": "io.nop.sys.service.entity.NopSysServiceInstanceBizModel" + }, { "allDeclaredConstructors": true, "allDeclaredMethods": true, diff --git a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt index a65412e82..c2073a76a 100644 --- a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt +++ b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt @@ -271,6 +271,7 @@ /nop/core/xlib/biz!when.xlib /nop/core/xlib/biz-gen.xlib /nop/core/xlib/biz.xlib +/nop/core/xlib/dsl-gen.xlib /nop/core/xlib/file.xlib /nop/core/xlib/filter.xlib /nop/core/xlib/meta-gen.xlib @@ -507,6 +508,10 @@ /nop/sys/model/NopSysSequence/NopSysSequence.xmeta /nop/sys/model/NopSysSequence/_NopSysSequence.xbiz /nop/sys/model/NopSysSequence/_NopSysSequence.xmeta +/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xbiz +/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xmeta +/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xbiz +/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xmeta /nop/sys/model/NopSysUserVariable/NopSysUserVariable.xbiz /nop/sys/model/NopSysUserVariable/NopSysUserVariable.xmeta /nop/sys/model/NopSysUserVariable/_NopSysUserVariable.xbiz @@ -582,6 +587,11 @@ /nop/sys/pages/NopSysSequence/_gen/_NopSysSequence.view.xml /nop/sys/pages/NopSysSequence/main.page.yaml /nop/sys/pages/NopSysSequence/picker.page.yaml +/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.lib.xjs +/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.view.xml +/nop/sys/pages/NopSysServiceInstance/_gen/_NopSysServiceInstance.view.xml +/nop/sys/pages/NopSysServiceInstance/main.page.yaml +/nop/sys/pages/NopSysServiceInstance/picker.page.yaml /nop/sys/pages/NopSysUserVariable/NopSysUserVariable.lib.js /nop/sys/pages/NopSysUserVariable/NopSysUserVariable.lib.xjs /nop/sys/pages/NopSysUserVariable/NopSysUserVariable.view.xml diff --git a/nop-dyn/deploy/sql/mysql/_create_nop-dyn.sql b/nop-dyn/deploy/sql/mysql/_create_nop-dyn.sql index 5a5dee249..5ddfd5006 100644 --- a/nop-dyn/deploy/sql/mysql/_create_nop-dyn.sql +++ b/nop-dyn/deploy/sql/mysql/_create_nop-dyn.sql @@ -8,9 +8,9 @@ CREATE TABLE nop_dyn_app( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_dyn_app primary key (APP_ID) ); @@ -26,9 +26,9 @@ CREATE TABLE nop_dyn_module( STATUS INTEGER default 0 NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_dyn_module primary key (MODULE_ID) ); @@ -50,20 +50,20 @@ CREATE TABLE nop_dyn_entity( NOP_INT_FLD1 INTEGER NULL COMMENT '整数型字段1', NOP_LONG_FLD1 BIGINT NULL COMMENT '长整型字段1', NOP_DATE_FLD1 DATE NULL COMMENT '日期字段1', - NOP_TIMESTAMP_FLD1 TIMESTAMP(3) NULL COMMENT '时间戳字段1', + NOP_TIMESTAMP_FLD1 DATETIME(3) NULL COMMENT '时间戳字段1', NOP_FILE_FLD1 VARCHAR(200) NULL COMMENT '文件字段1', NOP_STRING_FLD2 VARCHAR(4000) NULL COMMENT '字符串字段2', NOP_DECIMAL_FLD2 DECIMAL(30,6) NULL COMMENT '浮点型字段2', NOP_INT_FLD2 INTEGER NULL COMMENT '整数型字段2', NOP_LONG_FLD2 BIGINT NULL COMMENT '长整型字段2', NOP_DATE_FLD2 DATE NULL COMMENT '日期字段2', - NOP_TIMESTAMP_FLD2 TIMESTAMP(3) NULL COMMENT '时间戳字段2', + NOP_TIMESTAMP_FLD2 DATETIME(3) NULL COMMENT '时间戳字段2', NOP_FILE_FLD2 VARCHAR(200) NULL COMMENT '文件字段2', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_entity primary key (SID) ); @@ -77,9 +77,9 @@ CREATE TABLE nop_dyn_entity_relation( ENTITY_ID2 VARCHAR(50) NOT NULL COMMENT '实体ID2', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_entity_relation primary key (SID) ); @@ -95,9 +95,9 @@ CREATE TABLE nop_dyn_patch_file( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_patch_file primary key (FILE_ID) ); @@ -107,9 +107,9 @@ CREATE TABLE nop_dyn_module_dep( DEP_MODULE_ID VARCHAR(32) NOT NULL COMMENT '被依赖模块ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_dyn_module_dep primary key (MODULE_ID,DEP_MODULE_ID) ); @@ -118,9 +118,9 @@ CREATE TABLE nop_dyn_app_module( MODULE_ID VARCHAR(32) NOT NULL COMMENT '模块ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_dyn_app_module primary key (APP_ID,MODULE_ID) ); @@ -148,9 +148,9 @@ CREATE TABLE nop_dyn_sql( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_sql primary key (SQL_ID) ); @@ -165,9 +165,9 @@ CREATE TABLE nop_dyn_file( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_file primary key (FILE_ID) ); @@ -182,9 +182,9 @@ CREATE TABLE nop_dyn_page( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_page primary key (PAGE_ID) ); @@ -203,9 +203,9 @@ CREATE TABLE nop_dyn_entity_meta( EXT_CONFIG VARCHAR(1000) NULL COMMENT '扩展配置', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_entity_meta primary key (ENTITY_META_ID) ); @@ -221,9 +221,9 @@ CREATE TABLE nop_dyn_domain( SCALE INTEGER default 0 NULL COMMENT '小数位数', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_domain primary key (DOMAIN_ID) ); @@ -246,9 +246,9 @@ CREATE TABLE nop_dyn_entity_relation_meta( EXT_CONFIG VARCHAR(1000) NULL COMMENT '扩展配置', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_entity_relation_meta primary key (REL_META_ID) ); @@ -268,9 +268,9 @@ CREATE TABLE nop_dyn_function_meta( SOURCE VARCHAR(4000) NOT NULL COMMENT '源码', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_function_meta primary key (FUNC_META_ID) ); @@ -297,9 +297,9 @@ CREATE TABLE nop_dyn_prop_meta( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_dyn_prop_meta primary key (PROP_META_ID) ); diff --git a/nop-file/deploy/sql/mysql/_create_nop-file.sql b/nop-file/deploy/sql/mysql/_create_nop-file.sql index 23fd2a94d..d34402092 100644 --- a/nop-file/deploy/sql/mysql/_create_nop-file.sql +++ b/nop-file/deploy/sql/mysql/_create_nop-file.sql @@ -6,7 +6,7 @@ CREATE TABLE nop_file_record( FILE_EXT VARCHAR(50) NULL COMMENT '扩展名', MIME_TYPE VARCHAR(100) NOT NULL COMMENT '内容类型', FILE_LENGTH BIGINT NULL COMMENT '文件长度', - FILE_LAST_MODIFIED TIMESTAMP(3) NULL COMMENT '文件修改时间', + FILE_LAST_MODIFIED DATETIME(3) NULL COMMENT '文件修改时间', BIZ_OBJ_NAME VARCHAR(200) NULL COMMENT '对象名', BIZ_OBJ_ID VARCHAR(200) NULL COMMENT '对象ID', FIELD_NAME VARCHAR(100) NULL COMMENT '字段名', @@ -15,7 +15,7 @@ CREATE TABLE nop_file_record( IS_PUBLIC BOOLEAN NOT NULL COMMENT '是否允许公开访问', DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_file_record primary key (FILE_ID) ); diff --git a/nop-job/deploy/sql/mysql/_create_nop-job.sql b/nop-job/deploy/sql/mysql/_create_nop-job.sql index 0837336c0..e9712a6c2 100644 --- a/nop-job/deploy/sql/mysql/_create_nop-job.sql +++ b/nop-job/deploy/sql/mysql/_create_nop-job.sql @@ -12,8 +12,8 @@ CREATE TABLE nop_job_definition( REPEAT_INTERVAL INTEGER NULL COMMENT '定时执行间隔', IS_FIXED_DELAY TINYINT default 0 NULL COMMENT '是否固定延时', MAX_EXECUTION_COUNT INTEGER NULL COMMENT '最多执行次数', - MIN_SCHEDULE_TIME TIMESTAMP(3) NULL COMMENT '最近调度时间', - MAX_SCHEDULE_TIME TIMESTAMP(3) NULL COMMENT '最大调度时间', + MIN_SCHEDULE_TIME DATETIME(3) NULL COMMENT '最近调度时间', + MAX_SCHEDULE_TIME DATETIME(3) NULL COMMENT '最大调度时间', MISFIRE_THRESHOLD INTEGER NULL COMMENT '超时阈值', MAX_FAILED_COUNT INTEGER NULL COMMENT '最大允许失败次数', IS_USE_DEFAULT_CALENDAR TINYINT default 0 NULL COMMENT '使用系统内置日历', @@ -21,12 +21,12 @@ CREATE TABLE nop_job_definition( SCHEDULER_GROUP VARCHAR(50) NOT NULL COMMENT '调度器分组', SCHEDULER_ID VARCHAR(32) NOT NULL COMMENT '调度器ID', SCHEDULER_EPOCH BIGINT NOT NULL COMMENT '调度器世代', - SCHEDULER_LOAD_TIME TIMESTAMP(3) NULL COMMENT '调度器加载时间', + SCHEDULER_LOAD_TIME DATETIME(3) NULL COMMENT '调度器加载时间', VERSION BIGINT NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_job_definition primary key (SID) ); @@ -39,16 +39,16 @@ CREATE TABLE nop_job_instance( JOB_PARAMS VARCHAR(4000) NULL COMMENT '任务参数', JOB_INVOKER VARCHAR(200) NOT NULL COMMENT '任务执行函数', STATUS INTEGER NOT NULL COMMENT '任务状态', - SCHEDULED_EXEC_TIME TIMESTAMP(3) NULL COMMENT '调度执行时间', - EXEC_TIME TIMESTAMP(3) NULL COMMENT '实际执行时间', + SCHEDULED_EXEC_TIME DATETIME(3) NULL COMMENT '调度执行时间', + EXEC_TIME DATETIME(3) NULL COMMENT '实际执行时间', ONCE_TASK TINYINT default 0 NULL COMMENT '是否只执行一次', ERR_CODE VARCHAR(200) NULL COMMENT '错误码', ERR_MSG VARCHAR(500) NULL COMMENT '错误消息', VERSION BIGINT NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_job_instance primary key (JOB_ID) ); diff --git a/nop-job/nop-job-core/src/main/java/io/nop/job/core/calendar/AnnualCalendar.java b/nop-job/nop-job-core/src/main/java/io/nop/job/core/calendar/AnnualCalendar.java index db80f6eb7..306c87f7e 100644 --- a/nop-job/nop-job-core/src/main/java/io/nop/job/core/calendar/AnnualCalendar.java +++ b/nop-job/nop-job-core/src/main/java/io/nop/job/core/calendar/AnnualCalendar.java @@ -13,6 +13,7 @@ import java.io.Serializable; import java.time.LocalDate; import java.time.MonthDay; +import java.util.ArrayList; import java.util.List; public class AnnualCalendar extends BaseCalendar implements ICalendar, Serializable { @@ -29,8 +30,8 @@ public AnnualCalendar(ICalendar baseCalendar) { } public void setExcludeDays(List excludeDays) { - this.excludeDays = excludeDays; - excludeDays.sort(MonthDay::compareTo); + this.excludeDays = new ArrayList<>(excludeDays); + this.excludeDays.sort(MonthDay::compareTo); } private boolean isExcludedDay(LocalDate day) { diff --git a/nop-job/nop-job-core/src/test/java/io/nop/job/core/trigger/TestTrigger.java b/nop-job/nop-job-core/src/test/java/io/nop/job/core/trigger/TestTrigger.java index a1506422a..9c9511920 100644 --- a/nop-job/nop-job-core/src/test/java/io/nop/job/core/trigger/TestTrigger.java +++ b/nop-job/nop-job-core/src/test/java/io/nop/job/core/trigger/TestTrigger.java @@ -61,7 +61,7 @@ public void testCron() { spec.setMaxScheduleTime(DateHelper.dateMillis(2022, 2, 15)); AnnualCalendarSpec cal = new AnnualCalendarSpec(); - cal.setExcludes(new MonthDay[]{MonthDay.of(2, 11), MonthDay.of(2, 13)}); + cal.setExcludes(List.of(MonthDay.of(2, 11), MonthDay.of(2, 13))); spec.setPauseCalendars(Arrays.asList(cal)); ITrigger trigger = TriggerBuilder.buildTrigger(spec, null); @@ -100,7 +100,7 @@ public void testMisfire() { spec.setMaxScheduleTime(DateHelper.dateMillis(2022, 2, 15)); AnnualCalendarSpec cal = new AnnualCalendarSpec(); - cal.setExcludes(new MonthDay[]{MonthDay.of(2, 11), MonthDay.of(2, 13)}); + cal.setExcludes(List.of(MonthDay.of(2, 11), MonthDay.of(2, 13))); spec.setPauseCalendars(Arrays.asList(cal)); spec.setMisfireThreshold(1000 * 10); diff --git a/nop-oauth/deploy/sql/mysql/_create_nop-oauth.sql b/nop-oauth/deploy/sql/mysql/_create_nop-oauth.sql index bd5487e02..de7546672 100644 --- a/nop-oauth/deploy/sql/mysql/_create_nop-oauth.sql +++ b/nop-oauth/deploy/sql/mysql/_create_nop-oauth.sql @@ -8,30 +8,30 @@ CREATE TABLE nop_oauth_authorization( ATTRIBUTES TEXT NULL COMMENT '扩展属性', STATE VARCHAR(500) NULL COMMENT '状态码', AUTHORIZATION_CODE_VALUE TEXT NULL COMMENT 'AuthorizationCode值', - AUTHORIZATION_CODE_ISSUED_AT TIMESTAMP(3) NULL COMMENT 'AuthorizationCode发放时间', - AUTHORIZATION_CODE_EXPIRES_AT TIMESTAMP(3) NULL COMMENT 'AuthorizationCode过期使劲按', + AUTHORIZATION_CODE_ISSUED_AT DATETIME(3) NULL COMMENT 'AuthorizationCode发放时间', + AUTHORIZATION_CODE_EXPIRES_AT DATETIME(3) NULL COMMENT 'AuthorizationCode过期使劲按', AUTHORIZATION_CODE_METADATA TEXT NULL COMMENT 'AuthorizationCode元数据', ACCESS_TOKEN_VALUE TEXT NULL COMMENT 'AccessToken', - ACCESS_TOKEN_ISSUED_AT TIMESTAMP(3) NULL COMMENT 'AccessToken发放时间', - ACCESS_TOKEN_EXPIRES_AT TIMESTAMP(3) NULL COMMENT 'AccessToken过期时间', + ACCESS_TOKEN_ISSUED_AT DATETIME(3) NULL COMMENT 'AccessToken发放时间', + ACCESS_TOKEN_EXPIRES_AT DATETIME(3) NULL COMMENT 'AccessToken过期时间', ACCESS_TOKEN_METADATA TEXT NULL COMMENT 'AccessToken元数据', ACCESS_TOKEN_TYPE VARCHAR(100) NULL COMMENT 'AccessToken类型', ACCESS_TOKEN_SCOPES VARCHAR(1000) NULL COMMENT 'AccessToken权限范围', OIDC_ID_TOKEN_VALUE TEXT NULL COMMENT 'OidcIdToken值', - OIDC_ID_TOKEN_ISSUED_AT TIMESTAMP(3) NULL COMMENT 'OidcIdToken发放时间', - OIDC_ID_TOKEN_EXPIRES_AT TIMESTAMP(3) NULL COMMENT 'OidcIdToken过期时间', + OIDC_ID_TOKEN_ISSUED_AT DATETIME(3) NULL COMMENT 'OidcIdToken发放时间', + OIDC_ID_TOKEN_EXPIRES_AT DATETIME(3) NULL COMMENT 'OidcIdToken过期时间', OIDC_ID_TOKEN_METADATA TEXT NULL COMMENT 'OidcIdToken元数据', REFRESH_TOKEN_VALUE TEXT NULL COMMENT 'RefreshToken值', - REFRESH_TOKEN_ISSUED_AT TIMESTAMP(3) NULL COMMENT 'RefreshToken发放时间', - REFRESH_TOKEN_EXPIRES_AT TIMESTAMP(3) NULL COMMENT 'RefreshToken过期时间', + REFRESH_TOKEN_ISSUED_AT DATETIME(3) NULL COMMENT 'RefreshToken发放时间', + REFRESH_TOKEN_EXPIRES_AT DATETIME(3) NULL COMMENT 'RefreshToken过期时间', REFRESH_TOKEN_METADATA TEXT NULL COMMENT 'RefreshToken元数据', USER_CODE_VALUE TEXT NULL COMMENT 'UserCode值', - USER_CODE_ISSUED_AT TIMESTAMP(3) NULL COMMENT 'UserCode发放时间', - USER_CODE_EXPIRES_AT TIMESTAMP(3) NULL COMMENT 'UserCode过期时间', + USER_CODE_ISSUED_AT DATETIME(3) NULL COMMENT 'UserCode发放时间', + USER_CODE_EXPIRES_AT DATETIME(3) NULL COMMENT 'UserCode过期时间', USER_CODE_METADATA TEXT NULL COMMENT 'UserCode元数据', DEVICE_CODE_VALUE TEXT NULL COMMENT 'DeviceCode值', - DEVICE_CODE_ISSUED_AT TIMESTAMP(3) NULL COMMENT 'DeviceCode发放时间', - DEVICE_CODE_EXPIRES_AT TIMESTAMP(3) NULL COMMENT 'DeviceCode过期时间', + DEVICE_CODE_ISSUED_AT DATETIME(3) NULL COMMENT 'DeviceCode发放时间', + DEVICE_CODE_EXPIRES_AT DATETIME(3) NULL COMMENT 'DeviceCode过期时间', DEVICE_CODE_METADATA TEXT NULL COMMENT 'DeviceCode元数据', constraint PK_nop_oauth_authorization primary key (SID) ); @@ -46,9 +46,9 @@ CREATE TABLE nop_oauth_authorization_consent( CREATE TABLE nop_oauth_registered_client( SID VARCHAR(100) NOT NULL COMMENT 'Id', CLIENT_ID VARCHAR(100) NOT NULL COMMENT '客户端ID', - CLIENT_ID_ISSUED_AT TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '客户端ID发放时间', + CLIENT_ID_ISSUED_AT DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '客户端ID发放时间', CLIENT_SECRET VARCHAR(200) NULL COMMENT '客户端密码', - CLIENT_SECRET_EXPIRES_AT TIMESTAMP(3) NULL COMMENT '客户端密码过期时间', + CLIENT_SECRET_EXPIRES_AT DATETIME(3) NULL COMMENT '客户端密码过期时间', CLIENT_NAME VARCHAR(200) NOT NULL COMMENT '客户端名称', CLIENT_AUTHENTICATION_METHODS VARCHAR(1000) NOT NULL COMMENT '客户端授权方法', AUTHORIZATION_GRANT_TYPES VARCHAR(1000) NOT NULL COMMENT '客户端认证类型', diff --git a/nop-report/deploy/sql/mysql/_create_nop-report.sql b/nop-report/deploy/sql/mysql/_create_nop-report.sql index a58c8888f..317670643 100644 --- a/nop-report/deploy/sql/mysql/_create_nop-report.sql +++ b/nop-report/deploy/sql/mysql/_create_nop-report.sql @@ -7,9 +7,9 @@ CREATE TABLE nop_report_definition( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_report_definition primary key (RPT_ID) ); @@ -26,9 +26,9 @@ CREATE TABLE nop_report_dataset( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_report_dataset primary key (DS_ID) ); @@ -39,9 +39,9 @@ CREATE TABLE nop_report_dataset_auth( PERMISSIONS VARCHAR(100) NOT NULL COMMENT '许可权限', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_report_dataset_auth primary key (DS_ID) ); @@ -59,9 +59,9 @@ CREATE TABLE nop_report_result_file( DESCRIPTION VARCHAR(1000) NULL COMMENT '描述', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_report_result_file primary key (SID) ); diff --git a/nop-rpc/nop-rpc-model/src/main/java/io/nop/rpc/model/_gen/_ApiMethodModel.java b/nop-rpc/nop-rpc-model/src/main/java/io/nop/rpc/model/_gen/_ApiMethodModel.java index 599ac69ce..35668c70e 100644 --- a/nop-rpc/nop-rpc-model/src/main/java/io/nop/rpc/model/_gen/_ApiMethodModel.java +++ b/nop-rpc/nop-rpc-model/src/main/java/io/nop/rpc/model/_gen/_ApiMethodModel.java @@ -30,6 +30,13 @@ public abstract class _ApiMethodModel extends io.nop.core.resource.component.Abs */ private java.lang.String _displayName ; + /** + * + * xml name: mutation + * + */ + private boolean _mutation = false; + /** * * xml name: name @@ -117,6 +124,25 @@ public void setDisplayName(java.lang.String value){ } + /** + * + * xml name: mutation + * + */ + + public boolean isMutation(){ + return _mutation; + } + + + public void setMutation(boolean value){ + checkAllowChange(); + + this._mutation = value; + + } + + /** * * xml name: name @@ -295,6 +321,7 @@ protected void outputJson(IJsonHandler out){ out.putNotNull("description",this.getDescription()); out.putNotNull("displayName",this.getDisplayName()); + out.putNotNull("mutation",this.isMutation()); out.putNotNull("name",this.getName()); out.putNotNull("options",this.getOptions()); out.putNotNull("requestMessage",this.getRequestMessage()); @@ -315,6 +342,7 @@ protected void copyTo(ApiMethodModel instance){ instance.setDescription(this.getDescription()); instance.setDisplayName(this.getDisplayName()); + instance.setMutation(this.isMutation()); instance.setName(this.getName()); instance.setOptions(this.getOptions()); instance.setRequestMessage(this.getRequestMessage()); diff --git a/nop-rule/deploy/sql/mysql/_create_nop-rule.sql b/nop-rule/deploy/sql/mysql/_create_nop-rule.sql index fe7b74862..082691ad8 100644 --- a/nop-rule/deploy/sql/mysql/_create_nop-rule.sql +++ b/nop-rule/deploy/sql/mysql/_create_nop-rule.sql @@ -11,9 +11,9 @@ CREATE TABLE nop_rule_definition( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_rule_definition primary key (RULE_ID) ); @@ -29,9 +29,9 @@ CREATE TABLE nop_rule_node( IS_LEAF BOOLEAN NOT NULL COMMENT '是否叶子节点', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_rule_node primary key (SID) ); @@ -43,9 +43,9 @@ CREATE TABLE nop_rule_role( IS_ADMIN TINYINT default 0 NOT NULL COMMENT '是否管理者', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_rule_role primary key (SID) ); @@ -56,7 +56,7 @@ CREATE TABLE nop_rule_log( LOG_LEVEL INTEGER NOT NULL COMMENT '日志级别', LOG_MSG VARCHAR(4000) NULL COMMENT '日志消息', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', constraint PK_nop_rule_log primary key (SID) ); diff --git a/nop-rule/nop-rule-api/src/main/resources/_vfs/nop/rule/model/nop-rule.api.xml b/nop-rule/nop-rule-api/src/main/resources/_vfs/nop/rule/model/nop-rule.api.xml index 01788f921..fbdddf4a4 100644 --- a/nop-rule/nop-rule-api/src/main/resources/_vfs/nop/rule/model/nop-rule.api.xml +++ b/nop-rule/nop-rule-api/src/main/resources/_vfs/nop/rule/model/nop-rule.api.xml @@ -9,7 +9,8 @@ - + io.nop.rule.api.beans.RuleRequestBean io.nop.rule.api.beans.RuleResultBean diff --git a/nop-sys/deploy/sql/mysql/_add_tenant_nop-sys.sql b/nop-sys/deploy/sql/mysql/_add_tenant_nop-sys.sql index 04f167ccf..73fe8c027 100644 --- a/nop-sys/deploy/sql/mysql/_add_tenant_nop-sys.sql +++ b/nop-sys/deploy/sql/mysql/_add_tenant_nop-sys.sql @@ -21,6 +21,8 @@ alter table nop_sys_notice_template add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NO alter table nop_sys_sequence add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; +alter table nop_sys_service_instance add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; + alter table nop_sys_user_variable add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; alter table nop_sys_variable add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; @@ -58,6 +60,9 @@ alter table nop_sys_notice_template add primary key (NOP_TENANT_ID, SID); alter table nop_sys_sequence drop primary key; alter table nop_sys_sequence add primary key (NOP_TENANT_ID, SEQ_NAME); +alter table nop_sys_service_instance drop primary key; +alter table nop_sys_service_instance add primary key (NOP_TENANT_ID, INSTANCE_ID); + alter table nop_sys_user_variable drop primary key; alter table nop_sys_user_variable add primary key (NOP_TENANT_ID, USER_ID,VAR_NAME); diff --git a/nop-sys/deploy/sql/mysql/_create_nop-sys.sql b/nop-sys/deploy/sql/mysql/_create_nop-sys.sql index 603b5e1f1..96aba841a 100644 --- a/nop-sys/deploy/sql/mysql/_create_nop-sys.sql +++ b/nop-sys/deploy/sql/mysql/_create_nop-sys.sql @@ -11,9 +11,9 @@ CREATE TABLE nop_sys_sequence( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_sequence primary key (SEQ_NAME) ); @@ -25,9 +25,9 @@ CREATE TABLE nop_sys_dict( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_dict primary key (SID) ); @@ -38,9 +38,9 @@ CREATE TABLE nop_sys_i18n( VALUE VARCHAR(300) NOT NULL COMMENT '值', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_i18n primary key (I18N_KEY,I18N_LOCALE) ); @@ -65,9 +65,9 @@ CREATE TABLE nop_sys_checker_record( CE_ERR_MSG VARCHAR(1000) NULL COMMENT '回调错误消息', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_checker_record primary key (SID) ); @@ -81,9 +81,9 @@ CREATE TABLE nop_sys_code_rule( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_code_rule primary key (SID) ); @@ -96,9 +96,9 @@ CREATE TABLE nop_sys_notice_template( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_notice_template primary key (SID) ); @@ -111,9 +111,9 @@ CREATE TABLE nop_sys_user_variable( VAR_TYPE VARCHAR(100) NULL COMMENT '变量类型', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_user_variable primary key (USER_ID,VAR_NAME) ); @@ -125,9 +125,9 @@ CREATE TABLE nop_sys_variable( VAR_TYPE VARCHAR(100) NULL COMMENT '变量类型', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_variable primary key (VAR_NAME) ); @@ -140,13 +140,13 @@ CREATE TABLE nop_sys_ext_field( DECIMAL_SCALE TINYINT NULL COMMENT '浮点精度', DECIMAL_VALUE DECIMAL(24,8) NULL COMMENT '浮点值', DATE_VALUE DATE NULL COMMENT '日期值', - TIMESTAMP_VALUE TIMESTAMP(3) NULL COMMENT '时间点值', + TIMESTAMP_VALUE DATETIME(3) NULL COMMENT '时间点值', STRING_VALUE VARCHAR(4000) NULL COMMENT '字符串值', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_ext_field primary key (ENTITY_NAME,ENTITY_ID,FIELD_NAME) ); @@ -154,17 +154,17 @@ CREATE TABLE nop_sys_ext_field( CREATE TABLE nop_sys_lock( LOCK_NAME VARCHAR(200) NOT NULL COMMENT '锁名称', LOCK_GROUP VARCHAR(200) NOT NULL COMMENT '分组', - LOCK_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '锁定时间', - EXPIRE_AT TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', + LOCK_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '锁定时间', + EXPIRE_AT DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', LOCK_REASON VARCHAR(200) NULL COMMENT '锁定原因', HOLDER_ID VARCHAR(100) NOT NULL COMMENT '锁的持有者', HOLDER_ADDER VARCHAR(100) NOT NULL COMMENT '持有者地址', APP_ID VARCHAR(100) NOT NULL COMMENT '应用ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_sys_lock primary key (LOCK_NAME,LOCK_GROUP) ); @@ -173,9 +173,9 @@ CREATE TABLE nop_sys_cluster_leader( LEADER_ID VARCHAR(100) NOT NULL COMMENT '主服务器ID', LEADER_ADDER VARCHAR(100) NOT NULL COMMENT '主服务器地址', LEADER_EPOCH BIGINT NOT NULL COMMENT '选举世代', - ELECT_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '选举时间', - EXPIRE_AT TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', - REFRESH_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '刷新时间', + ELECT_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '选举时间', + EXPIRE_AT DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', + REFRESH_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '刷新时间', VERSION INTEGER NOT NULL COMMENT '修改版本', APP_NAME VARCHAR(100) NOT NULL COMMENT '应用名', constraint PK_nop_sys_cluster_leader primary key (CLUSTER_ID) @@ -188,10 +188,10 @@ CREATE TABLE nop_sys_event( EVENT_HEADERS JSON NOT NULL COMMENT '事件元数据', EVENT_DATA JSON NOT NULL COMMENT '数据', SELECTION VARCHAR(1000) NULL COMMENT '字段选择', - EVENT_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '事件时间', + EVENT_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '事件时间', EVENT_STATUS INTEGER NOT NULL COMMENT '事件状态', - PROCESS_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '处理时间', - SCHEDULE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '调度时间', + PROCESS_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '处理时间', + SCHEDULE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '调度时间', IS_BROADCAST BOOLEAN NOT NULL COMMENT '是否广播', BIZ_OBJ_NAME VARCHAR(100) NULL COMMENT '业务对象名', BIZ_KEY VARCHAR(50) NULL COMMENT '业务标识', @@ -200,12 +200,31 @@ CREATE TABLE nop_sys_event( RETRY_TIMES INTEGER NOT NULL COMMENT '重试次数', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_sys_event primary key (EVENT_ID) ); +CREATE TABLE nop_sys_service_instance( + INSTANCE_ID VARCHAR(50) NOT NULL COMMENT '服务实例ID', + SERVICE_NAME VARCHAR(100) NOT NULL COMMENT '服务名', + CLUSTER_NAME VARCHAR(100) NOT NULL COMMENT '集群名', + GROUP_NAME VARCHAR(100) NOT NULL COMMENT '分组名', + TAGS_TEXT VARCHAR(100) NOT NULL COMMENT '标签', + SERVER_ADDR VARCHAR(20) NOT NULL COMMENT '服务地址', + SERVER_PORT INTEGER NOT NULL COMMENT '服务端口', + WEIGHT INTEGER NOT NULL COMMENT '权重', + META_DATA VARCHAR(1000) NULL COMMENT '扩展数据', + IS_HEALTHY BOOLEAN NOT NULL COMMENT '是否健康', + IS_ENABLED BOOLEAN NOT NULL COMMENT '是否启用', + IS_EPHEMERAL BOOLEAN NOT NULL COMMENT '是否临时', + VERSION INTEGER NOT NULL COMMENT '数据版本', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + constraint PK_nop_sys_service_instance primary key (INSTANCE_ID) +); + CREATE TABLE nop_sys_dict_option( SID VARCHAR(32) NOT NULL COMMENT '主键', DICT_ID VARCHAR(32) NOT NULL COMMENT '字典ID', @@ -218,9 +237,9 @@ CREATE TABLE nop_sys_dict_option( DEL_FLAG TINYINT NOT NULL COMMENT '删除标识', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_sys_dict_option primary key (SID) ); @@ -250,5 +269,7 @@ CREATE TABLE nop_sys_dict_option( ALTER TABLE nop_sys_event COMMENT '事件队列'; + ALTER TABLE nop_sys_service_instance COMMENT '服务实例'; + ALTER TABLE nop_sys_dict_option COMMENT '字典明细'; diff --git a/nop-sys/deploy/sql/mysql/_drop_nop-sys.sql b/nop-sys/deploy/sql/mysql/_drop_nop-sys.sql index 7c7295248..8a48c8700 100644 --- a/nop-sys/deploy/sql/mysql/_drop_nop-sys.sql +++ b/nop-sys/deploy/sql/mysql/_drop_nop-sys.sql @@ -11,5 +11,6 @@ drop table if exists nop_sys_ext_field; drop table if exists nop_sys_lock; drop table if exists nop_sys_cluster_leader; drop table if exists nop_sys_event; +drop table if exists nop_sys_service_instance; drop table if exists nop_sys_dict_option; diff --git a/nop-sys/deploy/sql/oracle/_add_tenant_nop-sys.sql b/nop-sys/deploy/sql/oracle/_add_tenant_nop-sys.sql index e2e3ff7b2..6a80fe36e 100644 --- a/nop-sys/deploy/sql/oracle/_add_tenant_nop-sys.sql +++ b/nop-sys/deploy/sql/oracle/_add_tenant_nop-sys.sql @@ -21,6 +21,8 @@ alter table nop_sys_notice_template add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' N alter table nop_sys_sequence add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL; +alter table nop_sys_service_instance add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL; + alter table nop_sys_user_variable add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL; alter table nop_sys_variable add NOP_TENANT_ID VARCHAR2(32) DEFAULT '0' NOT NULL; @@ -58,6 +60,9 @@ alter table nop_sys_notice_template add constraint PK_nop_sys_notice_template pr alter table nop_sys_sequence drop constraint PK_nop_sys_sequence; alter table nop_sys_sequence add constraint PK_nop_sys_sequence primary key (NOP_TENANT_ID, SEQ_NAME); +alter table nop_sys_service_instance drop constraint PK_nop_sys_service_instance; +alter table nop_sys_service_instance add constraint PK_nop_sys_service_instance primary key (NOP_TENANT_ID, INSTANCE_ID); + alter table nop_sys_user_variable drop constraint PK_nop_sys_user_variable; alter table nop_sys_user_variable add constraint PK_nop_sys_user_variable primary key (NOP_TENANT_ID, USER_ID,VAR_NAME); diff --git a/nop-sys/deploy/sql/oracle/_create_nop-sys.sql b/nop-sys/deploy/sql/oracle/_create_nop-sys.sql index 0724187a7..de4bede91 100644 --- a/nop-sys/deploy/sql/oracle/_create_nop-sys.sql +++ b/nop-sys/deploy/sql/oracle/_create_nop-sys.sql @@ -206,6 +206,25 @@ CREATE TABLE nop_sys_event( constraint PK_nop_sys_event primary key (EVENT_ID) ); +CREATE TABLE nop_sys_service_instance( + INSTANCE_ID VARCHAR2(50) NOT NULL , + SERVICE_NAME VARCHAR2(100) NOT NULL , + CLUSTER_NAME VARCHAR2(100) NOT NULL , + GROUP_NAME VARCHAR2(100) NOT NULL , + TAGS_TEXT VARCHAR2(100) NOT NULL , + SERVER_ADDR VARCHAR2(20) NOT NULL , + SERVER_PORT INTEGER NOT NULL , + WEIGHT INTEGER NOT NULL , + META_DATA VARCHAR2(1000) , + IS_HEALTHY CHAR(1) NOT NULL , + IS_ENABLED CHAR(1) NOT NULL , + IS_EPHEMERAL CHAR(1) NOT NULL , + VERSION INTEGER NOT NULL , + CREATE_TIME TIMESTAMP NOT NULL , + UPDATE_TIME TIMESTAMP NOT NULL , + constraint PK_nop_sys_service_instance primary key (INSTANCE_ID) +); + CREATE TABLE nop_sys_dict_option( SID VARCHAR2(32) NOT NULL , DICT_ID VARCHAR2(32) NOT NULL , @@ -568,6 +587,38 @@ CREATE TABLE nop_sys_dict_option( COMMENT ON COLUMN nop_sys_event.UPDATE_TIME IS '修改时间'; + COMMENT ON TABLE nop_sys_service_instance IS '服务实例'; + + COMMENT ON COLUMN nop_sys_service_instance.INSTANCE_ID IS '服务实例ID'; + + COMMENT ON COLUMN nop_sys_service_instance.SERVICE_NAME IS '服务名'; + + COMMENT ON COLUMN nop_sys_service_instance.CLUSTER_NAME IS '集群名'; + + COMMENT ON COLUMN nop_sys_service_instance.GROUP_NAME IS '分组名'; + + COMMENT ON COLUMN nop_sys_service_instance.TAGS_TEXT IS '标签'; + + COMMENT ON COLUMN nop_sys_service_instance.SERVER_ADDR IS '服务地址'; + + COMMENT ON COLUMN nop_sys_service_instance.SERVER_PORT IS '服务端口'; + + COMMENT ON COLUMN nop_sys_service_instance.WEIGHT IS '权重'; + + COMMENT ON COLUMN nop_sys_service_instance.META_DATA IS '扩展数据'; + + COMMENT ON COLUMN nop_sys_service_instance.IS_HEALTHY IS '是否健康'; + + COMMENT ON COLUMN nop_sys_service_instance.IS_ENABLED IS '是否启用'; + + COMMENT ON COLUMN nop_sys_service_instance.IS_EPHEMERAL IS '是否临时'; + + COMMENT ON COLUMN nop_sys_service_instance.VERSION IS '数据版本'; + + COMMENT ON COLUMN nop_sys_service_instance.CREATE_TIME IS '创建时间'; + + COMMENT ON COLUMN nop_sys_service_instance.UPDATE_TIME IS '修改时间'; + COMMENT ON TABLE nop_sys_dict_option IS '字典明细'; COMMENT ON COLUMN nop_sys_dict_option.SID IS '主键'; diff --git a/nop-sys/deploy/sql/oracle/_drop_nop-sys.sql b/nop-sys/deploy/sql/oracle/_drop_nop-sys.sql index 9a5db4a0e..cdc8588a5 100644 --- a/nop-sys/deploy/sql/oracle/_drop_nop-sys.sql +++ b/nop-sys/deploy/sql/oracle/_drop_nop-sys.sql @@ -11,5 +11,6 @@ drop table nop_sys_ext_field; drop table nop_sys_lock; drop table nop_sys_cluster_leader; drop table nop_sys_event; +drop table nop_sys_service_instance; drop table nop_sys_dict_option; diff --git a/nop-sys/deploy/sql/postgresql/_add_tenant_nop-sys.sql b/nop-sys/deploy/sql/postgresql/_add_tenant_nop-sys.sql index 4aa24214b..830738c06 100644 --- a/nop-sys/deploy/sql/postgresql/_add_tenant_nop-sys.sql +++ b/nop-sys/deploy/sql/postgresql/_add_tenant_nop-sys.sql @@ -21,6 +21,8 @@ alter table nop_sys_notice_template add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NO alter table nop_sys_sequence add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; +alter table nop_sys_service_instance add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; + alter table nop_sys_user_variable add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; alter table nop_sys_variable add NOP_TENANT_ID VARCHAR(32) DEFAULT '0' NOT NULL; @@ -58,6 +60,9 @@ alter table nop_sys_notice_template add constraint PK_nop_sys_notice_template pr alter table nop_sys_sequence drop constraint PK_nop_sys_sequence; alter table nop_sys_sequence add constraint PK_nop_sys_sequence primary key (NOP_TENANT_ID, SEQ_NAME); +alter table nop_sys_service_instance drop constraint PK_nop_sys_service_instance; +alter table nop_sys_service_instance add constraint PK_nop_sys_service_instance primary key (NOP_TENANT_ID, INSTANCE_ID); + alter table nop_sys_user_variable drop constraint PK_nop_sys_user_variable; alter table nop_sys_user_variable add constraint PK_nop_sys_user_variable primary key (NOP_TENANT_ID, USER_ID,VAR_NAME); diff --git a/nop-sys/deploy/sql/postgresql/_create_nop-sys.sql b/nop-sys/deploy/sql/postgresql/_create_nop-sys.sql index cef2abaa6..7bc80ddf5 100644 --- a/nop-sys/deploy/sql/postgresql/_create_nop-sys.sql +++ b/nop-sys/deploy/sql/postgresql/_create_nop-sys.sql @@ -206,6 +206,25 @@ CREATE TABLE nop_sys_event( constraint PK_nop_sys_event primary key (EVENT_ID) ); +CREATE TABLE nop_sys_service_instance( + INSTANCE_ID VARCHAR(50) NOT NULL , + SERVICE_NAME VARCHAR(100) NOT NULL , + CLUSTER_NAME VARCHAR(100) NOT NULL , + GROUP_NAME VARCHAR(100) NOT NULL , + TAGS_TEXT VARCHAR(100) NOT NULL , + SERVER_ADDR VARCHAR(20) NOT NULL , + SERVER_PORT INT4 NOT NULL , + WEIGHT INT4 NOT NULL , + META_DATA VARCHAR(1000) , + IS_HEALTHY BOOLEAN NOT NULL , + IS_ENABLED BOOLEAN NOT NULL , + IS_EPHEMERAL BOOLEAN NOT NULL , + VERSION INT4 NOT NULL , + CREATE_TIME TIMESTAMP NOT NULL , + UPDATE_TIME TIMESTAMP NOT NULL , + constraint PK_nop_sys_service_instance primary key (INSTANCE_ID) +); + CREATE TABLE nop_sys_dict_option( SID VARCHAR(32) NOT NULL , DICT_ID VARCHAR(32) NOT NULL , @@ -568,6 +587,38 @@ CREATE TABLE nop_sys_dict_option( COMMENT ON COLUMN nop_sys_event.UPDATE_TIME IS '修改时间'; + COMMENT ON TABLE nop_sys_service_instance IS '服务实例'; + + COMMENT ON COLUMN nop_sys_service_instance.INSTANCE_ID IS '服务实例ID'; + + COMMENT ON COLUMN nop_sys_service_instance.SERVICE_NAME IS '服务名'; + + COMMENT ON COLUMN nop_sys_service_instance.CLUSTER_NAME IS '集群名'; + + COMMENT ON COLUMN nop_sys_service_instance.GROUP_NAME IS '分组名'; + + COMMENT ON COLUMN nop_sys_service_instance.TAGS_TEXT IS '标签'; + + COMMENT ON COLUMN nop_sys_service_instance.SERVER_ADDR IS '服务地址'; + + COMMENT ON COLUMN nop_sys_service_instance.SERVER_PORT IS '服务端口'; + + COMMENT ON COLUMN nop_sys_service_instance.WEIGHT IS '权重'; + + COMMENT ON COLUMN nop_sys_service_instance.META_DATA IS '扩展数据'; + + COMMENT ON COLUMN nop_sys_service_instance.IS_HEALTHY IS '是否健康'; + + COMMENT ON COLUMN nop_sys_service_instance.IS_ENABLED IS '是否启用'; + + COMMENT ON COLUMN nop_sys_service_instance.IS_EPHEMERAL IS '是否临时'; + + COMMENT ON COLUMN nop_sys_service_instance.VERSION IS '数据版本'; + + COMMENT ON COLUMN nop_sys_service_instance.CREATE_TIME IS '创建时间'; + + COMMENT ON COLUMN nop_sys_service_instance.UPDATE_TIME IS '修改时间'; + COMMENT ON TABLE nop_sys_dict_option IS '字典明细'; COMMENT ON COLUMN nop_sys_dict_option.SID IS '主键'; diff --git a/nop-sys/deploy/sql/postgresql/_drop_nop-sys.sql b/nop-sys/deploy/sql/postgresql/_drop_nop-sys.sql index 7c7295248..8a48c8700 100644 --- a/nop-sys/deploy/sql/postgresql/_drop_nop-sys.sql +++ b/nop-sys/deploy/sql/postgresql/_drop_nop-sys.sql @@ -11,5 +11,6 @@ drop table if exists nop_sys_ext_field; drop table if exists nop_sys_lock; drop table if exists nop_sys_cluster_leader; drop table if exists nop_sys_event; +drop table if exists nop_sys_service_instance; drop table if exists nop_sys_dict_option; diff --git a/nop-sys/model/nop-sys.orm.xlsx b/nop-sys/model/nop-sys.orm.xlsx index 600e60d491e9f736b1841eb0957266608794b6d4..842fe61bb8b2100ea8ea83821d6e1a944b2d2764 100644 GIT binary patch delta 11547 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 R{NE6ww`1=OnGF1${Xc7ibz%Sj delta 8953 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 WQ9~IP?mvPE|6WCZsj}-odjAK(Et_Bf diff --git a/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/NopSysServiceInstance.java b/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/NopSysServiceInstance.java new file mode 100644 index 000000000..479a10c66 --- /dev/null +++ b/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/NopSysServiceInstance.java @@ -0,0 +1,11 @@ +package io.nop.sys.dao.entity; + +import io.nop.api.core.annotations.biz.BizObjName; +import io.nop.sys.dao.entity._gen._NopSysServiceInstance; + + +@BizObjName("NopSysServiceInstance") +public class NopSysServiceInstance extends _NopSysServiceInstance{ + + +} diff --git a/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/_gen/_NopSysServiceInstance.java b/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/_gen/_NopSysServiceInstance.java new file mode 100644 index 000000000..d6fc088d0 --- /dev/null +++ b/nop-sys/nop-sys-dao/src/main/java/io/nop/sys/dao/entity/_gen/_NopSysServiceInstance.java @@ -0,0 +1,874 @@ +package io.nop.sys.dao.entity._gen; + +import io.nop.orm.model.IEntityModel; +import io.nop.orm.support.DynamicOrmEntity; +import io.nop.orm.support.OrmEntitySet; //NOPMD - suppressed UnusedImports - Auto Gen Code +import io.nop.orm.IOrmEntitySet; //NOPMD - suppressed UnusedImports - Auto Gen Code +import io.nop.api.core.convert.ConvertHelper; +import java.util.Map; +import java.util.HashMap; +import java.util.Arrays; +import java.util.List; + +import io.nop.sys.dao.entity.NopSysServiceInstance; + +// tell cpd to start ignoring code - CPD-OFF +/** + * 服务实例: nop_sys_service_instance + */ +@SuppressWarnings({"PMD.UselessOverridingMethod","PMD.UnusedLocalVariable","java:S3008","java:S1602","java:S1128","java:S1161", + "PMD.UnnecessaryFullyQualifiedName","PMD.EmptyControlStatement","java:S116","java:S115","java:S101","java:S3776"}) +public class _NopSysServiceInstance extends DynamicOrmEntity{ + + /* 服务实例ID: INSTANCE_ID VARCHAR */ + public static final String PROP_NAME_instanceId = "instanceId"; + public static final int PROP_ID_instanceId = 1; + + /* 服务名: SERVICE_NAME VARCHAR */ + public static final String PROP_NAME_serviceName = "serviceName"; + public static final int PROP_ID_serviceName = 2; + + /* 集群名: CLUSTER_NAME VARCHAR */ + public static final String PROP_NAME_clusterName = "clusterName"; + public static final int PROP_ID_clusterName = 3; + + /* 分组名: GROUP_NAME VARCHAR */ + public static final String PROP_NAME_groupName = "groupName"; + public static final int PROP_ID_groupName = 4; + + /* 标签: TAGS_TEXT VARCHAR */ + public static final String PROP_NAME_tagsText = "tagsText"; + public static final int PROP_ID_tagsText = 5; + + /* 服务地址: SERVER_ADDR VARCHAR */ + public static final String PROP_NAME_serverAddr = "serverAddr"; + public static final int PROP_ID_serverAddr = 6; + + /* 服务端口: SERVER_PORT INTEGER */ + public static final String PROP_NAME_serverPort = "serverPort"; + public static final int PROP_ID_serverPort = 7; + + /* 权重: WEIGHT INTEGER */ + public static final String PROP_NAME_weight = "weight"; + public static final int PROP_ID_weight = 8; + + /* 扩展数据: META_DATA VARCHAR */ + public static final String PROP_NAME_metaData = "metaData"; + public static final int PROP_ID_metaData = 9; + + /* 是否健康: IS_HEALTHY BOOLEAN */ + public static final String PROP_NAME_isHealthy = "isHealthy"; + public static final int PROP_ID_isHealthy = 10; + + /* 是否启用: IS_ENABLED BOOLEAN */ + public static final String PROP_NAME_isEnabled = "isEnabled"; + public static final int PROP_ID_isEnabled = 11; + + /* 是否临时: IS_EPHEMERAL BOOLEAN */ + public static final String PROP_NAME_isEphemeral = "isEphemeral"; + public static final int PROP_ID_isEphemeral = 12; + + /* 数据版本: VERSION INTEGER */ + public static final String PROP_NAME_version = "version"; + public static final int PROP_ID_version = 13; + + /* 创建时间: CREATE_TIME TIMESTAMP */ + public static final String PROP_NAME_createTime = "createTime"; + public static final int PROP_ID_createTime = 14; + + /* 修改时间: UPDATE_TIME TIMESTAMP */ + public static final String PROP_NAME_updateTime = "updateTime"; + public static final int PROP_ID_updateTime = 15; + + + private static int _PROP_ID_BOUND = 16; + + + + protected static final List PK_PROP_NAMES = Arrays.asList(PROP_NAME_instanceId); + protected static final int[] PK_PROP_IDS = new int[]{PROP_ID_instanceId}; + + private static final String[] PROP_ID_TO_NAME = new String[16]; + private static final Map PROP_NAME_TO_ID = new HashMap<>(); + static{ + + PROP_ID_TO_NAME[PROP_ID_instanceId] = PROP_NAME_instanceId; + PROP_NAME_TO_ID.put(PROP_NAME_instanceId, PROP_ID_instanceId); + + PROP_ID_TO_NAME[PROP_ID_serviceName] = PROP_NAME_serviceName; + PROP_NAME_TO_ID.put(PROP_NAME_serviceName, PROP_ID_serviceName); + + PROP_ID_TO_NAME[PROP_ID_clusterName] = PROP_NAME_clusterName; + PROP_NAME_TO_ID.put(PROP_NAME_clusterName, PROP_ID_clusterName); + + PROP_ID_TO_NAME[PROP_ID_groupName] = PROP_NAME_groupName; + PROP_NAME_TO_ID.put(PROP_NAME_groupName, PROP_ID_groupName); + + PROP_ID_TO_NAME[PROP_ID_tagsText] = PROP_NAME_tagsText; + PROP_NAME_TO_ID.put(PROP_NAME_tagsText, PROP_ID_tagsText); + + PROP_ID_TO_NAME[PROP_ID_serverAddr] = PROP_NAME_serverAddr; + PROP_NAME_TO_ID.put(PROP_NAME_serverAddr, PROP_ID_serverAddr); + + PROP_ID_TO_NAME[PROP_ID_serverPort] = PROP_NAME_serverPort; + PROP_NAME_TO_ID.put(PROP_NAME_serverPort, PROP_ID_serverPort); + + PROP_ID_TO_NAME[PROP_ID_weight] = PROP_NAME_weight; + PROP_NAME_TO_ID.put(PROP_NAME_weight, PROP_ID_weight); + + PROP_ID_TO_NAME[PROP_ID_metaData] = PROP_NAME_metaData; + PROP_NAME_TO_ID.put(PROP_NAME_metaData, PROP_ID_metaData); + + PROP_ID_TO_NAME[PROP_ID_isHealthy] = PROP_NAME_isHealthy; + PROP_NAME_TO_ID.put(PROP_NAME_isHealthy, PROP_ID_isHealthy); + + PROP_ID_TO_NAME[PROP_ID_isEnabled] = PROP_NAME_isEnabled; + PROP_NAME_TO_ID.put(PROP_NAME_isEnabled, PROP_ID_isEnabled); + + PROP_ID_TO_NAME[PROP_ID_isEphemeral] = PROP_NAME_isEphemeral; + PROP_NAME_TO_ID.put(PROP_NAME_isEphemeral, PROP_ID_isEphemeral); + + PROP_ID_TO_NAME[PROP_ID_version] = PROP_NAME_version; + PROP_NAME_TO_ID.put(PROP_NAME_version, PROP_ID_version); + + PROP_ID_TO_NAME[PROP_ID_createTime] = PROP_NAME_createTime; + PROP_NAME_TO_ID.put(PROP_NAME_createTime, PROP_ID_createTime); + + PROP_ID_TO_NAME[PROP_ID_updateTime] = PROP_NAME_updateTime; + PROP_NAME_TO_ID.put(PROP_NAME_updateTime, PROP_ID_updateTime); + + } + + + /* 服务实例ID: INSTANCE_ID */ + private java.lang.String _instanceId; + + /* 服务名: SERVICE_NAME */ + private java.lang.String _serviceName; + + /* 集群名: CLUSTER_NAME */ + private java.lang.String _clusterName; + + /* 分组名: GROUP_NAME */ + private java.lang.String _groupName; + + /* 标签: TAGS_TEXT */ + private java.lang.String _tagsText; + + /* 服务地址: SERVER_ADDR */ + private java.lang.String _serverAddr; + + /* 服务端口: SERVER_PORT */ + private java.lang.Integer _serverPort; + + /* 权重: WEIGHT */ + private java.lang.Integer _weight; + + /* 扩展数据: META_DATA */ + private java.lang.String _metaData; + + /* 是否健康: IS_HEALTHY */ + private java.lang.Boolean _isHealthy; + + /* 是否启用: IS_ENABLED */ + private java.lang.Boolean _isEnabled; + + /* 是否临时: IS_EPHEMERAL */ + private java.lang.Boolean _isEphemeral; + + /* 数据版本: VERSION */ + private java.lang.Integer _version; + + /* 创建时间: CREATE_TIME */ + private java.sql.Timestamp _createTime; + + /* 修改时间: UPDATE_TIME */ + private java.sql.Timestamp _updateTime; + + + public _NopSysServiceInstance(){ + // for debug + } + + protected NopSysServiceInstance newInstance(){ + NopSysServiceInstance entity = new NopSysServiceInstance(); + entity.orm_attach(orm_enhancer()); + entity.orm_entityModel(orm_entityModel()); + return entity; + } + + @Override + public NopSysServiceInstance cloneInstance() { + NopSysServiceInstance entity = newInstance(); + orm_forEachInitedProp((value, propId) -> { + entity.orm_propValue(propId,value); + }); + return entity; + } + + @Override + public String orm_entityName() { + // 如果存在实体模型对象，则以模型对象上的设置为准 + IEntityModel entityModel = orm_entityModel(); + if(entityModel != null) + return entityModel.getName(); + return "io.nop.sys.dao.entity.NopSysServiceInstance"; + } + + @Override + public int orm_propIdBound(){ + IEntityModel entityModel = orm_entityModel(); + if(entityModel != null) + return entityModel.getPropIdBound(); + return _PROP_ID_BOUND; + } + + @Override + public Object orm_id() { + + return buildSimpleId(PROP_ID_instanceId); + + } + + @Override + public boolean orm_isPrimary(int propId) { + + return propId == PROP_ID_instanceId; + + } + + @Override + public String orm_propName(int propId) { + if(propId >= PROP_ID_TO_NAME.length) + return super.orm_propName(propId); + String propName = PROP_ID_TO_NAME[propId]; + if(propName == null) + return super.orm_propName(propId); + return propName; + } + + @Override + public int orm_propId(String propName) { + Integer propId = PROP_NAME_TO_ID.get(propName); + if(propId == null) + return super.orm_propId(propName); + return propId; + } + + @Override + public Object orm_propValue(int propId) { + switch(propId){ + + case PROP_ID_instanceId: + return getInstanceId(); + + case PROP_ID_serviceName: + return getServiceName(); + + case PROP_ID_clusterName: + return getClusterName(); + + case PROP_ID_groupName: + return getGroupName(); + + case PROP_ID_tagsText: + return getTagsText(); + + case PROP_ID_serverAddr: + return getServerAddr(); + + case PROP_ID_serverPort: + return getServerPort(); + + case PROP_ID_weight: + return getWeight(); + + case PROP_ID_metaData: + return getMetaData(); + + case PROP_ID_isHealthy: + return getIsHealthy(); + + case PROP_ID_isEnabled: + return getIsEnabled(); + + case PROP_ID_isEphemeral: + return getIsEphemeral(); + + case PROP_ID_version: + return getVersion(); + + case PROP_ID_createTime: + return getCreateTime(); + + case PROP_ID_updateTime: + return getUpdateTime(); + + default: + return super.orm_propValue(propId); + } + } + + + + @Override + public void orm_propValue(int propId, Object value){ + switch(propId){ + + case PROP_ID_instanceId:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_instanceId)); + } + setInstanceId(typedValue); + break; + } + + case PROP_ID_serviceName:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_serviceName)); + } + setServiceName(typedValue); + break; + } + + case PROP_ID_clusterName:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_clusterName)); + } + setClusterName(typedValue); + break; + } + + case PROP_ID_groupName:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_groupName)); + } + setGroupName(typedValue); + break; + } + + case PROP_ID_tagsText:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_tagsText)); + } + setTagsText(typedValue); + break; + } + + case PROP_ID_serverAddr:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_serverAddr)); + } + setServerAddr(typedValue); + break; + } + + case PROP_ID_serverPort:{ + java.lang.Integer typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toInteger(value, + err-> newTypeConversionError(PROP_NAME_serverPort)); + } + setServerPort(typedValue); + break; + } + + case PROP_ID_weight:{ + java.lang.Integer typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toInteger(value, + err-> newTypeConversionError(PROP_NAME_weight)); + } + setWeight(typedValue); + break; + } + + case PROP_ID_metaData:{ + java.lang.String typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toString(value, + err-> newTypeConversionError(PROP_NAME_metaData)); + } + setMetaData(typedValue); + break; + } + + case PROP_ID_isHealthy:{ + java.lang.Boolean typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toBoolean(value, + err-> newTypeConversionError(PROP_NAME_isHealthy)); + } + setIsHealthy(typedValue); + break; + } + + case PROP_ID_isEnabled:{ + java.lang.Boolean typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toBoolean(value, + err-> newTypeConversionError(PROP_NAME_isEnabled)); + } + setIsEnabled(typedValue); + break; + } + + case PROP_ID_isEphemeral:{ + java.lang.Boolean typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toBoolean(value, + err-> newTypeConversionError(PROP_NAME_isEphemeral)); + } + setIsEphemeral(typedValue); + break; + } + + case PROP_ID_version:{ + java.lang.Integer typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toInteger(value, + err-> newTypeConversionError(PROP_NAME_version)); + } + setVersion(typedValue); + break; + } + + case PROP_ID_createTime:{ + java.sql.Timestamp typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toTimestamp(value, + err-> newTypeConversionError(PROP_NAME_createTime)); + } + setCreateTime(typedValue); + break; + } + + case PROP_ID_updateTime:{ + java.sql.Timestamp typedValue = null; + if(value != null){ + typedValue = ConvertHelper.toTimestamp(value, + err-> newTypeConversionError(PROP_NAME_updateTime)); + } + setUpdateTime(typedValue); + break; + } + + default: + super.orm_propValue(propId,value); + } + } + + @Override + public void orm_internalSet(int propId, Object value) { + switch(propId){ + + case PROP_ID_instanceId:{ + onInitProp(propId); + this._instanceId = (java.lang.String)value; + orm_id(); // 如果是设置主键字段，则触发watcher + break; + } + + case PROP_ID_serviceName:{ + onInitProp(propId); + this._serviceName = (java.lang.String)value; + + break; + } + + case PROP_ID_clusterName:{ + onInitProp(propId); + this._clusterName = (java.lang.String)value; + + break; + } + + case PROP_ID_groupName:{ + onInitProp(propId); + this._groupName = (java.lang.String)value; + + break; + } + + case PROP_ID_tagsText:{ + onInitProp(propId); + this._tagsText = (java.lang.String)value; + + break; + } + + case PROP_ID_serverAddr:{ + onInitProp(propId); + this._serverAddr = (java.lang.String)value; + + break; + } + + case PROP_ID_serverPort:{ + onInitProp(propId); + this._serverPort = (java.lang.Integer)value; + + break; + } + + case PROP_ID_weight:{ + onInitProp(propId); + this._weight = (java.lang.Integer)value; + + break; + } + + case PROP_ID_metaData:{ + onInitProp(propId); + this._metaData = (java.lang.String)value; + + break; + } + + case PROP_ID_isHealthy:{ + onInitProp(propId); + this._isHealthy = (java.lang.Boolean)value; + + break; + } + + case PROP_ID_isEnabled:{ + onInitProp(propId); + this._isEnabled = (java.lang.Boolean)value; + + break; + } + + case PROP_ID_isEphemeral:{ + onInitProp(propId); + this._isEphemeral = (java.lang.Boolean)value; + + break; + } + + case PROP_ID_version:{ + onInitProp(propId); + this._version = (java.lang.Integer)value; + + break; + } + + case PROP_ID_createTime:{ + onInitProp(propId); + this._createTime = (java.sql.Timestamp)value; + + break; + } + + case PROP_ID_updateTime:{ + onInitProp(propId); + this._updateTime = (java.sql.Timestamp)value; + + break; + } + + default: + super.orm_internalSet(propId,value); + } + } + + + /** + * 服务实例ID: INSTANCE_ID + */ + public final java.lang.String getInstanceId(){ + onPropGet(PROP_ID_instanceId); + return _instanceId; + } + + /** + * 服务实例ID: INSTANCE_ID + */ + public final void setInstanceId(java.lang.String value){ + if(onPropSet(PROP_ID_instanceId,value)){ + this._instanceId = value; + internalClearRefs(PROP_ID_instanceId); + orm_id(); + } + } + + /** + * 服务名: SERVICE_NAME + */ + public final java.lang.String getServiceName(){ + onPropGet(PROP_ID_serviceName); + return _serviceName; + } + + /** + * 服务名: SERVICE_NAME + */ + public final void setServiceName(java.lang.String value){ + if(onPropSet(PROP_ID_serviceName,value)){ + this._serviceName = value; + internalClearRefs(PROP_ID_serviceName); + + } + } + + /** + * 集群名: CLUSTER_NAME + */ + public final java.lang.String getClusterName(){ + onPropGet(PROP_ID_clusterName); + return _clusterName; + } + + /** + * 集群名: CLUSTER_NAME + */ + public final void setClusterName(java.lang.String value){ + if(onPropSet(PROP_ID_clusterName,value)){ + this._clusterName = value; + internalClearRefs(PROP_ID_clusterName); + + } + } + + /** + * 分组名: GROUP_NAME + */ + public final java.lang.String getGroupName(){ + onPropGet(PROP_ID_groupName); + return _groupName; + } + + /** + * 分组名: GROUP_NAME + */ + public final void setGroupName(java.lang.String value){ + if(onPropSet(PROP_ID_groupName,value)){ + this._groupName = value; + internalClearRefs(PROP_ID_groupName); + + } + } + + /** + * 标签: TAGS_TEXT + */ + public final java.lang.String getTagsText(){ + onPropGet(PROP_ID_tagsText); + return _tagsText; + } + + /** + * 标签: TAGS_TEXT + */ + public final void setTagsText(java.lang.String value){ + if(onPropSet(PROP_ID_tagsText,value)){ + this._tagsText = value; + internalClearRefs(PROP_ID_tagsText); + + } + } + + /** + * 服务地址: SERVER_ADDR + */ + public final java.lang.String getServerAddr(){ + onPropGet(PROP_ID_serverAddr); + return _serverAddr; + } + + /** + * 服务地址: SERVER_ADDR + */ + public final void setServerAddr(java.lang.String value){ + if(onPropSet(PROP_ID_serverAddr,value)){ + this._serverAddr = value; + internalClearRefs(PROP_ID_serverAddr); + + } + } + + /** + * 服务端口: SERVER_PORT + */ + public final java.lang.Integer getServerPort(){ + onPropGet(PROP_ID_serverPort); + return _serverPort; + } + + /** + * 服务端口: SERVER_PORT + */ + public final void setServerPort(java.lang.Integer value){ + if(onPropSet(PROP_ID_serverPort,value)){ + this._serverPort = value; + internalClearRefs(PROP_ID_serverPort); + + } + } + + /** + * 权重: WEIGHT + */ + public final java.lang.Integer getWeight(){ + onPropGet(PROP_ID_weight); + return _weight; + } + + /** + * 权重: WEIGHT + */ + public final void setWeight(java.lang.Integer value){ + if(onPropSet(PROP_ID_weight,value)){ + this._weight = value; + internalClearRefs(PROP_ID_weight); + + } + } + + /** + * 扩展数据: META_DATA + */ + public final java.lang.String getMetaData(){ + onPropGet(PROP_ID_metaData); + return _metaData; + } + + /** + * 扩展数据: META_DATA + */ + public final void setMetaData(java.lang.String value){ + if(onPropSet(PROP_ID_metaData,value)){ + this._metaData = value; + internalClearRefs(PROP_ID_metaData); + + } + } + + /** + * 是否健康: IS_HEALTHY + */ + public final java.lang.Boolean getIsHealthy(){ + onPropGet(PROP_ID_isHealthy); + return _isHealthy; + } + + /** + * 是否健康: IS_HEALTHY + */ + public final void setIsHealthy(java.lang.Boolean value){ + if(onPropSet(PROP_ID_isHealthy,value)){ + this._isHealthy = value; + internalClearRefs(PROP_ID_isHealthy); + + } + } + + /** + * 是否启用: IS_ENABLED + */ + public final java.lang.Boolean getIsEnabled(){ + onPropGet(PROP_ID_isEnabled); + return _isEnabled; + } + + /** + * 是否启用: IS_ENABLED + */ + public final void setIsEnabled(java.lang.Boolean value){ + if(onPropSet(PROP_ID_isEnabled,value)){ + this._isEnabled = value; + internalClearRefs(PROP_ID_isEnabled); + + } + } + + /** + * 是否临时: IS_EPHEMERAL + */ + public final java.lang.Boolean getIsEphemeral(){ + onPropGet(PROP_ID_isEphemeral); + return _isEphemeral; + } + + /** + * 是否临时: IS_EPHEMERAL + */ + public final void setIsEphemeral(java.lang.Boolean value){ + if(onPropSet(PROP_ID_isEphemeral,value)){ + this._isEphemeral = value; + internalClearRefs(PROP_ID_isEphemeral); + + } + } + + /** + * 数据版本: VERSION + */ + public final java.lang.Integer getVersion(){ + onPropGet(PROP_ID_version); + return _version; + } + + /** + * 数据版本: VERSION + */ + public final void setVersion(java.lang.Integer value){ + if(onPropSet(PROP_ID_version,value)){ + this._version = value; + internalClearRefs(PROP_ID_version); + + } + } + + /** + * 创建时间: CREATE_TIME + */ + public final java.sql.Timestamp getCreateTime(){ + onPropGet(PROP_ID_createTime); + return _createTime; + } + + /** + * 创建时间: CREATE_TIME + */ + public final void setCreateTime(java.sql.Timestamp value){ + if(onPropSet(PROP_ID_createTime,value)){ + this._createTime = value; + internalClearRefs(PROP_ID_createTime); + + } + } + + /** + * 修改时间: UPDATE_TIME + */ + public final java.sql.Timestamp getUpdateTime(){ + onPropGet(PROP_ID_updateTime); + return _updateTime; + } + + /** + * 修改时间: UPDATE_TIME + */ + public final void setUpdateTime(java.sql.Timestamp value){ + if(onPropSet(PROP_ID_updateTime,value)){ + this._updateTime = value; + internalClearRefs(PROP_ID_updateTime); + + } + } + +} +// resume CPD analysis - CPD-ON diff --git a/nop-sys/nop-sys-dao/src/main/resources/_vfs/nop/sys/orm/_app.orm.xml b/nop-sys/nop-sys-dao/src/main/resources/_vfs/nop/sys/orm/_app.orm.xml index ea46d1e61..aa2a0883a 100644 --- a/nop-sys/nop-sys-dao/src/main/resources/_vfs/nop/sys/orm/_app.orm.xml +++ b/nop-sys/nop-sys-dao/src/main/resources/_vfs/nop/sys/orm/_app.orm.xml @@ -537,5 +537,43 @@ propId="21" stdDataType="timestamp" stdSqlType="TIMESTAMP" i18n-en:displayName="Update Time"/> + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-meta/_templates/_NopSysServiceInstance.json b/nop-sys/nop-sys-meta/_templates/_NopSysServiceInstance.json new file mode 100644 index 000000000..d1ea58d62 --- /dev/null +++ b/nop-sys/nop-sys-meta/_templates/_NopSysServiceInstance.json @@ -0,0 +1,17 @@ +{ + "instanceId": "", + "serviceName": "", + "clusterName": "", + "groupName": "", + "tagsText": "", + "serverAddr": "", + "serverPort": 0, + "weight": 0, + "metaData": "", + "isHealthy": false, + "isEnabled": false, + "isEphemeral": false, + "version": 0, + "createTime": "2000-01-01 14:00:00", + "updateTime": "2000-01-01 14:00:00" +} \ No newline at end of file diff --git a/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/en/_nop-sys.i18n.yaml b/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/en/_nop-sys.i18n.yaml index 53822c194..e5d507d37 100644 --- a/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/en/_nop-sys.i18n.yaml +++ b/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/en/_nop-sys.i18n.yaml @@ -11,6 +11,7 @@ entity: NopSysLock: Lock NopSysNoticeTemplate: Notice Template NopSysSequence: Sequence + NopSysServiceInstance: Instance ID NopSysUserVariable: User Variable NopSysVariable: System Variable prop: @@ -184,6 +185,22 @@ prop: updatedBy: Updated By updateTime: Update Time remark: Remark + NopSysServiceInstance: + instanceId: Instance ID + serviceName: Service Name + clusterName: Cluster Name + groupName: Group Name + tagsText: Tags + serverAddr: Server Addr + serverPort: Server Port + weight: Weight + metaData: Meta Data + isHealthy: Is Healthy + isEnabled: Is Enabled + isEphemeral: Is Ephemeral + version: Version + createTime: Create Time + updateTime: Update Time NopSysUserVariable: userId: User ID varName: Var Name diff --git a/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-sys.i18n.yaml b/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-sys.i18n.yaml index 1d3a0dc32..edf549f6d 100644 --- a/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-sys.i18n.yaml +++ b/nop-sys/nop-sys-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-sys.i18n.yaml @@ -11,6 +11,7 @@ entity: NopSysLock: 资源锁 NopSysNoticeTemplate: 通知模板 NopSysSequence: 序列号 + NopSysServiceInstance: 服务实例 NopSysUserVariable: 用户变量 NopSysVariable: 系统变量 prop: @@ -184,6 +185,22 @@ prop: updateTime: 修改时间 updatedBy: 修改人 version: 数据版本 + NopSysServiceInstance: + clusterName: 集群名 + createTime: 创建时间 + groupName: 分组名 + instanceId: 服务实例ID + isEnabled: 是否启用 + isEphemeral: 是否临时 + isHealthy: 是否健康 + metaData: 扩展数据 + serverAddr: 服务地址 + serverPort: 服务端口 + serviceName: 服务名 + tagsText: 标签 + updateTime: 修改时间 + version: 数据版本 + weight: 权重 NopSysUserVariable: createTime: 创建时间 createdBy: 创建人 diff --git a/nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xmeta b/nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xmeta new file mode 100644 index 000000000..93fe84c5e --- /dev/null +++ b/nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xmeta @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xmeta b/nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xmeta new file mode 100644 index 000000000..e3c257512 --- /dev/null +++ b/nop-sys/nop-sys-meta/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xmeta @@ -0,0 +1,82 @@ + + + + io.nop.sys.dao.entity.NopSysServiceInstance + + instanceId + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-service/src/main/java/io/nop/sys/service/entity/NopSysServiceInstanceBizModel.java b/nop-sys/nop-sys-service/src/main/java/io/nop/sys/service/entity/NopSysServiceInstanceBizModel.java new file mode 100644 index 000000000..4789de500 --- /dev/null +++ b/nop-sys/nop-sys-service/src/main/java/io/nop/sys/service/entity/NopSysServiceInstanceBizModel.java @@ -0,0 +1,14 @@ + +package io.nop.sys.service.entity; + +import io.nop.api.core.annotations.biz.BizModel; +import io.nop.biz.crud.CrudBizModel; + +import io.nop.sys.dao.entity.NopSysServiceInstance; + +@BizModel("NopSysServiceInstance") +public class NopSysServiceInstanceBizModel extends CrudBizModel{ + public NopSysServiceInstanceBizModel(){ + setEntityName(NopSysServiceInstance.class.getName()); + } +} diff --git a/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/beans/_service.beans.xml b/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/beans/_service.beans.xml index 645196745..a17f17ac7 100644 --- a/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/beans/_service.beans.xml +++ b/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/beans/_service.beans.xml @@ -27,6 +27,8 @@ + + diff --git a/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xbiz b/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xbiz new file mode 100644 index 000000000..cc859e19a --- /dev/null +++ b/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xbiz @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xbiz b/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xbiz new file mode 100644 index 000000000..3732ea632 --- /dev/null +++ b/nop-sys/nop-sys-service/src/main/resources/_vfs/nop/sys/model/NopSysServiceInstance/_NopSysServiceInstance.xbiz @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/auth/_nop-sys.action-auth.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/auth/_nop-sys.action-auth.xml index 7939566b3..675bb7592 100644 --- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/auth/_nop-sys.action-auth.xml +++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/auth/_nop-sys.action-auth.xml @@ -152,29 +152,43 @@ - + + + NopSysServiceInstance:query + + + NopSysServiceInstance:mutation + + + + - NopSysUserVariable:query - NopSysUserVariable:mutation - - NopSysVariable:query - NopSysVariable:mutation diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.lib.xjs b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.lib.xjs new file mode 100644 index 000000000..6bb977c92 --- /dev/null +++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.lib.xjs @@ -0,0 +1,10 @@ +// x:gen-extends用于动态生成代码 +/* @x:gen-extends: +*/ + +/* +// @action:name 触发这里的函数，options为ajax请求参数 +export function myAction(options, page,scoped){ + return page.env.fetcher(options) +} +*/ \ No newline at end of file diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.view.xml new file mode 100644 index 000000000..b6c17af86 --- /dev/null +++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/NopSysServiceInstance.view.xml @@ -0,0 +1,20 @@ + + + + + + + + + +
+ + + + + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/_gen/_NopSysServiceInstance.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/_gen/_NopSysServiceInstance.view.xml new file mode 100644 index 000000000..c762ab786 --- /dev/null +++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/_gen/_NopSysServiceInstance.view.xml @@ -0,0 +1,152 @@ + + + + /nop/sys/model/NopSysServiceInstance/NopSysServiceInstance.xmeta + + /nop/web/xlib/control.xlib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + instanceId[服务实例ID] serviceName[服务名] + clusterName[集群名] groupName[分组名] + tagsText[标签] serverAddr[服务地址] + serverPort[服务端口] weight[权重] + metaData[扩展数据] isHealthy[是否健康] + isEnabled[是否启用] isEphemeral[是否临时] + createTime[创建时间] updateTime[修改时间] + + +
+ + + instanceId[服务实例ID] serviceName[服务名] + clusterName[集群名] groupName[分组名] + tagsText[标签] serverAddr[服务地址] + serverPort[服务端口] weight[权重] + metaData[扩展数据] isHealthy[是否健康] + isEnabled[是否启用] isEphemeral[是否临时] + +
+
+ + + + + + + + +
+ + + + +
+ + + + @i18n:common.confirmBatchDelete + + + + + + + + + + + + + + + @i18n:common.confirmDelete + + + + + + + + @i18n:common.confirmDelete + + + + + + + +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/main.page.yaml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/main.page.yaml new file mode 100644 index 000000000..6dfc92797 --- /dev/null +++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/main.page.yaml @@ -0,0 +1,3 @@ + +x:gen-extends: | + diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/picker.page.yaml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/picker.page.yaml new file mode 100644 index 000000000..0a63eb627 --- /dev/null +++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysServiceInstance/picker.page.yaml @@ -0,0 +1,3 @@ + +x:gen-extends: | + diff --git a/nop-task/deploy/sql/mysql/_create_nop-task.sql b/nop-task/deploy/sql/mysql/_create_nop-task.sql index c7c64785d..1b7d3b8c2 100644 --- a/nop-task/deploy/sql/mysql/_create_nop-task.sql +++ b/nop-task/deploy/sql/mysql/_create_nop-task.sql @@ -9,9 +9,9 @@ CREATE TABLE nop_task_definition( STATUS INTEGER NOT NULL COMMENT '状态', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_task_definition primary key (TASK_DEF_ID) ); @@ -23,9 +23,9 @@ CREATE TABLE nop_task_instance( TASK_INPUTS VARCHAR(4000) NULL COMMENT '逻辑流参数', TASK_GROUP VARCHAR(100) NOT NULL COMMENT '逻辑流分组', STATUS INTEGER NOT NULL COMMENT '状态', - START_TIME TIMESTAMP(3) NULL COMMENT '启动时间', - END_TIME TIMESTAMP(3) NULL COMMENT '结束时间', - DUE_TIME TIMESTAMP(3) NULL COMMENT '完成时限', + START_TIME DATETIME(3) NULL COMMENT '启动时间', + END_TIME DATETIME(3) NULL COMMENT '结束时间', + DUE_TIME DATETIME(3) NULL COMMENT '完成时限', BIZ_KEY VARCHAR(200) NULL COMMENT '业务唯一键', BIZ_OBJ_NAME VARCHAR(200) NULL COMMENT '业务对象名', BIZ_OBJ_ID VARCHAR(200) NULL COMMENT '业务对象ID', @@ -49,9 +49,9 @@ CREATE TABLE nop_task_instance( WORKER_ID VARCHAR(50) NULL COMMENT 'Worker ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_task_instance primary key (TASK_INSTANCE_ID) ); @@ -68,9 +68,9 @@ CREATE TABLE nop_task_definition_auth( ALLOW_START BOOLEAN NOT NULL COMMENT '允许启动', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_task_definition_auth primary key (SID) ); @@ -85,10 +85,10 @@ CREATE TABLE nop_task_step_instance( SUB_TASK_ID VARCHAR(32) NULL COMMENT '子流程ID', SUB_TASK_NAME VARCHAR(200) NULL COMMENT '子流程名称', SUB_TASK_VERSION BIGINT NULL COMMENT '子流程版本', - START_TIME TIMESTAMP(3) NULL COMMENT '开始时间', - FINISH_TIME TIMESTAMP(3) NULL COMMENT '结束时间', - DUE_TIME TIMESTAMP(3) NULL COMMENT '到期时间', - NEXT_RETRY_TIME TIMESTAMP(3) NULL COMMENT '下次重试时间', + START_TIME DATETIME(3) NULL COMMENT '开始时间', + FINISH_TIME DATETIME(3) NULL COMMENT '结束时间', + DUE_TIME DATETIME(3) NULL COMMENT '到期时间', + NEXT_RETRY_TIME DATETIME(3) NULL COMMENT '下次重试时间', RETRY_COUNT INTEGER NULL COMMENT '已重试次数', INTERNAL BOOLEAN NULL COMMENT '是否内部', ERR_CODE VARCHAR(200) NULL COMMENT '错误码', @@ -103,9 +103,9 @@ CREATE TABLE nop_task_step_instance( STATE_BEAN_DATA VARCHAR(4000) NULL COMMENT '状态数据', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_task_step_instance primary key (STEP_INSTANCE_ID) ); diff --git a/nop-tcc/deploy/sql/mysql/_create_nop-tcc.sql b/nop-tcc/deploy/sql/mysql/_create_nop-tcc.sql index 6b2a1b0e5..15cf34531 100644 --- a/nop-tcc/deploy/sql/mysql/_create_nop-tcc.sql +++ b/nop-tcc/deploy/sql/mysql/_create_nop-tcc.sql @@ -4,17 +4,17 @@ CREATE TABLE nop_tcc_record( TXN_GROUP VARCHAR(50) NOT NULL COMMENT '事务分组', TXN_NAME VARCHAR(128) NULL COMMENT '事务名', STATUS INTEGER NOT NULL COMMENT '状态', - EXPIRE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', + EXPIRE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', APP_ID VARCHAR(200) NOT NULL COMMENT '应用ID', APP_DATA VARCHAR(2000) NULL COMMENT '应用数据', - BEGIN_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '开始时间', - END_TIME TIMESTAMP(3) NULL COMMENT '结束时间', + BEGIN_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '开始时间', + END_TIME DATETIME(3) NULL COMMENT '结束时间', ERROR_CODE VARCHAR(200) NULL COMMENT '错误码', ERROR_MESSAGE VARCHAR(1000) NULL COMMENT '错误消息', ERROR_STACK VARCHAR(1000) NULL COMMENT '错误堆栈', VERSION INTEGER NOT NULL COMMENT '数据版本', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_tcc_record primary key (TXN_ID) ); @@ -24,7 +24,7 @@ CREATE TABLE nop_tcc_branch_record( BRANCH_NO INTEGER NOT NULL COMMENT '事务分支序号', PARENT_BRANCH_ID VARCHAR(50) NULL COMMENT '父分支ID', STATUS INTEGER NOT NULL COMMENT '状态', - EXPIRE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', + EXPIRE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '过期时间', SERVICE_NAME VARCHAR(200) NOT NULL COMMENT '服务名', SERVICE_METHOD VARCHAR(200) NULL COMMENT '服务方法', CONFIRM_METHOD VARCHAR(200) NULL COMMENT '确认方法', @@ -33,8 +33,8 @@ CREATE TABLE nop_tcc_branch_record( ERROR_CODE VARCHAR(200) NULL COMMENT '错误码', ERROR_MESSAGE VARCHAR(1000) NULL COMMENT '错误消息', ERROR_STACK VARCHAR(1000) NULL COMMENT '错误堆栈', - BEGIN_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '开始时间', - END_TIME TIMESTAMP(3) NULL COMMENT '结束时间', + BEGIN_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '开始时间', + END_TIME DATETIME(3) NULL COMMENT '结束时间', COMMIT_ERROR_CODE VARCHAR(200) NULL COMMENT '提交阶段错误码', COMMIT_ERROR_MESSAGE VARCHAR(1000) NULL COMMENT '提交阶段错误消息', COMMIT_ERROR_STACK VARCHAR(1000) NULL COMMENT '提交阶段错误堆栈', @@ -43,10 +43,10 @@ CREATE TABLE nop_tcc_branch_record( CANCEL_ERROR_STACK VARCHAR(1000) NULL COMMENT '取消阶段错误堆栈', RETRY_TIMES INTEGER NULL COMMENT '重试次数', MAX_RETRY_TIMES INTEGER NOT NULL COMMENT '最大重试次数', - NEXT_RETRY_TIME TIMESTAMP(3) NULL COMMENT '下次重试时间', + NEXT_RETRY_TIME DATETIME(3) NULL COMMENT '下次重试时间', VERSION INTEGER NOT NULL COMMENT '数据版本', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_tcc_branch_record primary key (BRANCH_ID) ); diff --git a/nop-wf/deploy/sql/mysql/_create_nop-wf.sql b/nop-wf/deploy/sql/mysql/_create_nop-wf.sql index 2de85431b..05216e755 100644 --- a/nop-wf/deploy/sql/mysql/_create_nop-wf.sql +++ b/nop-wf/deploy/sql/mysql/_create_nop-wf.sql @@ -15,9 +15,9 @@ CREATE TABLE nop_wf_definition( IS_DEPRECATED BOOLEAN NOT NULL COMMENT '是否已废弃', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_wf_definition primary key (WF_DEF_ID) ); @@ -32,9 +32,9 @@ CREATE TABLE nop_wf_instance( TITLE VARCHAR(200) NOT NULL COMMENT '实例标题', STATUS INTEGER NOT NULL COMMENT '状态', APP_STATE VARCHAR(100) NULL COMMENT '应用状态', - START_TIME TIMESTAMP(3) NULL COMMENT '启动时间', - END_TIME TIMESTAMP(3) NULL COMMENT '结束时间', - DUE_TIME TIMESTAMP(3) NULL COMMENT '完成时限', + START_TIME DATETIME(3) NULL COMMENT '启动时间', + END_TIME DATETIME(3) NULL COMMENT '结束时间', + DUE_TIME DATETIME(3) NULL COMMENT '完成时限', BIZ_KEY VARCHAR(200) NULL COMMENT '业务唯一键', BIZ_OBJ_NAME VARCHAR(200) NULL COMMENT '业务对象名', BIZ_OBJ_ID VARCHAR(200) NULL COMMENT '业务对象ID', @@ -48,7 +48,7 @@ CREATE TABLE nop_wf_instance( LAST_OPERATOR_ID VARCHAR(50) NULL COMMENT '上次操作者ID', LAST_OPERATOR_NAME VARCHAR(50) NULL COMMENT '上次操作者', LAST_OPERATOR_DEPT_ID VARCHAR(50) NULL COMMENT '上次操作者单位ID', - LAST_OPERATE_TIME TIMESTAMP(3) NULL COMMENT '上次操作时间', + LAST_OPERATE_TIME DATETIME(3) NULL COMMENT '上次操作时间', MANAGER_TYPE VARCHAR(50) NULL COMMENT '管理者类型', MANAGER_DEPT_ID VARCHAR(50) NULL COMMENT '管理者单位ID', MANAGER_NAME VARCHAR(50) NULL COMMENT '管理者', @@ -58,9 +58,9 @@ CREATE TABLE nop_wf_instance( TAG_TEXT VARCHAR(200) NULL COMMENT '标签', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_wf_instance primary key (WF_ID) ); @@ -77,9 +77,9 @@ CREATE TABLE nop_wf_definition_auth( ALLOW_START BOOLEAN NOT NULL COMMENT '允许启动', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_wf_definition_auth primary key (SID) ); @@ -90,13 +90,13 @@ CREATE TABLE nop_wf_status_history( FROM_STATUS INTEGER NOT NULL COMMENT '源状态', TO_STATUS INTEGER NOT NULL COMMENT '目标状态', TO_APP_STATE VARCHAR(100) NULL COMMENT '目标应用状态', - CHANGE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '状态变动时间', + CHANGE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '状态变动时间', OPERATOR_ID VARCHAR(50) NULL COMMENT '操作者ID', OPERATOR_NAME VARCHAR(50) NULL COMMENT '操作者', OPERATOR_DEPT_ID VARCHAR(50) NULL COMMENT '操作者部门ID', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', constraint PK_nop_wf_status_history primary key (SID) ); @@ -129,13 +129,13 @@ CREATE TABLE nop_wf_step_instance( CANCELLER_NAME VARCHAR(50) NULL COMMENT '取消人姓名', FROM_ACTION VARCHAR(200) NULL COMMENT '来源操作', LAST_ACTION VARCHAR(200) NULL COMMENT '最后一次操作', - START_TIME TIMESTAMP(3) NULL COMMENT '开始时间', - FINISH_TIME TIMESTAMP(3) NULL COMMENT '结束时间', - DUE_TIME TIMESTAMP(3) NULL COMMENT '到期时间', - READ_TIME TIMESTAMP(3) NULL COMMENT '读取时间', - REMIND_TIME TIMESTAMP(3) NULL COMMENT '提醒时间', + START_TIME DATETIME(3) NULL COMMENT '开始时间', + FINISH_TIME DATETIME(3) NULL COMMENT '结束时间', + DUE_TIME DATETIME(3) NULL COMMENT '到期时间', + READ_TIME DATETIME(3) NULL COMMENT '读取时间', + REMIND_TIME DATETIME(3) NULL COMMENT '提醒时间', REMIND_COUNT INTEGER NULL COMMENT '提醒次数', - NEXT_RETRY_TIME TIMESTAMP(3) NULL COMMENT '下次重试时间', + NEXT_RETRY_TIME DATETIME(3) NULL COMMENT '下次重试时间', RETRY_COUNT INTEGER NULL COMMENT '已重试次数', ERR_CODE VARCHAR(200) NULL COMMENT '错误码', ERR_MSG VARCHAR(4000) NULL COMMENT '错误消息', @@ -149,9 +149,9 @@ CREATE TABLE nop_wf_step_instance( VOTE_WEIGHT INTEGER NULL COMMENT '投票权重', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_wf_step_instance primary key (STEP_ID) ); @@ -164,12 +164,12 @@ CREATE TABLE nop_wf_output( DECIMAL_VALUE DECIMAL(30,6) NULL COMMENT '浮点值', LONG_VALUE BIGINT NULL COMMENT '整数型', DATE_VALUE DATE NULL COMMENT '日期值', - TIMESTAMP_VALUE TIMESTAMP(3) NULL COMMENT '时间点值', + TIMESTAMP_VALUE DATETIME(3) NULL COMMENT '时间点值', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_wf_output primary key (WF_ID,FIELD_NAME) ); @@ -181,12 +181,12 @@ CREATE TABLE nop_wf_var( DECIMAL_VALUE DECIMAL(30,6) NULL COMMENT '浮点值', LONG_VALUE BIGINT NULL COMMENT '整数型', DATE_VALUE DATE NULL COMMENT '日期值', - TIMESTAMP_VALUE TIMESTAMP(3) NULL COMMENT '时间点值', + TIMESTAMP_VALUE DATETIME(3) NULL COMMENT '时间点值', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_wf_var primary key (WF_ID,FIELD_NAME) ); @@ -196,7 +196,7 @@ CREATE TABLE nop_wf_step_instance_link( NEXT_STEP_ID VARCHAR(32) NOT NULL COMMENT '下一步骤 ID', EXEC_ACTION VARCHAR(200) NOT NULL COMMENT '执行动作', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', constraint PK_nop_wf_step_instance_link primary key (WF_ID,STEP_ID,NEXT_STEP_ID) ); @@ -206,7 +206,7 @@ CREATE TABLE nop_wf_action( STEP_ID VARCHAR(32) NOT NULL COMMENT '工作流步骤ID', ACTION_NAME VARCHAR(200) NOT NULL COMMENT '动作名称', DISPLAY_NAME VARCHAR(200) NOT NULL COMMENT '动作显示名称', - EXEC_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '执行时刻', + EXEC_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '执行时刻', CALLER_ID VARCHAR(50) NULL COMMENT '调用者ID', CALLER_NAME VARCHAR(50) NULL COMMENT '调用者姓名', OPINION VARCHAR(4000) NULL COMMENT '意见', @@ -214,9 +214,9 @@ CREATE TABLE nop_wf_action( ERR_MSG VARCHAR(4000) NULL COMMENT '错误消息', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', constraint PK_nop_wf_action primary key (SID) ); @@ -232,13 +232,13 @@ CREATE TABLE nop_wf_work( OWNER_NAME VARCHAR(50) NULL COMMENT '拥有者姓名', CALLER_ID VARCHAR(50) NULL COMMENT '调用者ID', CALLER_NAME VARCHAR(50) NULL COMMENT '调用者姓名', - READ_TIME TIMESTAMP(3) NULL COMMENT '读取时间', - FINISH_TIME TIMESTAMP(3) NULL COMMENT '完成时间', + READ_TIME DATETIME(3) NULL COMMENT '读取时间', + FINISH_TIME DATETIME(3) NULL COMMENT '完成时间', VERSION INTEGER NOT NULL COMMENT '数据版本', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', UPDATED_BY VARCHAR(50) NOT NULL COMMENT '修改人', - UPDATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', + UPDATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '修改时间', REMARK VARCHAR(200) NULL COMMENT '备注', constraint PK_nop_wf_work primary key (WORK_ID) ); @@ -252,7 +252,7 @@ CREATE TABLE nop_wf_log( LOG_MSG VARCHAR(4000) NULL COMMENT '日志消息', ERR_CODE VARCHAR(200) NULL COMMENT '错误码', CREATED_BY VARCHAR(50) NOT NULL COMMENT '创建人', - CREATE_TIME TIMESTAMP(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', + CREATE_TIME DATETIME(3) DEFAULT CURRENT_TIMESTAMP(3) NOT NULL COMMENT '创建时间', constraint PK_nop_wf_log primary key (SID) ); diff --git a/nop-wf/nop-wf-api/src/main/resources/_vfs/nop/wf/model/nop-wf.api.xml b/nop-wf/nop-wf-api/src/main/resources/_vfs/nop/wf/model/nop-wf.api.xml index 166087877..894d5bded 100644 --- a/nop-wf/nop-wf-api/src/main/resources/_vfs/nop/wf/model/nop-wf.api.xml +++ b/nop-wf/nop-wf-api/src/main/resources/_vfs/nop/wf/model/nop-wf.api.xml @@ -9,27 +9,28 @@ - + io.nop.wf.api.beans.WfStartRequestBean io.nop.wf.api.beans.WfStartResponseBean - + io.nop.wf.api.beans.WfSubFlowEndRequestBean void - + io.nop.wf.api.beans.WfActionRequestBean java.lang.Object - + io.nop.wf.api.beans.WfCommandRequestBean void - + io.nop.wf.api.beans.WfCommandRequestBean void - + io.nop.wf.api.beans.WfCommandRequestBean void diff --git a/nop-xdefs/src/main/resources/_vfs/nop/schema/api.xdef b/nop-xdefs/src/main/resources/_vfs/nop/schema/api.xdef index 6d2d0c02b..bd40c6ce3 100644 --- a/nop-xdefs/src/main/resources/_vfs/nop/schema/api.xdef +++ b/nop-xdefs/src/main/resources/_vfs/nop/schema/api.xdef @@ -42,7 +42,7 @@ --> + xdef:name="ApiMethodModel" mutation="!boolean=false">