diff --git a/build.bat b/build.bat index ff6a8433b7fc3616654981135fec32c5566d24e1..e34071580cb0c719b90ca2ce70013c6505f024e8 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.9.1" +set version="1.9.2" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 6df7223084bb6b2bd7376f1a87c90e9e4a011852..d82f611068526134af9de15ecd5338be50b161c0 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.9.1" +version="1.9.2" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 1435a1979454f00cce4bbbb7b7b3eb288b299d37..94e8b94e87486600b36417b6ea91761cab4e2d64 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +## 1.9.2 + +- 【修复】简单数组类型显示方式错误 [#I3ZFCU](https://gitee.com/durcframework/torna/issues/I3ZFCU) +- 【优化】优化markdown导出 [#I3Z9NS](https://gitee.com/durcframework/torna/issues/I3Z9NS) + ## 1.9.1 - 【增强】mock添加一个配置,忽略query + body diff --git a/mysql-clean.sql b/mysql-clean.sql new file mode 100644 index 0000000000000000000000000000000000000000..ab0242e43324046d5a05dee751a840cf1ee7eb81 --- /dev/null +++ b/mysql-clean.sql @@ -0,0 +1,441 @@ +-- 适用于MySQL5.6.5+ +-- 备注:5.5.3开始支持utf8mb4,5.6.5开始支持CURRENT_TIMESTAMP(datetime) +-- 干净的数据 + +CREATE DATABASE IF NOT EXISTS `torna` DEFAULT CHARACTER SET utf8mb4 DEFAULT COLLATE utf8mb4_general_ci; +USE `torna`; + + +DROP TABLE IF EXISTS `user_subscribe`; +DROP TABLE IF EXISTS `user_message`; +DROP TABLE IF EXISTS `user_info`; +DROP TABLE IF EXISTS `user_dingtalk_info`; +DROP TABLE IF EXISTS `system_config`; +DROP TABLE IF EXISTS `space_user`; +DROP TABLE IF EXISTS `space`; +DROP TABLE IF EXISTS `share_content`; +DROP TABLE IF EXISTS `share_config`; +DROP TABLE IF EXISTS `prop`; +DROP TABLE IF EXISTS `project_user`; +DROP TABLE IF EXISTS `project`; +DROP TABLE IF EXISTS `open_user`; +DROP TABLE IF EXISTS `module_config`; +DROP TABLE IF EXISTS `module`; +DROP TABLE IF EXISTS `mock_config`; +DROP TABLE IF EXISTS `enum_item`; +DROP TABLE IF EXISTS `enum_info`; +DROP TABLE IF EXISTS `doc_param`; +DROP TABLE IF EXISTS `doc_info`; +DROP TABLE IF EXISTS `compose_project`; +DROP TABLE IF EXISTS `compose_doc`; + + +CREATE TABLE `compose_doc` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `doc_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'doc_info.id', + `project_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'compose_project.id', + `is_folder` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否文件夹', + `folder_name` varchar(64) NOT NULL DEFAULT '' COMMENT '文件夹名称', + `parent_id` bigint(20) NOT NULL DEFAULT '0', + `origin` varchar(128) NOT NULL DEFAULT '' COMMENT '文档来源', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人', + `order_index` int(10) unsigned NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_projectid` (`project_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文档引用'; + + +CREATE TABLE `compose_project` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '项目名称', + `description` varchar(128) NOT NULL DEFAULT '' COMMENT '项目描述', + `space_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '所属空间,space.id', + `type` tinyint(4) NOT NULL DEFAULT '1' COMMENT '访问形式,1:公开,2:加密', + `password` varchar(64) NOT NULL DEFAULT '' COMMENT '访问密码', + `creator_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '创建者userid', + `creator_name` varchar(64) NOT NULL DEFAULT '', + `modifier_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `modifier_name` varchar(64) NOT NULL DEFAULT '', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '排序索引', + `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '1:有效,0:无效', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_spaceid` (`space_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组合项目表'; + + +CREATE TABLE `doc_info` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(64) NOT NULL DEFAULT '' COMMENT '唯一id,接口规则:md5(module_id:parent_id:url:http_method)。分类规则:md5(module_id:parent_id:name)', + `name` varchar(128) NOT NULL DEFAULT '' COMMENT '文档名称', + `description` text NOT NULL COMMENT '文档描述', + `author` varchar(64) NOT NULL DEFAULT '' COMMENT '维护人', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '0:http,1:dubbo', + `url` varchar(128) NOT NULL DEFAULT '' COMMENT '访问URL', + `http_method` varchar(12) NOT NULL DEFAULT '' COMMENT 'http方法', + `content_type` varchar(128) NOT NULL DEFAULT '' COMMENT 'contentType', + `is_folder` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否是分类,0:不是,1:是', + `parent_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '父节点', + `module_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '模块id,module.id', + `is_use_global_headers` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否使用全局请求参数', + `is_use_global_params` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否使用全局请求参数', + `is_use_global_returns` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否使用全局返回参数', + `is_request_array` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否请求数组', + `is_response_array` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否返回数组', + `request_array_type` varchar(16) NOT NULL DEFAULT 'object' COMMENT '请求数组时元素类型', + `response_array_type` varchar(16) NOT NULL DEFAULT 'object' COMMENT '返回数组时元素类型', + `create_mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '新增操作方式,0:人工操作,1:开放平台推送', + `modify_mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '修改操作方式,0:人工操作,1:开放平台推送', + `creator_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '创建人', + `creator_name` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者昵称user_info.nickname', + `modifier_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '修改人', + `modifier_name` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者昵称user_info.realname', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '排序索引', + `remark` varchar(128) NOT NULL DEFAULT '' COMMENT '备注', + `is_show` tinyint(4) NOT NULL DEFAULT '1' COMMENT '是否显示', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_data_id` (`data_id`) USING BTREE, + KEY `idx_moduleid` (`module_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文档信息'; + + +CREATE TABLE `doc_param` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(64) NOT NULL DEFAULT '' COMMENT '唯一id,md5(doc_id:parent_id:style:name)', + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '字段名称', + `type` varchar(64) NOT NULL DEFAULT 'String' COMMENT '字段类型', + `required` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否必须,1:是,0:否', + `max_length` varchar(64) NOT NULL DEFAULT '-' COMMENT '最大长度', + `example` varchar(1024) NOT NULL DEFAULT '' COMMENT '示例值', + `description` text NOT NULL COMMENT '描述', + `enum_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'enum_info.id', + `doc_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'doc_info.id', + `parent_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `style` tinyint(4) NOT NULL DEFAULT '0' COMMENT '0:path, 1:header, 2:请求参数,3:返回参数,4:错误码', + `create_mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '新增操作方式,0:人工操作,1:开放平台推送', + `modify_mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '修改操作方式,0:人工操作,1:开放平台推送', + `creator_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `creator_name` varchar(64) NOT NULL DEFAULT '', + `modifier_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `modifier_name` varchar(64) NOT NULL DEFAULT '', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '排序索引', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_dataid` (`data_id`) USING BTREE, + KEY `idx_docid` (`doc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='文档参数'; + + +CREATE TABLE `enum_info` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `data_id` varchar(64) NOT NULL DEFAULT '' COMMENT '唯一id,md5(module_id:name)', + `name` varchar(128) NOT NULL DEFAULT '' COMMENT '枚举名称', + `description` varchar(128) NOT NULL DEFAULT '' COMMENT '枚举说明', + `module_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'module.id', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_moduleid` (`module_id`) USING BTREE, + KEY `idx_dataid` (`data_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='枚举信息'; + + +CREATE TABLE `enum_item` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `enum_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'enum_info.id', + `name` varchar(128) NOT NULL DEFAULT '' COMMENT '名称,字面值', + `type` varchar(64) NOT NULL DEFAULT '' COMMENT '类型', + `value` varchar(64) NOT NULL DEFAULT '' COMMENT '枚举值', + `description` varchar(128) NOT NULL DEFAULT '' COMMENT '枚举描述', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '排序索引', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_enumid` (`enum_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='枚举详情'; + + +CREATE TABLE `mock_config` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '名称', + `data_id` varchar(64) NOT NULL DEFAULT '' COMMENT 'md5(path+query+body)', + `path` varchar(128) NOT NULL DEFAULT '', + `ip` varchar(64) NOT NULL DEFAULT '' COMMENT '过滤ip', + `request_data` text NOT NULL COMMENT '请求参数', + `request_data_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '参数类型,0:KV形式,1:json形式', + `http_status` int(11) NOT NULL DEFAULT '200' COMMENT 'http状态', + `delay_mills` int(11) NOT NULL DEFAULT '0' COMMENT '延迟时间,单位毫秒', + `result_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '返回类型,0:自定义内容,1:脚本内容', + `response_headers` text NOT NULL COMMENT '响应header,数组结构', + `response_body` text NOT NULL COMMENT '响应结果', + `mock_script` text COMMENT 'mock脚本', + `mock_result` text COMMENT 'mock结果', + `doc_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '文档id', + `remark` varchar(128) NOT NULL DEFAULT '' COMMENT '备注', + `creator_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '创建人id', + `creator_name` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人姓名', + `modifier_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '修改人id', + `modifier_name` varchar(64) DEFAULT NULL COMMENT '修改人', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_docid` (`doc_id`) USING BTREE, + KEY `idx_dataid` (`data_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='mock配置'; + + +CREATE TABLE `module` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '模块名称', + `project_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'project.id', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '模块类型,0:自定义添加,1:swagger导入,2:postman导入', + `import_url` varchar(128) NOT NULL DEFAULT '' COMMENT '导入url', + `basic_auth_username` varchar(128) NOT NULL DEFAULT '' COMMENT 'basic认证用户名', + `basic_auth_password` varchar(128) NOT NULL DEFAULT '' COMMENT 'basic认证密码', + `token` varchar(128) NOT NULL DEFAULT '' COMMENT '开放接口调用token', + `create_mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '新增操作方式,0:人工操作,1:开放平台推送', + `modify_mode` tinyint(4) NOT NULL DEFAULT '0' COMMENT '修改操作方式,0:人工操作,1:开放平台推送', + `creator_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `modifier_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '排序索引', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_token` (`token`) USING BTREE, + KEY `idx_projectid` (`project_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目模块'; + + +CREATE TABLE `module_config` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `module_id` bigint(11) unsigned NOT NULL DEFAULT '0', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '配置类型,1:全局header', + `config_key` varchar(128) NOT NULL DEFAULT '' COMMENT '配置key', + `config_value` varchar(128) NOT NULL DEFAULT '' COMMENT '配置值', + `extend_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `description` varchar(256) NOT NULL DEFAULT '' COMMENT '描述', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_moduleid_type` (`module_id`,`type`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置'; + + +CREATE TABLE `open_user` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `app_key` varchar(100) NOT NULL COMMENT 'appKey', + `secret` varchar(200) DEFAULT NULL COMMENT 'secret', + `status` tinyint(4) unsigned NOT NULL DEFAULT '1' COMMENT '1启用,0禁用', + `applicant` varchar(64) NOT NULL DEFAULT '', + `space_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'space.id', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_app_key` (`app_key`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='开放用户'; + + +CREATE TABLE `project` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '项目名称', + `description` varchar(128) NOT NULL DEFAULT '' COMMENT '项目描述', + `space_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '所属空间,space.id', + `is_private` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否私有项目,1:是,0:否', + `creator_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '创建者userid', + `creator_name` varchar(64) NOT NULL DEFAULT '', + `modifier_id` bigint(20) unsigned NOT NULL DEFAULT '0', + `modifier_name` varchar(64) NOT NULL DEFAULT '', + `order_index` int(11) NOT NULL DEFAULT '0' COMMENT '排序索引', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `uk_name` (`creator_id`,`name`) USING BTREE, + KEY `idx_spaceid` (`space_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目表'; + + +CREATE TABLE `project_user` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `project_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'project.id', + `user_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'user_info.id', + `role_code` varchar(64) NOT NULL DEFAULT '0' COMMENT '角色,guest:访客,dev:开发者,admin:项目管理员', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_projectid_userid` (`project_id`,`user_id`) USING BTREE, + KEY `idx_userid` (`user_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='项目用户关系表'; + + +CREATE TABLE `prop` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `ref_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '关联id', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '类型,0:doc_info属性', + `name` varchar(64) NOT NULL DEFAULT '', + `val` text NOT NULL, + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_docid_name` (`ref_id`,`type`,`name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='属性表'; + + +CREATE TABLE `share_config` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '分享形式,1:公开,2:加密', + `password` varchar(128) NOT NULL DEFAULT '' COMMENT '密码', + `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '状态,1:有效,0:无效', + `module_id` bigint(20) NOT NULL DEFAULT '0' COMMENT 'module.id', + `is_all` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否为全部文档', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `remark` varchar(128) NOT NULL DEFAULT '' COMMENT '备注', + `creator_name` varchar(64) NOT NULL DEFAULT '' COMMENT '创建人', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_moduleid` (`module_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='分享配置表'; + + +CREATE TABLE `share_content` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `share_config_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'share_config.id', + `doc_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '文档id', + `parent_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '父id', + `is_share_folder` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否分享整个分类', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_shareconfigid_docid` (`share_config_id`,`doc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='分享详情'; + + +CREATE TABLE `space` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '空间名称', + `creator_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '创建者userid', + `creator_name` varchar(64) NOT NULL DEFAULT '', + `modifier_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '创建者userid', + `modifier_name` varchar(64) NOT NULL DEFAULT '', + `is_compose` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否组合空间', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='分组表'; + + +CREATE TABLE `space_user` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'user_info.id', + `space_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'space.id', + `role_code` varchar(64) NOT NULL DEFAULT '' COMMENT '角色,guest:访客,dev:开发者,admin:空间管理员', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_groupid_userid` (`space_id`,`user_id`) USING BTREE, + KEY `idx_userid` (`user_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='分组用户关系表'; + + +CREATE TABLE `system_config` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `config_key` varchar(64) NOT NULL DEFAULT '', + `config_value` varchar(256) NOT NULL DEFAULT '', + `remark` varchar(128) NOT NULL DEFAULT '', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_configkey` (`config_key`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='系统配置表'; + + +CREATE TABLE `user_dingtalk_info` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `nick` varchar(64) NOT NULL DEFAULT '' COMMENT '用户在钉钉上面的昵称', + `name` varchar(64) NOT NULL DEFAULT '' COMMENT '员工名称。', + `email` varchar(128) NOT NULL DEFAULT '' COMMENT '员工邮箱。', + `userid` varchar(128) NOT NULL DEFAULT '' COMMENT '员工的userid。', + `unionid` varchar(128) NOT NULL DEFAULT '' COMMENT '用户在当前开放应用所属企业的唯一标识。', + `openid` varchar(128) NOT NULL DEFAULT '' COMMENT '用户在当前开放应用内的唯一标识。', + `user_info_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'user_info.id', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_unionid` (`unionid`) USING BTREE, + KEY `idx_openid` (`openid`) USING BTREE, + KEY `idx_userid` (`user_info_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='钉钉开放平台用户'; + + +CREATE TABLE `user_info` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `username` varchar(128) NOT NULL DEFAULT '' COMMENT '登录账号/邮箱', + `password` varchar(128) NOT NULL DEFAULT '' COMMENT '登录密码', + `nickname` varchar(64) NOT NULL DEFAULT '' COMMENT '昵称', + `is_super_admin` tinyint(4) NOT NULL DEFAULT '0' COMMENT '是否是超级管理员', + `source` varchar(64) NOT NULL DEFAULT 'register', + `email` varchar(128) NOT NULL DEFAULT '', + `status` tinyint(4) NOT NULL DEFAULT '1' COMMENT '0:禁用,1:启用,2:重设密码', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_username` (`username`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户表'; + + +CREATE TABLE `user_message` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'user_info.id', + `message` varchar(256) NOT NULL DEFAULT '', + `is_read` tinyint(4) NOT NULL DEFAULT '0', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '同user_subscribe.type', + `source_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT '同user_subscribe.source_id', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + KEY `idx_userid` (`user_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='站内消息'; + + +CREATE TABLE `user_subscribe` ( + `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, + `user_id` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'user_info.id', + `type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '类型,1:订阅接口,2:订阅项目', + `source_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '关联id,当type=1对应doc_info.id;type=2对应project.id', + `is_deleted` tinyint(4) NOT NULL DEFAULT '0', + `gmt_create` datetime DEFAULT CURRENT_TIMESTAMP, + `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_userid_type_sourceid` (`user_id`,`type`,`source_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户订阅表'; + + + +INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'torna.version','11','当前内部版本号。不要删除这条记录!!',0,'2021-05-25 18:03:08','2021-05-25 18:03:08'); + +INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_admin`, `source`, `email`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'admin@torna.cn','f1e27f8ec06b0ea415583c26457dd111','超级管理员',1,'register','admin@torna.cn',1,0,'2020-12-15 09:04:13','2021-05-25 18:03:07'); diff --git a/pom.xml b/pom.xml index 1fab6c4bff75ebf1287c2490205e74c7eb45e353..069985ffe0b877e6b9ceb13253dd16876d5c6f34 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.9.1 + 1.9.2 1.8 diff --git a/readme.md b/readme.md index 9c14a8c9c7042c728e6f1e617cfee3dff6a4cc37..bbbc0ee7f279bfb6ac4d411499be286ff8d45d15 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ Torna弥补了传统文档生成工具(如swagger)的不如之处,在保 | 模块 | 版本 | | :----: | :----: | -| Torna | 1.9.0 | +| Torna | 1.9.2 | | sdk-java | ![maven](https://img.shields.io/maven-central/v/cn.torna/torna-sdk) | | swagger-plugin | ![maven](https://img.shields.io/maven-central/v/cn.torna/swagger-plugin) | | swagger-plugin-starter | ![maven](https://img.shields.io/maven-central/v/cn.torna/swagger-plugin-starter) | diff --git a/release.sh b/release.sh index 4d4f594517ff2331fb7084990bc0d99b17d97695..ed427a48ba30dacc9099f433ccfe7e4eb0cbac01 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.9.1" +version="1.9.2" build_folder="${app_name}-${version}" diff --git a/server/server-service/src/main/java/cn/torna/service/DocImportService.java b/server/server-service/src/main/java/cn/torna/service/DocImportService.java index 1d08f3c031aca51faa912ff6f8792f61e1969f2d..1f136d264e363e7992314e9077a55a1f0752c1ff 100644 --- a/server/server-service/src/main/java/cn/torna/service/DocImportService.java +++ b/server/server-service/src/main/java/cn/torna/service/DocImportService.java @@ -193,6 +193,9 @@ public class DocImportService { switch (mode) { case "raw": String json = body.getRaw(); + if (StringUtils.isEmpty(json)) { + return Collections.emptyList(); + } JSONObject jsonObject = JSON.parseObject(json); return this.parseParams(jsonObject); case "urlencoded":