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 600e60d49..842fe61bb 100644 Binary files a/nop-sys/model/nop-sys.orm.xlsx and b/nop-sys/model/nop-sys.orm.xlsx differ 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">