From 619f126e24cee3788932f27da94a9ed743211b62 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 28 Apr 2021 15:19:35 +0800 Subject: [PATCH 01/50] 1.0.2 --- sdk/sdk-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 43f1a4dd..cfa19990 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.1 + 1.0.2 jar torna-sdk -- Gitee From f66a4810629540460edca3cce65127a3caef9fc5 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 3 May 2021 08:27:46 +0800 Subject: [PATCH 02/50] FIX TEST --- .../src/main/java/cn/torna/common/util/SystemUtil.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/server-common/src/main/java/cn/torna/common/util/SystemUtil.java b/server/server-common/src/main/java/cn/torna/common/util/SystemUtil.java index 95a94f23..08daaafe 100644 --- a/server/server-common/src/main/java/cn/torna/common/util/SystemUtil.java +++ b/server/server-common/src/main/java/cn/torna/common/util/SystemUtil.java @@ -16,6 +16,9 @@ public class SystemUtil { public static String getBinPath() { ApplicationHome applicationHome = new ApplicationHome(SystemUtil.class); File file = applicationHome.getSource(); + if (file == null) { + return System.getProperty("user.dir"); + } return file.getParentFile().toString(); } } -- Gitee From 299d03a8239ba79d12fe2ed123145196debe9363 Mon Sep 17 00:00:00 2001 From: tanghc Date: Sun, 9 May 2021 11:21:13 +0800 Subject: [PATCH 03/50] 1.6.2 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 4 ++++ front/public/static/openapi/overview.md | 2 +- release.sh | 2 +- sdk/sdk-java/pom.xml | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.bat b/build.bat index 664ff92b..a1682ffd 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.6.1" +set version="1.6.2" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 329e1752..a79fc6f1 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.6.1" +version="1.6.2" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 9b50e2e8..9d726dcd 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 1.6.2 + +- [enhance]文档新增`维护人`字段 + ## 1.6.1 - [fix]修复无法重置密码问题 diff --git a/front/public/static/openapi/overview.md b/front/public/static/openapi/overview.md index 7c3146e4..727f5bc8 100644 --- a/front/public/static/openapi/overview.md +++ b/front/public/static/openapi/overview.md @@ -16,7 +16,7 @@ Torna提供了一组开放接口，第三方服务可以通过开放接口来创 cn.torna torna-sdk - 1.0.3 + 1.0.4 ``` diff --git a/release.sh b/release.sh index 8f2d9fad..198c8034 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.6.1" +version="1.6.2" build_folder="${app_name}-${version}" diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 956a12ba..3a1f4e68 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.3 + 1.0.4 jar torna-sdk -- Gitee From cec1be1582d3656738c9a069e6c69599ff76185a Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 12 May 2021 08:56:37 +0800 Subject: [PATCH 04/50] 1.6.3 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 5 +++++ pom.xml | 2 +- release.sh | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index a1682ffd..b411a077 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.6.2" +set version="1.6.3" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index a79fc6f1..ed7b69d3 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.6.2" +version="1.6.3" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 9d726dcd..5319b1b7 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +# 1.6.3 + +- [enhance]优化mock，可指定path +- [enhance]优化推送 + ## 1.6.2 - [enhance]文档新增`维护人`字段 diff --git a/pom.xml b/pom.xml index 0d83c0e2..f0ecf61c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.6.1 + 1.6.3 1.8 diff --git a/release.sh b/release.sh index 198c8034..1fe9ef69 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.6.2" +version="1.6.3" build_folder="${app_name}-${version}" -- Gitee From 1be907ecebe36c5d8b343a79ecee88138aa1a468 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 14 May 2021 11:32:17 +0800 Subject: [PATCH 05/50] 1.7.0 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 7 +++++++ front/public/static/openapi/overview.md | 2 +- pom.xml | 2 +- release.sh | 2 +- sdk/sdk-java/pom.xml | 2 +- 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/build.bat b/build.bat index b411a077..8dd6f3e0 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.6.3" +set version="1.7.0" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index ed7b69d3..464375be 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.6.3" +version="1.7.0" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 5319b1b7..33370580 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # 更新日志 +## 1.7.0 + +- [feat]支持钉钉免密登录 [doc](http://torna.cn/dev/third-party-login.html) +- [feat]界面支持中英文切换（个人中心-系统设置） +- [enhance]优化导出功能 +- [upgrade]ElementUI升级到2.15.1 + # 1.6.3 - [enhance]优化mock，可指定path diff --git a/front/public/static/openapi/overview.md b/front/public/static/openapi/overview.md index 727f5bc8..2b0caf79 100644 --- a/front/public/static/openapi/overview.md +++ b/front/public/static/openapi/overview.md @@ -16,7 +16,7 @@ Torna提供了一组开放接口，第三方服务可以通过开放接口来创 cn.torna torna-sdk - 1.0.4 + 1.0.5 ``` diff --git a/pom.xml b/pom.xml index f0ecf61c..47dc343c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.6.3 + 1.7.0 1.8 diff --git a/release.sh b/release.sh index 1fe9ef69..c06092fc 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.6.3" +version="1.7.0" build_folder="${app_name}-${version}" diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 3a1f4e68..02177f66 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.4 + 1.0.5 jar torna-sdk -- Gitee From e046c6bf62e17891e974445b6b5927f042ce556b Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 14 May 2021 17:13:20 +0800 Subject: [PATCH 06/50] 1.7.0 --- readme.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/readme.md b/readme.md index 6cd9f18d..7bfb4559 100644 --- a/readme.md +++ b/readme.md @@ -98,8 +98,16 @@ **smart-doc + Torna实现文档全流程自动化** +如果您使用Java语言，推荐使用`smart-doc + Torna` + [smart-doc](https://gitee.com/smart-doc-team/smart-doc) + Torna 组成行业领先的文档生成和管理解决方案，使用smart-doc无侵入完成Java源代码和注释提取生成API文档，自动将文档推送到Torna企业级接口文档管理平台。 +通过这套组合您可以实现：只需要写完Java注释就能把接口信息推送到Torna平台，从而实现接口预览、接口调试。 + +推送的内容有：`接口名称/author/Path参数/Header/请求参数/返回参数/字典列表/公共错误码` + +如果您是非Java语言，可以使用表单页面编辑以上内容，完成后同样可以进行接口预览、调试。 + ## 开发部署 参见：[开发文档](http://torna.cn/dev/) -- Gitee From 851097823c81c9ef503cfb35a2f1edf5eea6617b Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 14 May 2021 17:33:59 +0800 Subject: [PATCH 07/50] 1.7.0 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 7bfb4559..36456edc 100644 --- a/readme.md +++ b/readme.md @@ -50,7 +50,7 @@ - 后续升级 -无特殊说明，只需要覆盖`jar文件`和`dist文件`，然后重启即可 +无特殊说明，只需要覆盖`torna.jar文件`和`dist文件夹`，然后重启即可 ### 方式2：docker运行 -- Gitee From 00088d3b2e7a89d71e9c7eb116ef32790b05ba85 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 17 May 2021 09:42:39 +0800 Subject: [PATCH 08/50] 1.7.1 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 4 ++++ pom.xml | 2 +- release.sh | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 8dd6f3e0..442d33c3 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.7.0" +set version="1.7.1" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 464375be..60adc63b 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.0" +version="1.7.1" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 33370580..edec4f8d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 1.7.1 + +- [enhance]分享页可切换语言 + ## 1.7.0 - [feat]支持钉钉免密登录 [doc](http://torna.cn/dev/third-party-login.html) diff --git a/pom.xml b/pom.xml index 47dc343c..61c8acb8 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.7.0 + 1.7.1 1.8 diff --git a/release.sh b/release.sh index c06092fc..a9ac8928 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.0" +version="1.7.1" build_folder="${app_name}-${version}" -- Gitee From 93542c05522e807eea69c5a4e7b1dd5f37035036 Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 18 May 2021 14:05:31 +0800 Subject: [PATCH 09/50] 1.7.2 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 6 ++++++ pom.xml | 2 +- release.sh | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 442d33c3..8e5b024e 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.7.1" +set version="1.7.2" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 60adc63b..9d092b5b 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.1" +version="1.7.2" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index edec4f8d..cd287078 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # 更新日志 +## 1.7.2 + +- [fix]swagger导入问题 +- [fix]钉钉登录下项目成员查询问题 +- [enhance]优化调试页面请求数组问题 + ## 1.7.1 - [enhance]分享页可切换语言 diff --git a/pom.xml b/pom.xml index 61c8acb8..550fa78e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.7.1 + 1.7.2 1.8 diff --git a/release.sh b/release.sh index a9ac8928..cafffe22 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.1" +version="1.7.2" build_folder="${app_name}-${version}" -- Gitee From 63e916930596bb70d10655f7c030a3d7b7cfc894 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 19 May 2021 20:02:51 +0800 Subject: [PATCH 10/50] 1.7.3 --- build.bat | 2 +- build.sh | 2 +- pom.xml | 2 +- release.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 8e5b024e..dc0ea8c8 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.7.2" +set version="1.7.3" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 9d092b5b..c167a23a 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.2" +version="1.7.3" build_folder="${app_name}-${version}" diff --git a/pom.xml b/pom.xml index 550fa78e..cbe21f5c 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.7.2 + 1.7.3 1.8 diff --git a/release.sh b/release.sh index cafffe22..164860d6 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.2" +version="1.7.3" build_folder="${app_name}-${version}" -- Gitee From 63cb0bdc5fce9c469a0a2ff1c087346b6abff5a1 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 19 May 2021 20:08:34 +0800 Subject: [PATCH 11/50] 1.7.3 --- changelog.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changelog.md b/changelog.md index cd287078..f3fbe955 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +## 1.7.3 + +- [enhance]支持Nginx配置contextPath +- [enhance]支持批量推送枚举 + ## 1.7.2 - [fix]swagger导入问题 -- Gitee From f8714994d69159decdd942ec98d19ff52d63da23 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 19 May 2021 20:23:37 +0800 Subject: [PATCH 12/50] 1.0.6 --- sdk/sdk-java/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 02177f66..029fc1a2 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.5 + 1.0.6 jar torna-sdk -- Gitee From 948b2a7b6949b604f8e9d517067a52fa821cc74e Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 20 May 2021 09:09:32 +0800 Subject: [PATCH 13/50] 1.7.3 --- changelog.md | 130 +++++++++++++++++++++++++-------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/changelog.md b/changelog.md index f3fbe955..33bdfe03 100644 --- a/changelog.md +++ b/changelog.md @@ -2,96 +2,96 @@ ## 1.7.3 -- [enhance]支持Nginx配置contextPath -- [enhance]支持批量推送枚举 +- 【增强】支持Nginx配置contextPath +- 【增强】支持批量推送枚举 ## 1.7.2 -- [fix]swagger导入问题 -- [fix]钉钉登录下项目成员查询问题 -- [enhance]优化调试页面请求数组问题 +- 【修复】swagger导入问题 +- 【修复】钉钉登录下项目成员查询问题 +- 【增强】优化调试页面请求数组问题 ## 1.7.1 -- [enhance]分享页可切换语言 +- 【增强】分享页可切换语言 ## 1.7.0 -- [feat]支持钉钉免密登录 [doc](http://torna.cn/dev/third-party-login.html) -- [feat]界面支持中英文切换（个人中心-系统设置） -- [enhance]优化导出功能 -- [upgrade]ElementUI升级到2.15.1 +- 【特性】支持钉钉免密登录 [doc](http://torna.cn/dev/third-party-login.html) +- 【特性】界面支持中英文切换（个人中心-系统设置） +- 【增强】优化导出功能 +- 【更新】ElementUI升级到2.15.1 # 1.6.3 -- [enhance]优化mock，可指定path -- [enhance]优化推送 +- 【增强】优化mock，可指定path +- 【增强】优化推送 ## 1.6.2 -- [enhance]文档新增`维护人`字段 +- 【增强】文档新增`维护人`字段 ## 1.6.1 -- [fix]修复无法重置密码问题 +- 【修复】修复无法重置密码问题 ## 1.6.0 -- [feat]支持Query参数 -- [feat]支持文档复制 -- [feat]推送接口可指定推送人 -- [enhance]优化接口调试，可记住调试参数 -- [enhance]优化文档导出，可勾选部分文档 [#I3O0CB](https://gitee.com/durcframework/torna/issues/I3O0CB) -- [enhance]公共请求参数支持数据节点 -- [enhance]公共返回参数支持添加子节点 -- [fix]修复文档分享勾选文档问题 +- 【特性】支持Query参数 +- 【特性】支持文档复制 +- 【特性】推送接口可指定推送人 +- 【增强】优化接口调试，可记住调试参数 +- 【增强】优化文档导出，可勾选部分文档 [#I3O0CB](https://gitee.com/durcframework/torna/issues/I3O0CB) +- 【增强】公共请求参数支持数据节点 +- 【增强】公共返回参数支持添加子节点 +- 【修复】修复文档分享勾选文档问题 ## 1.5.0 -- [feat]支持Dubbo文档展示 -- [fix]修改文档出现新增文档问题 [#I3O0E6](https://gitee.com/durcframework/torna/issues/I3O0E6) -- [fix]推送不显示错误码问题 -- [enhance]接口调试页自动格式化json +- 【特性】支持Dubbo文档展示 +- 【修复】修改文档出现新增文档问题 [#I3O0E6](https://gitee.com/durcframework/torna/issues/I3O0E6) +- 【修复】推送不显示错误码问题 +- 【增强】接口调试页自动格式化json ## 1.4.3 -- [enhance]优化文档编辑页预览 -- [fix]修复公共返回参数显示 +- 【增强】优化文档编辑页预览 +- 【修复】修复公共返回参数显示 ## 1.4.2 -- [enhance]优化文档返回示例显示 -- [enhance]文档页新增请求示例 -- [enhance]文档页菜单显示HttpMethod -- [fix]修复删除参数问题 [#I3NCRT](https://gitee.com/durcframework/torna/issues/I3NCRT) +- 【增强】优化文档返回示例显示 +- 【增强】文档页新增请求示例 +- 【增强】文档页菜单显示HttpMethod +- 【修复】修复删除参数问题 [#I3NCRT](https://gitee.com/durcframework/torna/issues/I3NCRT) ## 1.4.1 -- [enhance]公共请求参数支持定义子节点 [#I3M33I](https://gitee.com/durcframework/torna/issues/I3M33I) -- [enhance]docker启动指定时区 [#I3MDPH](https://gitee.com/durcframework/torna/issues/I3MDPH) +- 【增强】公共请求参数支持定义子节点 [#I3M33I](https://gitee.com/durcframework/torna/issues/I3M33I) +- 【增强】docker启动指定时区 [#I3MDPH](https://gitee.com/durcframework/torna/issues/I3MDPH) ## 1.4.0 -- [feat]新增文档分享功能 +- 【特性】新增文档分享功能 ## 1.3.4 -- [fix]调试接口上传文件、下载文件问题 +- 【修复】调试接口上传文件、下载文件问题 ## 1.3.3 -- [enhance]优化文档浏览页描述字段显示，支持HTML标签 -- [enhance]支持多级推送（嵌套文件夹） -- [fix]修复接口更新返回值对象后推送不更新问题 [#I3IGWT](https://gitee.com/durcframework/torna/issues/I3IGWT) +- 【增强】优化文档浏览页描述字段显示，支持HTML标签 +- 【增强】支持多级推送（嵌套文件夹） +- 【修复】修复接口更新返回值对象后推送不更新问题 [#I3IGWT](https://gitee.com/durcframework/torna/issues/I3IGWT) ## 1.3.2 -- [fix]参数删除后推送文档，再还原后推送不显示问题 +- 【修复】参数删除后推送文档，再还原后推送不显示问题 ## 1.3.1 -- [feat]推送支持path参数 -- [fix]多线程并发情况下推送文档丢失问题 +- 【特性】推送支持path参数 +- 【修复】多线程并发情况下推送文档丢失问题 ## 1.3.0 @@ -99,29 +99,29 @@ ## 1.2.4 -- [enhance]优化树形表格显示 [#I3EHAP](https://gitee.com/durcframework/torna/issues/I3EHAP) -- [fix]同步swagger参数没有更新问题 -- [fix]保存文档基本信息无效问题 +- 【增强】优化树形表格显示 [#I3EHAP](https://gitee.com/durcframework/torna/issues/I3EHAP) +- 【修复】同步swagger参数没有更新问题 +- 【修复】保存文档基本信息无效问题 ## 1.2.3 -- [feat]调试接口可选择是否使用代理 +- 【特性】调试接口可选择是否使用代理 ## 1.2.2 -- [fix]Java11无法打包问题 +- 【修复】Java11无法打包问题 ## 1.2.1 -- [fix]推送获取错误token问题 +- 【修复】推送获取错误token问题 ## 1.2.0 -- [feat]新增全局请求参数 -- [feat]新增全局返回参数 -- [refactor]优化字典管理交互 -- [refactor]优化模块设置交互 -- [refactor]优化加载文档性能问题 +- 【特性】新增全局请求参数 +- 【特性】新增全局返回参数 +- 【优化】优化字典管理交互 +- 【优化】优化模块设置交互 +- 【优化】优化加载文档性能问题 ## 1.1.3 @@ -130,30 +130,30 @@ ## 1.1.2 -- [fix]smart-doc推送无法删除旧文档问题 [#I3CPJL](https://gitee.com/durcframework/torna/issues/I3CPJL) +- 【修复】smart-doc推送无法删除旧文档问题 [#I3CPJL](https://gitee.com/durcframework/torna/issues/I3CPJL) ## 1.1.1 -- [fix]smart-doc推送无法显示文档问题 [#I3CSJS](https://gitee.com/durcframework/torna/issues/I3CSJS) +- 【修复】smart-doc推送无法显示文档问题 [#I3CSJS](https://gitee.com/durcframework/torna/issues/I3CSJS) ## 1.1.0 -- [feat]支持Mock -- [fix]文档分类无法删除问题 [#I3CPJ5](https://gitee.com/durcframework/torna/issues/I3CPJ5) -- [fix]smart-doc推送无法删除旧文档问题 [#I3CPJL](https://gitee.com/durcframework/torna/issues/I3CPJL) +- 【特性】支持Mock +- 【修复】文档分类无法删除问题 [#I3CPJ5](https://gitee.com/durcframework/torna/issues/I3CPJ5) +- 【修复】smart-doc推送无法删除旧文档问题 [#I3CPJL](https://gitee.com/durcframework/torna/issues/I3CPJL) ## 1.0.2 -- [fix]同步swagger前端报错问题 -- [fix]Postman导入后无法调试问题 -- [feat]升级服务 +- 【修复】同步swagger前端报错问题 +- 【修复】Postman导入后无法调试问题 +- 【特性】升级服务 ## 1.0.1 -- [feat]支持docker部署 [#I3AWCB](https://gitee.com/durcframework/torna/issues/I3AWCB) -- [fix]OpenAPI推送无法删除字段 -- [fix]进入admin管理页报错问题 -- [fix]调试页面跳转模块管理无法设置调试环境问题 +- 【特性】支持docker部署 [#I3AWCB](https://gitee.com/durcframework/torna/issues/I3AWCB) +- 【修复】OpenAPI推送无法删除字段 +- 【修复】进入admin管理页报错问题 +- 【修复】调试页面跳转模块管理无法设置调试环境问题 ## 1.0.0 -- Gitee From 78298dcfe14113ee269cc0c01ae7c36e7dfae98a Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 25 May 2021 18:23:23 +0800 Subject: [PATCH 14/50] 1.8.0 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 6 ++++++ plugin/swagger-plugin/pom.xml | 11 +++++------ pom.xml | 2 +- release.sh | 2 +- sdk/sdk-java/pom.xml | 2 +- .../src/main/java/cn/torna/api/open/DocApi.java | 3 --- .../cn/torna/api/open/param/DocParamPushParam.java | 1 + 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/build.bat b/build.bat index dc0ea8c8..892db15e 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.7.3" +set version="1.8.0" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index c167a23a..a9e446c1 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.3" +version="1.8.0" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 33bdfe03..91013aae 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # 更新日志 +## 1.8.0 + +- 【特性】新增聚合空间，可聚合其它空间中的文档统一展示 +- 【增强】新增swagger插件，自动将本地文档推送到Torna服务器 +- 【增强】推送接口支持排序字段 + ## 1.7.3 - 【增强】支持Nginx配置contextPath diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 685c4750..3150c134 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -38,6 +38,11 @@ + + cn.torna + torna-sdk + 1.0.7 + junit junit @@ -83,12 +88,6 @@ 2.4.0 true - - cn.torna - torna-sdk - 1.0.3 - - diff --git a/pom.xml b/pom.xml index 1877411c..07eff21a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.7.3 + 1.8.0 1.8 diff --git a/release.sh b/release.sh index 164860d6..b6b1a188 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.7.3" +version="1.8.0" build_folder="${app_name}-${version}" diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 029fc1a2..7fdc4661 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.6 + 1.0.7 jar torna-sdk diff --git a/server/server-api/src/main/java/cn/torna/api/open/DocApi.java b/server/server-api/src/main/java/cn/torna/api/open/DocApi.java index a454748f..c5277286 100644 --- a/server/server-api/src/main/java/cn/torna/api/open/DocApi.java +++ b/server/server-api/src/main/java/cn/torna/api/open/DocApi.java @@ -87,9 +87,6 @@ public class DocApi { @Value("${torna.push.print-content}") private boolean watchPushContent; - @Value("${torna.common-error-code-name:公共错误码}") - private String commonErrorCodeName; - @Api(name = "doc.push") @ApiDocMethod(description = "推送文档", order = 0, remark = "把第三方文档推送给Torna服务器") public void pushDoc(DocPushParam param) { diff --git a/server/server-api/src/main/java/cn/torna/api/open/param/DocParamPushParam.java b/server/server-api/src/main/java/cn/torna/api/open/param/DocParamPushParam.java index 314e3fd5..9a93032c 100644 --- a/server/server-api/src/main/java/cn/torna/api/open/param/DocParamPushParam.java +++ b/server/server-api/src/main/java/cn/torna/api/open/param/DocParamPushParam.java @@ -69,5 +69,6 @@ public class DocParamPushParam { private Byte isDeleted = Booleans.FALSE; /** 排序 */ + @ApiDocField(description = "排序字段", example = "1") private Integer orderIndex; } -- Gitee From fd30a27f33b27e3b55b3f29d2be8493ed21cccb5 Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 25 May 2021 18:30:25 +0800 Subject: [PATCH 15/50] 1.8.0 --- readme.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/readme.md b/readme.md index 36456edc..35d794da 100644 --- a/readme.md +++ b/readme.md @@ -4,6 +4,14 @@ +## 当前版本号 + +| 模块 | 版本 | +| :----: | :----: | +| Torna | 1.8.0 | +| sdk-java | 1.0.7 | +| swagger-plugin | 1.0.0 | + ## 特性介绍 - 支持接口文档增删改查 @@ -12,6 +20,7 @@ - 支持OpenAPI管理接口 - 支持字典管理 - 支持导出为markdown格式、html格式 +- 支持文档聚合，将不同模块中的文档聚合展示 - 支持多环境接口调试 - 支持Mock数据 - 支持文档权限管理，访客、开发者、管理员对应不同权限 @@ -20,6 +29,7 @@ - 支持设置全局请求头/请求参数/响应参数 - 支持中英文切换(i18n) - 支持docker运行 +- 提供swagger插件，快速导入swagger文档 - 提供`管理模式`和`浏览模式`双模式，管理模式用来编辑文档内容，浏览模式纯粹查阅文档，界面无其它元素干扰 - 部署简单，直接运行脚本启动程序 -- Gitee From 04e39ebf2396679572876ea41b9c42c5229ecc97 Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 25 May 2021 18:37:33 +0800 Subject: [PATCH 16/50] =?UTF-8?q?swagger=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/META-INF/spring.factories | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 plugin/swagger-plugin-starter/src/main/resources/META-INF/spring.factories diff --git a/plugin/swagger-plugin-starter/src/main/resources/META-INF/spring.factories b/plugin/swagger-plugin-starter/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9107dfcf --- /dev/null +++ b/plugin/swagger-plugin-starter/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +# Auto Configure +org.springframework.boot.autoconfigure.EnableAutoConfiguration=cn.torna.swaggerplugin.starter.TornaAutoConfiguration \ No newline at end of file -- Gitee From 903e72bb930e8d8eef47fe9d71d9822e6c6284a5 Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 25 May 2021 18:47:30 +0800 Subject: [PATCH 17/50] =?UTF-8?q?swagger=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../swaggerplugin/starter/TornaProperties.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugin/swagger-plugin-starter/src/main/java/cn/torna/swaggerplugin/starter/TornaProperties.java b/plugin/swagger-plugin-starter/src/main/java/cn/torna/swaggerplugin/starter/TornaProperties.java index a200661d..0064b577 100644 --- a/plugin/swagger-plugin-starter/src/main/java/cn/torna/swaggerplugin/starter/TornaProperties.java +++ b/plugin/swagger-plugin-starter/src/main/java/cn/torna/swaggerplugin/starter/TornaProperties.java @@ -30,19 +30,19 @@ public class TornaProperties { /** 推送人 */ private String author; /** 打开调试:true/false */ - private String debug; + private String debug = "false"; /** 接口多个method只显示 */ - private String methodWhenMulti; + private String methodWhenMulti = "GET"; /** path参数名称 */ - private String pathName; + private String pathName = "path"; /** header参数名称 */ - private String headerName; + private String headerName = "header"; /** query参数名称 */ - private String queryName; + private String queryName = "query"; /** form参数名称 */ - private String formName; + private String formName = "form"; /** body参数名称 */ - private String bodyName; + private String bodyName = "body"; } -- Gitee From 22247cb4a10d726e8120cb1b740cb066507a582e Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 26 May 2021 14:17:00 +0800 Subject: [PATCH 18/50] 1.8.0 --- mysql.sql | 137 +++++++++++++++++++++++++++++++-- mysql_compat.sql | 134 +++++++++++++++++++++++++++++++- torna-docker-compose/mysql.sql | 137 +++++++++++++++++++++++++++++++-- 3 files changed, 393 insertions(+), 15 deletions(-) diff --git a/mysql.sql b/mysql.sql index 2b108a1b..3407b718 100644 --- a/mysql.sql +++ b/mysql.sql @@ -10,9 +10,13 @@ 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`; @@ -23,6 +27,47 @@ 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 AUTO_INCREMENT=7 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 AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='组合项目表'; CREATE TABLE `doc_info` ( @@ -237,6 +282,50 @@ CREATE TABLE `project_user` ( ) ENGINE=InnoDB AUTO_INCREMENT=10 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 '空间名称', @@ -279,6 +368,24 @@ CREATE TABLE `system_config` ( ) ENGINE=InnoDB AUTO_INCREMENT=2 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 '登录账号/邮箱', @@ -325,6 +432,19 @@ CREATE TABLE `user_subscribe` ( +INSERT INTO `compose_doc` (`id`, `doc_id`, `project_id`, `is_folder`, `folder_name`, `parent_id`, `origin`, `is_deleted`, `creator`, `order_index`, `gmt_create`, `gmt_modified`) VALUES + (1,0,1,1,'订单模块',0,'',0,'超级管理员',0,'2021-05-25 18:05:23','2021-05-25 18:05:23'), + (2,0,1,1,'产品模块',0,'',0,'超级管理员',0,'2021-05-25 18:05:30','2021-05-25 18:05:30'), + (3,2,1,0,'',1,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:46','2021-05-25 18:05:46'), + (4,3,1,0,'',1,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:46','2021-05-25 18:05:46'), + (5,10,1,0,'',2,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:53','2021-05-25 18:05:53'), + (6,11,1,0,'',2,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:53','2021-05-25 18:05:53'); + + +INSERT INTO `compose_project` (`id`, `name`, `description`, `space_id`, `type`, `password`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'聚合接口','提供给第三方的接口',18,1,'',1,'超级管理员',1,'超级管理员',0,1,0,'2021-05-25 18:05:14','2021-05-25 18:05:14'); + + INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), @@ -471,6 +591,12 @@ INSERT INTO `project_user` (`id`, `project_id`, `user_id`, `role_code`, `is_dele (9,3,14,'admin',0,'2021-01-25 09:10:47','2021-01-25 09:10:47'); + + + + + + INSERT INTO `space` (`id`, `name`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `is_compose`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (9,'研发一部',2,'研发一部经理',2,'研发一部经理',0,0,'2020-12-15 09:48:13','2020-12-15 09:48:13'), (11,'研发二部',5,'研发二部经理',5,'研发二部经理',0,0,'2020-12-15 10:08:39','2020-12-15 10:08:39'), @@ -508,7 +634,9 @@ INSERT INTO `space_user` (`id`, `user_id`, `space_id`, `role_code`, `is_deleted` INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES - (1,'torna.version','9','当前内部版本号。不要删除这条记录！！',0,'2021-05-25 18:03:08','2021-05-25 18:03:08'); + (1,'torna.version','9','当前内部版本号。不要删除这条记录！！',0,'2021-05-25 18:03:08','2021-05-25 18:12:22'); + + INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_admin`, `source`, `email`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -525,7 +653,7 @@ INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_adm (14,'test@torna.cn','c19b85cecd8787ba8712ff764bf70f81','测试A',0,'register','test@torna.cn',1,0,'2021-01-25 09:08:21','2021-05-25 18:03:07'); -INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `source_id`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `source_id`, `gmt_create`, `gmt_modified`) VALUES (3,2,'超级管理员 修改了文档 获取分类信息',1,1,2,'2021-01-19 13:38:20','2021-01-19 16:28:54'), (4,2,'超级管理员 更新了【获取分类信息】，备注: 111',1,1,2,'2021-01-19 13:43:42','2021-01-19 16:30:36'), (5,2,'超级管理员 更新了【获取分类信息】，备注: 3333',1,1,2,'2021-01-19 13:43:45','2021-01-19 15:27:41'), @@ -536,7 +664,7 @@ INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `sour (10,2,'超级管理员 删除了【获取分类信息】',1,1,2,'2021-01-19 16:44:37','2021-01-19 16:46:06'); -INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,1,16,0,'2021-01-18 16:33:51','2021-01-18 16:38:58'), (2,1,1,4,0,'2021-01-18 16:41:09','2021-01-18 17:18:12'), (3,1,1,6,0,'2021-01-18 17:17:57','2021-01-18 17:17:57'), @@ -546,6 +674,3 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); - - - diff --git a/mysql_compat.sql b/mysql_compat.sql index 712f45b8..f230ea41 100644 --- a/mysql_compat.sql +++ b/mysql_compat.sql @@ -6,12 +6,17 @@ 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`; @@ -22,6 +27,47 @@ 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 NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_projectid` (`project_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 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 NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_spaceid` (`space_id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='组合项目表'; CREATE TABLE `doc_info` ( @@ -236,6 +282,50 @@ CREATE TABLE `project_user` ( ) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 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 NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + UNIQUE KEY `uk_docid_name` (`ref_id`,`type`,`name`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 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 NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_moduleid` (`module_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 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 NULL, + `gmt_modified` datetime DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_shareconfigid_docid` (`share_config_id`,`doc_id`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='分享详情'; + + CREATE TABLE `space` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `name` varchar(64) NOT NULL DEFAULT '' COMMENT '空间名称', @@ -278,6 +368,24 @@ CREATE TABLE `system_config` ( ) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 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 NULL, + `gmt_modified` datetime DEFAULT NULL, + 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=utf8 COMMENT='钉钉开放平台用户'; + + CREATE TABLE `user_info` ( `id` bigint(20) unsigned NOT NULL AUTO_INCREMENT, `username` varchar(128) NOT NULL DEFAULT '' COMMENT '登录账号/邮箱', @@ -324,6 +432,19 @@ CREATE TABLE `user_subscribe` ( +INSERT INTO `compose_doc` (`id`, `doc_id`, `project_id`, `is_folder`, `folder_name`, `parent_id`, `origin`, `is_deleted`, `creator`, `order_index`, `gmt_create`, `gmt_modified`) VALUES + (1,0,1,1,'订单模块',0,'',0,'超级管理员',0,'2021-05-25 18:05:23','2021-05-25 18:05:23'), + (2,0,1,1,'产品模块',0,'',0,'超级管理员',0,'2021-05-25 18:05:30','2021-05-25 18:05:30'), + (3,2,1,0,'',1,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:46','2021-05-25 18:05:46'), + (4,3,1,0,'',1,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:46','2021-05-25 18:05:46'), + (5,10,1,0,'',2,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:53','2021-05-25 18:05:53'), + (6,11,1,0,'',2,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:53','2021-05-25 18:05:53'); + + +INSERT INTO `compose_project` (`id`, `name`, `description`, `space_id`, `type`, `password`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'聚合接口','提供给第三方的接口',18,1,'',1,'超级管理员',1,'超级管理员',0,1,0,'2021-05-25 18:05:14','2021-05-25 18:05:14'); + + INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), @@ -470,6 +591,12 @@ INSERT INTO `project_user` (`id`, `project_id`, `user_id`, `role_code`, `is_dele (9,3,14,'admin',0,'2021-01-25 09:10:47','2021-01-25 09:10:47'); + + + + + + INSERT INTO `space` (`id`, `name`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `is_compose`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (9,'研发一部',2,'研发一部经理',2,'研发一部经理',0,0,'2020-12-15 09:48:13','2020-12-15 09:48:13'), (11,'研发二部',5,'研发二部经理',5,'研发二部经理',0,0,'2020-12-15 10:08:39','2020-12-15 10:08:39'), @@ -507,7 +634,9 @@ INSERT INTO `space_user` (`id`, `user_id`, `space_id`, `role_code`, `is_deleted` INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES - (1,'torna.version','9','当前内部版本号。不要删除这条记录！！',0,'2021-05-25 18:03:08','2021-05-25 18:03:08'); + (1,'torna.version','9','当前内部版本号。不要删除这条记录！！',0,'2021-05-25 18:03:08','2021-05-25 18:12:22'); + + INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_admin`, `source`, `email`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -544,7 +673,6 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (6,1,1,2,0,'2021-01-18 17:18:07','2021-01-18 17:18:07'), (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); - - + diff --git a/torna-docker-compose/mysql.sql b/torna-docker-compose/mysql.sql index 2b108a1b..3407b718 100644 --- a/torna-docker-compose/mysql.sql +++ b/torna-docker-compose/mysql.sql @@ -10,9 +10,13 @@ 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`; @@ -23,6 +27,47 @@ 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 AUTO_INCREMENT=7 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 AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COMMENT='组合项目表'; CREATE TABLE `doc_info` ( @@ -237,6 +282,50 @@ CREATE TABLE `project_user` ( ) ENGINE=InnoDB AUTO_INCREMENT=10 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 '空间名称', @@ -279,6 +368,24 @@ CREATE TABLE `system_config` ( ) ENGINE=InnoDB AUTO_INCREMENT=2 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 '登录账号/邮箱', @@ -325,6 +432,19 @@ CREATE TABLE `user_subscribe` ( +INSERT INTO `compose_doc` (`id`, `doc_id`, `project_id`, `is_folder`, `folder_name`, `parent_id`, `origin`, `is_deleted`, `creator`, `order_index`, `gmt_create`, `gmt_modified`) VALUES + (1,0,1,1,'订单模块',0,'',0,'超级管理员',0,'2021-05-25 18:05:23','2021-05-25 18:05:23'), + (2,0,1,1,'产品模块',0,'',0,'超级管理员',0,'2021-05-25 18:05:30','2021-05-25 18:05:30'), + (3,2,1,0,'',1,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:46','2021-05-25 18:05:46'), + (4,3,1,0,'',1,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:46','2021-05-25 18:05:46'), + (5,10,1,0,'',2,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:53','2021-05-25 18:05:53'), + (6,11,1,0,'',2,'研发一部/商城项目/故事API',0,'超级管理员',0,'2021-05-25 18:05:53','2021-05-25 18:05:53'); + + +INSERT INTO `compose_project` (`id`, `name`, `description`, `space_id`, `type`, `password`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'聚合接口','提供给第三方的接口',18,1,'',1,'超级管理员',1,'超级管理员',0,1,0,'2021-05-25 18:05:14','2021-05-25 18:05:14'); + + INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), @@ -471,6 +591,12 @@ INSERT INTO `project_user` (`id`, `project_id`, `user_id`, `role_code`, `is_dele (9,3,14,'admin',0,'2021-01-25 09:10:47','2021-01-25 09:10:47'); + + + + + + INSERT INTO `space` (`id`, `name`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `is_compose`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (9,'研发一部',2,'研发一部经理',2,'研发一部经理',0,0,'2020-12-15 09:48:13','2020-12-15 09:48:13'), (11,'研发二部',5,'研发二部经理',5,'研发二部经理',0,0,'2020-12-15 10:08:39','2020-12-15 10:08:39'), @@ -508,7 +634,9 @@ INSERT INTO `space_user` (`id`, `user_id`, `space_id`, `role_code`, `is_deleted` INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES - (1,'torna.version','9','当前内部版本号。不要删除这条记录！！',0,'2021-05-25 18:03:08','2021-05-25 18:03:08'); + (1,'torna.version','9','当前内部版本号。不要删除这条记录！！',0,'2021-05-25 18:03:08','2021-05-25 18:12:22'); + + INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_admin`, `source`, `email`, `status`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -525,7 +653,7 @@ INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_adm (14,'test@torna.cn','c19b85cecd8787ba8712ff764bf70f81','测试A',0,'register','test@torna.cn',1,0,'2021-01-25 09:08:21','2021-05-25 18:03:07'); -INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `source_id`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `source_id`, `gmt_create`, `gmt_modified`) VALUES (3,2,'超级管理员 修改了文档 获取分类信息',1,1,2,'2021-01-19 13:38:20','2021-01-19 16:28:54'), (4,2,'超级管理员 更新了【获取分类信息】，备注: 111',1,1,2,'2021-01-19 13:43:42','2021-01-19 16:30:36'), (5,2,'超级管理员 更新了【获取分类信息】，备注: 3333',1,1,2,'2021-01-19 13:43:45','2021-01-19 15:27:41'), @@ -536,7 +664,7 @@ INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `sour (10,2,'超级管理员 删除了【获取分类信息】',1,1,2,'2021-01-19 16:44:37','2021-01-19 16:46:06'); -INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,1,16,0,'2021-01-18 16:33:51','2021-01-18 16:38:58'), (2,1,1,4,0,'2021-01-18 16:41:09','2021-01-18 17:18:12'), (3,1,1,6,0,'2021-01-18 17:17:57','2021-01-18 17:17:57'), @@ -546,6 +674,3 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); - - - -- Gitee From 0e31a9b844b420ba216a696bd54856f13a213e9d Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 27 May 2021 08:37:45 +0800 Subject: [PATCH 19/50] 1.8.0 --- front/public/static/help/swagger-plugin.md | 1 + 1 file changed, 1 insertion(+) diff --git a/front/public/static/help/swagger-plugin.md b/front/public/static/help/swagger-plugin.md index 7917b9f5..ef8fdd0b 100644 --- a/front/public/static/help/swagger-plugin.md +++ b/front/public/static/help/swagger-plugin.md @@ -13,6 +13,7 @@ pom.xml添加依赖： cn.torna swagger-plugin-starter 1.0.0 + provided ``` -- Gitee From e36360ad46fa3758731bb61c3c540f51de2bf3af Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 2 Jun 2021 10:45:17 +0800 Subject: [PATCH 20/50] 1.8.1 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 8 +++ mysql.sql | 46 +++++++++-------- mysql_compat.sql | 71 ++++++++++++++------------- plugin/swagger-plugin-starter/pom.xml | 4 +- plugin/swagger-plugin/pom.xml | 10 ++-- pom.xml | 2 +- readme.md | 6 +-- release.sh | 2 +- sdk/sdk-java/pom.xml | 10 ++-- torna-docker-compose/mysql.sql | 46 +++++++++-------- 12 files changed, 116 insertions(+), 93 deletions(-) diff --git a/build.bat b/build.bat index 892db15e..5f0cd24c 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.0" +set version="1.8.1" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index a9e446c1..ee1b6d21 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.0" +version="1.8.1" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 91013aae..3e57dbbc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,13 @@ # 更新日志 +## 1.8.1 + +- 【增强】支持定义数组body/数组返回 +- 【增强】接口描述支持html标签 +- 【增强】调试环境新增是否公开属性 +- 【增强】调试页参数可勾选（CheckBox） +- 【优化】优化接口描述字段显示 [pr](https://gitee.com/durcframework/torna/pulls/9) + ## 1.8.0 - 【特性】新增聚合空间，可聚合其它空间中的文档统一展示 diff --git a/mysql.sql b/mysql.sql index 06a8aa35..3d840136 100644 --- a/mysql.sql +++ b/mysql.sql @@ -218,7 +218,7 @@ CREATE TABLE `module` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_token` (`token`) USING BTREE, KEY `idx_projectid` (`project_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='项目模块'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='项目模块'; CREATE TABLE `module_config` ( @@ -449,24 +449,24 @@ INSERT INTO `compose_project` (`id`, `name`, `description`, `space_id`, `type`, (1,'聚合接口','提供给第三方的接口',18,1,'',1,'超级管理员',1,'超级管理员',0,1,0,'2021-05-25 18:05:14','2021-05-25 18:05:14'); -INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES - (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), - (3,'48ae195650ab5cd4d521b62704d15b57','忽略签名验证','','',0,'/story/get/ignore/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (4,'d623ea4fe35e903a42530643e6087795','获取故事信息（首位）','','',0,'/story/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (5,'1319b1ba77712fc4c6668d04b05fd68a','获取故事信息','','',0,'/story/get/v2','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (6,'3a15e3407182ccf902b6e9f5c1b1b875','返回数组结果（第二）','','',0,'/story/list/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (7,'fa3324c4dd6b978434f8541f73393118','树状返回','','',0,'/story/tree/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (8,'ac0c66314833ef010bf7df1cf5692b43','传递token','','',0,'/token','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:30'), - (9,'7ededf48dec7c2b582affe2d08d7d0b2','文件上传','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (10,'84d41cbee05d97aa568b7a06759cc19c','文件上传例1','','',0,'/upload/file1','POST','multipart/form-data',0,9,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (11,'1172c623f531324750aad5c2fa72a751','文件上传例2','','',0,'/upload/file2','POST','multipart/form-data',0,9,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (12,'92d2fa5b0ae7a0f2e29648929c5e435f','文件下载','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (13,'f184470a11e0fd559e1f56294b53d4cb','文件下载','','',0,'/download/file1','POST','application/json',0,12,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), - (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); +INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `is_request_array`, `is_response_array`, `request_array_type`, `response_array_type`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), + (3,'48ae195650ab5cd4d521b62704d15b57','忽略签名验证','','',0,'/story/get/ignore/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (4,'d623ea4fe35e903a42530643e6087795','获取故事信息（首位）','','',0,'/story/get/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (5,'1319b1ba77712fc4c6668d04b05fd68a','获取故事信息','','',0,'/story/get/v2','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (6,'3a15e3407182ccf902b6e9f5c1b1b875','返回数组结果（第二）','','',0,'/story/list/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (7,'fa3324c4dd6b978434f8541f73393118','树状返回','','',0,'/story/tree/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (8,'ac0c66314833ef010bf7df1cf5692b43','传递token','','',0,'/token','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',1,'',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:30'), + (9,'7ededf48dec7c2b582affe2d08d7d0b2','文件上传','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (10,'84d41cbee05d97aa568b7a06759cc19c','文件上传例1','','',0,'/upload/file1','POST','multipart/form-data',0,9,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (11,'1172c623f531324750aad5c2fa72a751','文件上传例2','','',0,'/upload/file2','POST','multipart/form-data',0,9,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (12,'92d2fa5b0ae7a0f2e29648929c5e435f','文件下载','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (13,'f184470a11e0fd559e1f56294b53d4cb','文件下载','','',0,'/download/file1','POST','application/json',0,12,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,'object','object',0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), + (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_length`, `example`, `description`, `enum_id`, `doc_id`, `parent_id`, `style`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -565,7 +565,8 @@ INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `i INSERT INTO `module` (`id`, `name`, `project_id`, `type`, `import_url`, `basic_auth_username`, `basic_auth_password`, `token`, `create_mode`, `modify_mode`, `creator_id`, `modifier_id`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'故事API',1,1,'http://localhost:2222/v2/api-docs','','','c16931fa6590483fb7a4e85340fcbfef',0,0,3,3,0,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (2,'用户模块',2,0,'','','','b215b7010db5451e98305152a5fa2ddf',0,0,12,12,0,0,'2020-12-15 10:14:55','2020-12-15 10:14:55'); + (2,'用户模块',2,0,'','','','b215b7010db5451e98305152a5fa2ddf',0,0,12,12,0,0,'2020-12-15 10:14:55','2020-12-15 10:14:55'), + (3,'swagger-push',1,0,'','','','931167d9347e4aec9409f2b275437431',0,0,1,1,0,0,'2021-06-02 10:26:27','2021-06-02 10:26:27'); INSERT INTO `module_config` (`id`, `module_id`, `type`, `config_key`, `config_value`, `extend_id`, `description`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -641,6 +642,8 @@ INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_d (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'), (2,'dev1admin@torna.cn','1231d3ef9f1a6b3771d19e3ae453b07d','研发一部经理',0,'register','dev1admin@torna.cn',1,0,'2020-12-15 09:41:16','2021-05-25 18:03:07'), @@ -676,3 +679,6 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); + + + diff --git a/mysql_compat.sql b/mysql_compat.sql index 915387fa..1c9e748d 100644 --- a/mysql_compat.sql +++ b/mysql_compat.sql @@ -218,7 +218,7 @@ CREATE TABLE `module` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_token` (`token`) USING BTREE, KEY `idx_projectid` (`project_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COMMENT='项目模块'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COMMENT='项目模块'; CREATE TABLE `module_config` ( @@ -449,27 +449,27 @@ INSERT INTO `compose_project` (`id`, `name`, `description`, `space_id`, `type`, (1,'聚合接口','提供给第三方的接口',18,1,'',1,'超级管理员',1,'超级管理员',0,1,0,'2021-05-25 18:05:14','2021-05-25 18:05:14'); -INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES - (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), - (3,'48ae195650ab5cd4d521b62704d15b57','忽略签名验证','','',0,'/story/get/ignore/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (4,'d623ea4fe35e903a42530643e6087795','获取故事信息（首位）','','',0,'/story/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (5,'1319b1ba77712fc4c6668d04b05fd68a','获取故事信息','','',0,'/story/get/v2','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (6,'3a15e3407182ccf902b6e9f5c1b1b875','返回数组结果（第二）','','',0,'/story/list/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (7,'fa3324c4dd6b978434f8541f73393118','树状返回','','',0,'/story/tree/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (8,'ac0c66314833ef010bf7df1cf5692b43','传递token','','',0,'/token','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:30'), - (9,'7ededf48dec7c2b582affe2d08d7d0b2','文件上传','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (10,'84d41cbee05d97aa568b7a06759cc19c','文件上传例1','','',0,'/upload/file1','POST','multipart/form-data',0,9,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (11,'1172c623f531324750aad5c2fa72a751','文件上传例2','','',0,'/upload/file2','POST','multipart/form-data',0,9,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (12,'92d2fa5b0ae7a0f2e29648929c5e435f','文件下载','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (13,'f184470a11e0fd559e1f56294b53d4cb','文件下载','','',0,'/download/file1','POST','application/json',0,12,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), - (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); - - -INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_length`, `example`, `description`, `enum_id`, `doc_id`, `parent_id`, `style`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `is_request_array`, `is_response_array`, `request_array_type`, `response_array_type`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), + (3,'48ae195650ab5cd4d521b62704d15b57','忽略签名验证','','',0,'/story/get/ignore/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (4,'d623ea4fe35e903a42530643e6087795','获取故事信息（首位）','','',0,'/story/get/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (5,'1319b1ba77712fc4c6668d04b05fd68a','获取故事信息','','',0,'/story/get/v2','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (6,'3a15e3407182ccf902b6e9f5c1b1b875','返回数组结果（第二）','','',0,'/story/list/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (7,'fa3324c4dd6b978434f8541f73393118','树状返回','','',0,'/story/tree/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (8,'ac0c66314833ef010bf7df1cf5692b43','传递token','','',0,'/token','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',1,'',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:30'), + (9,'7ededf48dec7c2b582affe2d08d7d0b2','文件上传','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (10,'84d41cbee05d97aa568b7a06759cc19c','文件上传例1','','',0,'/upload/file1','POST','multipart/form-data',0,9,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (11,'1172c623f531324750aad5c2fa72a751','文件上传例2','','',0,'/upload/file2','POST','multipart/form-data',0,9,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (12,'92d2fa5b0ae7a0f2e29648929c5e435f','文件下载','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (13,'f184470a11e0fd559e1f56294b53d4cb','文件下载','','',0,'/download/file1','POST','application/json',0,12,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,'object','object',0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), + (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); + + +INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_length`, `example`, `description`, `enum_id`, `doc_id`, `parent_id`, `style`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'9cedd1b23736a816e96bca9603c2b5f4','categoryName','string',0,'-','娱乐','分类名称',0,2,0,2,0,0,3,'商城项目admin',1,'超级管理员',0,0,'2020-12-15 10:01:48','2021-01-19 16:39:35'), (2,'df34a965ab9c44e2e6b0b282c711e9b9','createTime','string',0,'-','2019-09-25 17:12:52','创建时间',0,2,0,2,0,0,3,'商城项目admin',1,'超级管理员',0,0,'2020-12-15 10:01:48','2021-01-19 16:39:35'), (3,'841d66d19b087e9982b76ba0a0aab7a4','storyParam','object',0,'-','','',0,2,0,2,0,0,3,'商城项目admin',1,'超级管理员',0,0,'2020-12-15 10:01:48','2021-01-19 16:39:35'), @@ -555,7 +555,7 @@ INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_lengt (83,'14c5f6044d9ce6850dc4e1951d0151f2','commentId','string',1,'64','','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'); -INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'0b28cfdbc7f250d85614eacda8248eb4','性别','',2,0,'2020-12-16 13:57:09','2020-12-16 13:57:09'); @@ -563,29 +563,30 @@ INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `i -INSERT INTO `module` (`id`, `name`, `project_id`, `type`, `import_url`, `basic_auth_username`, `basic_auth_password`, `token`, `create_mode`, `modify_mode`, `creator_id`, `modifier_id`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `module` (`id`, `name`, `project_id`, `type`, `import_url`, `basic_auth_username`, `basic_auth_password`, `token`, `create_mode`, `modify_mode`, `creator_id`, `modifier_id`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'故事API',1,1,'http://localhost:2222/v2/api-docs','','','c16931fa6590483fb7a4e85340fcbfef',0,0,3,3,0,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (2,'用户模块',2,0,'','','','b215b7010db5451e98305152a5fa2ddf',0,0,12,12,0,0,'2020-12-15 10:14:55','2020-12-15 10:14:55'); + (2,'用户模块',2,0,'','','','b215b7010db5451e98305152a5fa2ddf',0,0,12,12,0,0,'2020-12-15 10:14:55','2020-12-15 10:14:55'), + (3,'swagger-push',1,0,'','','','931167d9347e4aec9409f2b275437431',0,0,1,1,0,0,'2021-06-02 10:26:27','2021-06-02 10:26:27'); -INSERT INTO `module_config` (`id`, `module_id`, `type`, `config_key`, `config_value`, `extend_id`, `description`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `module_config` (`id`, `module_id`, `type`, `config_key`, `config_value`, `extend_id`, `description`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,0,'debughost_1','http://10.1.30.165:2222',0,'',0,'2020-12-15 10:01:48','2021-01-22 11:51:05'), (2,2,0,'debughost_2','http://www.aaa.com',0,'',0,'2020-12-16 15:41:14','2020-12-16 15:41:14'); -INSERT INTO `open_user` (`id`, `app_key`, `secret`, `status`, `applicant`, `space_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `open_user` (`id`, `app_key`, `secret`, `status`, `applicant`, `space_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'20201215788408948171472896','WeNAdSucgduD$M?*83?dJR&IvgU~Re75',1,'张三',0,0,'2020-12-15 14:07:21','2021-01-25 09:59:10'), (2,'20201216788835306945118208','W.ZyGMOB9Q0UqujVxnfi@.I#V&tUUYZR',1,'张三',9,0,'2020-12-16 18:21:33','2021-01-25 09:59:10'), (3,'20201216788835536872669184','Bq.XRN!S0$t8!UYpWgSOl7oHlY#XeenJ',1,'张三',9,0,'2020-12-16 18:22:28','2021-01-25 09:59:11'); -INSERT INTO `project` (`id`, `name`, `description`, `space_id`, `is_private`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `project` (`id`, `name`, `description`, `space_id`, `is_private`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'商城项目','商城项目',9,0,3,'商城项目admin',1,'超级管理员',0,0,'2020-12-15 09:56:39','2021-01-25 08:31:33'), (2,'后台项目','后台项目',11,1,11,'后台项目负责人',11,'后台项目负责人',0,0,'2020-12-15 10:12:37','2020-12-15 10:12:37'), (3,'测试项目','这是一个测试项目',17,1,14,'测试A',14,'测试A',0,0,'2021-01-25 09:10:47','2021-01-25 09:10:47'); -INSERT INTO `project_user` (`id`, `project_id`, `user_id`, `role_code`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `project_user` (`id`, `project_id`, `user_id`, `role_code`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,3,'admin',0,'2020-12-15 09:56:38','2021-01-25 08:31:33'), (2,1,4,'dev',0,'2020-12-15 09:58:35','2021-01-25 08:31:38'), (3,1,9,'guest',1,'2020-12-15 09:58:44','2020-12-15 09:59:01'), @@ -610,7 +611,7 @@ INSERT INTO `space` (`id`, `name`, `creator_id`, `creator_name`, `modifier_id`, (18,'聚合空间',1,'超级管理员',1,'超级管理员',1,0,'2021-05-25 18:04:34','2021-05-25 18:04:34'); -INSERT INTO `space_user` (`id`, `user_id`, `space_id`, `role_code`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `space_user` (`id`, `user_id`, `space_id`, `role_code`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,2,1,'admin',0,'2020-12-15 09:41:16','2020-12-15 09:41:16'), (2,3,2,'admin',0,'2020-12-15 09:41:58','2020-12-15 09:41:58'), (3,4,3,'admin',0,'2020-12-15 09:42:12','2020-12-15 09:42:12'), @@ -637,11 +638,13 @@ INSERT INTO `space_user` (`id`, `user_id`, `space_id`, `role_code`, `is_deleted` (24,2,18,'admin',0,'2021-05-25 18:04:33','2021-05-25 18:04:33'); -INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +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 + + +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'), (2,'dev1admin@torna.cn','1231d3ef9f1a6b3771d19e3ae453b07d','研发一部经理',0,'register','dev1admin@torna.cn',1,0,'2020-12-15 09:41:16','2021-05-25 18:03:07'), (3,'dev1shop_admin@torna.cn','8429b4b5d6ef210811a25ad6e2e47403','商城项目admin',0,'register','dev1shop_admin@torna.cn',1,0,'2020-12-15 09:41:58','2021-05-25 18:03:07'), @@ -655,7 +658,7 @@ INSERT INTO `user_info` (`id`, `username`, `password`, `nickname`, `is_super_adm (14,'test@torna.cn','c19b85cecd8787ba8712ff764bf70f81','测试A',0,'register','test@torna.cn',1,0,'2021-01-25 09:08:21','2021-05-25 18:03:07'); -INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `source_id`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `source_id`, `gmt_create`, `gmt_modified`) VALUES (3,2,'超级管理员 修改了文档 获取分类信息',1,1,2,'2021-01-19 13:38:20','2021-01-19 16:28:54'), (4,2,'超级管理员 更新了【获取分类信息】，备注: 111',1,1,2,'2021-01-19 13:43:42','2021-01-19 16:30:36'), (5,2,'超级管理员 更新了【获取分类信息】，备注: 3333',1,1,2,'2021-01-19 13:43:45','2021-01-19 15:27:41'), @@ -666,7 +669,7 @@ INSERT INTO `user_message` (`id`, `user_id`, `message`, `is_read`, `type`, `sour (10,2,'超级管理员 删除了【获取分类信息】',1,1,2,'2021-01-19 16:44:37','2021-01-19 16:46:06'); -INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES +INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,1,16,0,'2021-01-18 16:33:51','2021-01-18 16:38:58'), (2,1,1,4,0,'2021-01-18 16:41:09','2021-01-18 17:18:12'), (3,1,1,6,0,'2021-01-18 17:17:57','2021-01-18 17:17:57'), diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 783113d7..82788c87 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.0 + 1.0.1 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.0 + 1.0.1 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 7690088d..5a1554d3 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -41,7 +41,7 @@ cn.torna torna-sdk - 1.0.7 + 1.0.8 junit @@ -90,7 +90,7 @@ - + @@ -123,7 +123,7 @@ - + org.apache.maven.plugins diff --git a/pom.xml b/pom.xml index 07eff21a..be6f551e 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.0 + 1.8.1 1.8 diff --git a/readme.md b/readme.md index 35d794da..4784b923 100644 --- a/readme.md +++ b/readme.md @@ -8,9 +8,9 @@ | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.0 | -| sdk-java | 1.0.7 | -| swagger-plugin | 1.0.0 | +| Torna | 1.8.1 | +| sdk-java | 1.0.8 | +| swagger-plugin | 1.0.1 | ## 特性介绍 diff --git a/release.sh b/release.sh index b6b1a188..d9a1870d 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.0" +version="1.8.1" build_folder="${app_name}-${version}" diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 2cd3b083..a19eb4ee 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.7 + 1.0.8 jar torna-sdk @@ -66,7 +66,7 @@ - + @@ -99,7 +99,7 @@ - + org.apache.maven.plugins diff --git a/torna-docker-compose/mysql.sql b/torna-docker-compose/mysql.sql index 06a8aa35..3d840136 100644 --- a/torna-docker-compose/mysql.sql +++ b/torna-docker-compose/mysql.sql @@ -218,7 +218,7 @@ CREATE TABLE `module` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_token` (`token`) USING BTREE, KEY `idx_projectid` (`project_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='项目模块'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='项目模块'; CREATE TABLE `module_config` ( @@ -449,24 +449,24 @@ INSERT INTO `compose_project` (`id`, `name`, `description`, `space_id`, `type`, (1,'聚合接口','提供给第三方的接口',18,1,'',1,'超级管理员',1,'超级管理员',0,1,0,'2021-05-25 18:05:14','2021-05-25 18:05:14'); -INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES - (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), - (3,'48ae195650ab5cd4d521b62704d15b57','忽略签名验证','','',0,'/story/get/ignore/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (4,'d623ea4fe35e903a42530643e6087795','获取故事信息（首位）','','',0,'/story/get/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (5,'1319b1ba77712fc4c6668d04b05fd68a','获取故事信息','','',0,'/story/get/v2','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (6,'3a15e3407182ccf902b6e9f5c1b1b875','返回数组结果（第二）','','',0,'/story/list/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (7,'fa3324c4dd6b978434f8541f73393118','树状返回','','',0,'/story/tree/v1','POST','application/json',0,1,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (8,'ac0c66314833ef010bf7df1cf5692b43','传递token','','',0,'/token','POST','application/json',0,1,1,1,1,1,0,0,3,'',1,'',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:30'), - (9,'7ededf48dec7c2b582affe2d08d7d0b2','文件上传','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (10,'84d41cbee05d97aa568b7a06759cc19c','文件上传例1','','',0,'/upload/file1','POST','multipart/form-data',0,9,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (11,'1172c623f531324750aad5c2fa72a751','文件上传例2','','',0,'/upload/file2','POST','multipart/form-data',0,9,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (12,'92d2fa5b0ae7a0f2e29648929c5e435f','文件下载','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (13,'f184470a11e0fd559e1f56294b53d4cb','文件下载','','',0,'/download/file1','POST','application/json',0,12,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), - (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); +INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type`, `url`, `http_method`, `content_type`, `is_folder`, `parent_id`, `module_id`, `is_use_global_headers`, `is_use_global_params`, `is_use_global_returns`, `is_request_array`, `is_response_array`, `request_array_type`, `response_array_type`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `remark`, `is_show`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES + (1,'5fa7cd78bc872cd8fdc09ee3d6afedd2','故事接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (2,'3292c28718c1e74d6e14e0160eecf379','获取分类信息','','',0,'/story/category/get/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',1,'超级管理员',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:29'), + (3,'48ae195650ab5cd4d521b62704d15b57','忽略签名验证','','',0,'/story/get/ignore/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (4,'d623ea4fe35e903a42530643e6087795','获取故事信息（首位）','','',0,'/story/get/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (5,'1319b1ba77712fc4c6668d04b05fd68a','获取故事信息','','',0,'/story/get/v2','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (6,'3a15e3407182ccf902b6e9f5c1b1b875','返回数组结果（第二）','','',0,'/story/list/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (7,'fa3324c4dd6b978434f8541f73393118','树状返回','','',0,'/story/tree/v1','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (8,'ac0c66314833ef010bf7df1cf5692b43','传递token','','',0,'/token','POST','application/json',0,1,1,1,1,1,0,0,'object','object',0,0,3,'',1,'',0,'',1,0,'2020-12-15 10:01:48','2021-01-19 17:03:30'), + (9,'7ededf48dec7c2b582affe2d08d7d0b2','文件上传','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (10,'84d41cbee05d97aa568b7a06759cc19c','文件上传例1','','',0,'/upload/file1','POST','multipart/form-data',0,9,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (11,'1172c623f531324750aad5c2fa72a751','文件上传例2','','',0,'/upload/file2','POST','multipart/form-data',0,9,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (12,'92d2fa5b0ae7a0f2e29648929c5e435f','文件下载','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (13,'f184470a11e0fd559e1f56294b53d4cb','文件下载','','',0,'/download/file1','POST','application/json',0,12,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), + (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,'object','object',0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), + (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_length`, `example`, `description`, `enum_id`, `doc_id`, `parent_id`, `style`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -565,7 +565,8 @@ INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `i INSERT INTO `module` (`id`, `name`, `project_id`, `type`, `import_url`, `basic_auth_username`, `basic_auth_password`, `token`, `create_mode`, `modify_mode`, `creator_id`, `modifier_id`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,'故事API',1,1,'http://localhost:2222/v2/api-docs','','','c16931fa6590483fb7a4e85340fcbfef',0,0,3,3,0,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), - (2,'用户模块',2,0,'','','','b215b7010db5451e98305152a5fa2ddf',0,0,12,12,0,0,'2020-12-15 10:14:55','2020-12-15 10:14:55'); + (2,'用户模块',2,0,'','','','b215b7010db5451e98305152a5fa2ddf',0,0,12,12,0,0,'2020-12-15 10:14:55','2020-12-15 10:14:55'), + (3,'swagger-push',1,0,'','','','931167d9347e4aec9409f2b275437431',0,0,1,1,0,0,'2021-06-02 10:26:27','2021-06-02 10:26:27'); INSERT INTO `module_config` (`id`, `module_id`, `type`, `config_key`, `config_value`, `extend_id`, `description`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -641,6 +642,8 @@ INSERT INTO `system_config` (`id`, `config_key`, `config_value`, `remark`, `is_d (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'), (2,'dev1admin@torna.cn','1231d3ef9f1a6b3771d19e3ae453b07d','研发一部经理',0,'register','dev1admin@torna.cn',1,0,'2020-12-15 09:41:16','2021-05-25 18:03:07'), @@ -676,3 +679,6 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); + + + -- Gitee From 01d95979563a4b3289e7d09472d83109d2739858 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 2 Jun 2021 18:23:36 +0800 Subject: [PATCH 21/50] =?UTF-8?q?=E4=BC=98=E5=8C=96swagger=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/swagger-plugin-starter/pom.xml | 2 +- plugin/swagger-plugin/pom.xml | 4 ++-- sdk/sdk-java/pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 82788c87..db2be32f 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.1 + 1.0.2 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 5a1554d3..610685eb 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.0.1 + 1.0.2 jar swagger-plugin @@ -41,7 +41,7 @@ cn.torna torna-sdk - 1.0.8 + 1.0.9 junit diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index a19eb4ee..f842fe36 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.8 + 1.0.9 jar torna-sdk -- Gitee From fea09122f72f47382914cc28c7e3672f1ca35d66 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 2 Jun 2021 18:25:05 +0800 Subject: [PATCH 22/50] =?UTF-8?q?=E4=BC=98=E5=8C=96swagger=E6=8F=92?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/swagger-plugin-starter/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index db2be32f..249a7728 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.1 + 1.0.2 jar swagger-plugin-starter -- Gitee From 8eded5ba72ee5c571c1b2597d615032ea2cf11d3 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 2 Jun 2021 18:32:18 +0800 Subject: [PATCH 23/50] UPDATE --- readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 4784b923..f5153222 100644 --- a/readme.md +++ b/readme.md @@ -9,8 +9,8 @@ | 模块 | 版本 | | :----: | :----: | | Torna | 1.8.1 | -| sdk-java | 1.0.8 | -| swagger-plugin | 1.0.1 | +| sdk-java | 1.0.9 | +| swagger-plugin | 1.0.2 | ## 特性介绍 -- Gitee From a34b2603f9ba6c12b9cc494f1fc53d062c219bc1 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 3 Jun 2021 15:04:27 +0800 Subject: [PATCH 24/50] 1.8.2 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 5 +++++ plugin/swagger-plugin-starter/pom.xml | 4 ++-- plugin/swagger-plugin/pom.xml | 2 +- pom.xml | 2 +- release.sh | 2 +- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/build.bat b/build.bat index 5f0cd24c..53e39831 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.1" +set version="1.8.2" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index ee1b6d21..20b7ea01 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.1" +version="1.8.2" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 3e57dbbc..02c563c9 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +## 1.8.2 + +- 【优化】优化文件上传 +- 【优化】优化swagger插件 + ## 1.8.1 - 【增强】支持定义数组body/数组返回 diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 249a7728..623d368f 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.2 + 1.0.3 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.2 + 1.0.3 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 610685eb..839d02a5 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.0.2 + 1.0.3 jar swagger-plugin diff --git a/pom.xml b/pom.xml index be6f551e..8d04a4b0 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.1 + 1.8.2 1.8 diff --git a/release.sh b/release.sh index d9a1870d..7c8c9cde 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.1" +version="1.8.2" build_folder="${app_name}-${version}" -- Gitee From c5c0099258289da4144b8e28be2b17dab22983d1 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 3 Jun 2021 15:38:48 +0800 Subject: [PATCH 25/50] UPDATE --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index bdd3ca83..a917bddd 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -10,3 +10,4 @@ # 描述 +> 提需求请写明需求的使用场景 -- Gitee From 6461af050d8ae0c1139ac1efe38096f752876c47 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 3 Jun 2021 16:09:50 +0800 Subject: [PATCH 26/50] 1.8.2 --- changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/changelog.md b/changelog.md index 02c563c9..f6a32a30 100644 --- a/changelog.md +++ b/changelog.md @@ -4,6 +4,7 @@ - 【优化】优化文件上传 - 【优化】优化swagger插件 +- 【修复】修复导入json参数类型不对问题 ## 1.8.1 -- Gitee From 399a621f9a5ccd8d7381ce7ac6f7dce1ddcd334f Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 3 Jun 2021 16:24:13 +0800 Subject: [PATCH 27/50] UPDATE --- readme.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/readme.md b/readme.md index f5153222..044a119b 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ | :----: | :----: | | Torna | 1.8.1 | | sdk-java | 1.0.9 | -| swagger-plugin | 1.0.2 | +| swagger-plugin | 1.0.3 | ## 特性介绍 @@ -122,6 +122,10 @@ 参见：[开发文档](http://torna.cn/dev/) +## 其它资源 + +- [Torna对应的示例工程](https://gitee.com/durcframework/torna-example) ，演示swagger插件的用法 + ## 更新日志 [changelog](./changelog.md) -- Gitee From 7872d7026e761cb32cbd7ababa1c01a9769dab99 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 4 Jun 2021 14:50:03 +0800 Subject: [PATCH 28/50] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/swagger-plugin-starter/pom.xml | 4 ++-- plugin/swagger-plugin/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 623d368f..ea2a5744 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.3 + 1.0.4 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.3 + 1.0.4 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 839d02a5..a203f540 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.0.3 + 1.0.4 jar swagger-plugin -- Gitee From 064daf179305b60a0b749d7b300de8006b03c392 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 4 Jun 2021 14:56:02 +0800 Subject: [PATCH 29/50] UPDATE --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 044a119b..efa6dee0 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ | :----: | :----: | | Torna | 1.8.1 | | sdk-java | 1.0.9 | -| swagger-plugin | 1.0.3 | +| swagger-plugin | 1.0.4 | ## 特性介绍 -- Gitee From f27d476e600e4526961c97803772944a9a80448c Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 7 Jun 2021 14:30:56 +0800 Subject: [PATCH 30/50] 1.8.3 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 5 +++++ pom.xml | 2 +- release.sh | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 53e39831..b7db1b2b 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.2" +set version="1.8.3" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 20b7ea01..42204d76 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.2" +version="1.8.3" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index f6a32a30..2434afa6 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +## 1.8.3 + +- 【优化】后台添加的用户可重置密码 +- 【修复】聚合空间添加项目时，无内容模块会被添加为空 [#I3UG1H](https://gitee.com/durcframework/torna/issues/I3UG1H) + ## 1.8.2 - 【优化】优化文件上传 diff --git a/pom.xml b/pom.xml index 8d04a4b0..58b136af 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.2 + 1.8.3 1.8 diff --git a/release.sh b/release.sh index 7c8c9cde..f3df1bb8 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.2" +version="1.8.3" build_folder="${app_name}-${version}" -- Gitee From 539b5cc5119565c26203c0727bf5252513bdd094 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 7 Jun 2021 14:45:36 +0800 Subject: [PATCH 31/50] 1.8.3 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index efa6dee0..8c34c2b1 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.1 | +| Torna | 1.8.3 | | sdk-java | 1.0.9 | | swagger-plugin | 1.0.4 | -- Gitee From 84928c2f3ee11246587824704a1a35b562cae6b6 Mon Sep 17 00:00:00 2001 From: tanghc Date: Tue, 8 Jun 2021 13:56:22 +0800 Subject: [PATCH 32/50] 1.8.3 --- mysql.sql | 225 +++++++++++++++++++++++++++++++-- torna-docker-compose/mysql.sql | 225 +++++++++++++++++++++++++++++++-- 2 files changed, 426 insertions(+), 24 deletions(-) diff --git a/mysql.sql b/mysql.sql index 3d840136..e6c2e150 100644 --- a/mysql.sql +++ b/mysql.sql @@ -1,12 +1,11 @@ -- 适用于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`; @@ -105,7 +104,7 @@ CREATE TABLE `doc_info` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_data_id` (`data_id`) USING BTREE, KEY `idx_moduleid` (`module_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COMMENT='文档信息'; +) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8mb4 COMMENT='文档信息'; CREATE TABLE `doc_param` ( @@ -134,7 +133,7 @@ CREATE TABLE `doc_param` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_dataid` (`data_id`) USING BTREE, KEY `idx_docid` (`doc_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=84 DEFAULT CHARSET=utf8mb4 COMMENT='文档参数'; +) ENGINE=InnoDB AUTO_INCREMENT=271 DEFAULT CHARSET=utf8mb4 COMMENT='文档参数'; CREATE TABLE `enum_info` ( @@ -234,7 +233,7 @@ CREATE TABLE `module_config` ( `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `idx_moduleid_type` (`module_id`,`type`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='系统配置'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='系统配置'; CREATE TABLE `open_user` ( @@ -466,7 +465,29 @@ INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type` (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,'object','object',0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), - (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); + (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'), + (18,'c018597c3da062833820d46754d8d74f','订单模块','','',0,'','','',1,0,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:22','2021-06-08 13:54:22'), + (19,'1d3c432b05bf4b7203ebace0bf044c1f','提交数组/返回数组5','List方式','',0,'/order/postArr5','POST','application/json',0,18,3,1,1,1,1,1,'integer','integer',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (20,'4b5436a9e81ac22371e0f7b6b00afb8c','提交数组/返回数组3','','',0,'/order/postArr3','POST','application/json',0,18,3,1,1,1,1,1,'object','integer',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (21,'2ced912c74e4eb9a53479413f39d4b19','提交数组/返回数组2','','',0,'/order/postArr2','POST','application/json',0,18,3,1,1,1,1,1,'integer','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (22,'b60a5a7e94a05644bf50254d9fdf6eab','提交数组/返回数组4','List方式','',0,'/order/postArr4','POST','application/json',0,18,3,1,1,1,1,1,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (23,'1d8483ef6bb80ccd79cf114d56461b05','提交数组/返回数组','','',0,'/order/postArr','POST','application/json',0,18,3,1,1,1,1,1,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (24,'0e36106f99a0adb4d4f3160c1c2ae6c3','演示query参数,不加@RequestParam','演示query参数,不加@RequestParam','',0,'/order/get','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (25,'1d0253f8f8fb2f3e2ae352dddfa5f2be','提交订单信息，application/json','提交订单信息，application/json','Tom',0,'/order/create','POST','application/json',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (26,'1081d1f598bcc0df2a48894a506212ae','全部参数form，全部由@ApiImplicitParams实现','全部由@ApiImplicitParams实现','',0,'/order/submit3/{productNo}','POST','application/x-www-form-urlencoded',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (27,'73e15ad9d976104a63ae2771dc5223d2','全部参数json，全部由@ApiImplicitParams实现','全部由@ApiImplicitParams实现','',0,'/order/submit2/{productNo}','POST','application/json',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (28,'874136230933126ceb9e164411ae059b','全部参数upload，全部由@ApiImplicitParams实现','全部由@ApiImplicitParams实现','',0,'/order/submit4/{productNo}','POST','multipart/form-data',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (29,'b9bdb068beda69e48579c7725a835030','提交订单信息，application/x-www-form-urlencoded','提交订单信息，application/x-www-form-urlencoded','',0,'/order/create2','POST','application/x-www-form-urlencoded',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (30,'e7b907533f53eb25306c649c2f3cc2f9','演示path参数','演示path参数','',0,'/order/get/{orderNo}','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (31,'b34e5dcb5db2e798861857ec008a9bc9','演示query参数,加@RequestParam','演示query参数,加@RequestParam','',0,'/order/get2','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (32,'52cf7d54d887867c18a229ab93fe4df1','演示path参数+query参数+body参数+header','提交订单信息说明。。','',0,'/order/submit/{productNo}','POST','application/json',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (33,'4fbc6d999497b96a284eff0f110e5fcb','获取某个产品下的订单','注意：html演示。。','',0,'/order/get/{productNo}','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (34,'16f0ece214cf202e41fe482494b0ebce','产品模块','','',0,'','','',1,0,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',-1,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (35,'1ab4dee15c5cb5f16205446f16e8ba01','返回树','','',0,'/product/getTree','GET','',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (36,'2146fa58a9dcdb3f7c52d350e9732a27','获取产品','获取产品说明。。','Tom,Jim',0,'/product/get/{productNo}','GET','',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (37,'d8fe88fd74144ac90b50d94bde7414ee','上传文件','','',0,'/product/upload','POST','multipart/form-data',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',11,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (38,'9edd7624130fe72727016b02df1e9d77','上传文件2','','',0,'/product/upload2','POST','multipart/form-data',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',12,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (39,'8bccd6dd861c2671738b56e179d8804d','上传文件3','','',0,'/product/upload3','POST','multipart/form-data',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',13,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'); INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_length`, `example`, `description`, `enum_id`, `doc_id`, `parent_id`, `style`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -552,7 +573,190 @@ INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_lengt (80,'9584e01340755ba6f8c82df9eb032d89','token','string',1,'64','1111','token',0,2,0,1,0,0,1,'超级管理员',1,'超级管理员',0,0,'2021-01-19 10:32:09','2021-01-19 16:39:35'), (81,'e50bb76340fd01b339e1a2aa8d3215f3','page','string',1,'64','1','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'), (82,'227be5c273852f1927611268522efa00','size','string',1,'64','10','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'), - (83,'14c5f6044d9ce6850dc4e1951d0151f2','commentId','string',1,'64','','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'); + (83,'14c5f6044d9ce6850dc4e1951d0151f2','commentId','string',1,'64','','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'), + (84,'a5b6cf48c787af0c5134e913be3d9430','','integer',0,'-','1,2,3','订单id',0,19,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (85,'f9af347c3f5ed5c3806cf599d3fbe451','','integer',0,'-','4,5,6','返回订单id',0,19,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (86,'d6d70fa7d4772f7ebc78202136e5bf68','orderNo','string',0,'-','aaaa','订单id',0,20,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (87,'d052a21bd76ba3ed86c5c9ac6bc1955c','remark','string',0,'-','订单','备注',0,20,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (88,'f7c14baf034ef3dd91bb5ef6313fe3e9','','integer',0,'-','1,2,3','订单id',0,20,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (89,'05d8e546708fef42108b7f635c7ec5dc','','integer',0,'-','1,2,3','订单id',0,21,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (90,'5f9026861a38004ef982d262742db7c1','orderNo','string',0,'-','aaaa','订单id',0,21,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (91,'e7f04c283b820db984a3ca6bd27993be','remark','string',0,'-','订单','备注',0,21,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (92,'6ef100c9aa2e124f83c5f801d85f796a','orderNo','string',0,'-','aaaa','订单id',0,22,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (93,'4e50d9fba9c00acaaf63c8c2ed886460','remark','string',0,'-','订单','备注',0,22,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (94,'6355281c7ff265f27fbeebc32ce42a01','orderNo','string',0,'-','aaaa','订单id',0,22,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (95,'4ad48afcca35dad0317a4fbbd7f9ac21','remark','string',0,'-','订单','备注',0,22,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (96,'0c4e2f79eb1e495953f3dfa0a4159f66','orderNo','string',0,'-','aaaa','订单id',0,23,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (97,'7add78ade786825bf96865a71562898f','remark','string',0,'-','订单','备注',0,23,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (98,'e90aa6c4c29198933369486e39984ec8','orderNo','string',0,'-','aaaa','订单id',0,23,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (99,'afc4724bc99d08b6250a809e1b1040a1','remark','string',0,'-','订单','备注',0,23,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (100,'7ea1604dd117d666c8c84670a7cf69c1','orderNo','String',0,'-','xxx','订单id',0,24,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (101,'091108ac8e8bb814395b016000a7e782','code','integer',0,'-','0','状态码，0：成功',0,24,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (102,'a978c803be3842a481df0332070a3d90','data','object',0,'','','数据',0,24,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (103,'77ef81567422ca97bc902a7b349115a5','userId','number',0,'-','123','用户id',0,24,102,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (104,'d37b4490cc780f62d3fad9fb1db38d67','orderNo','string',0,'-','xxx','订单号',0,24,102,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (105,'e649fc70bccec7d4f626bb686c73ea9d','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,24,102,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (106,'d21177825d839cebb97c81990e70fc8d','orderNo','string',0,'-','aaaa','订单id',0,25,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (107,'87affcf6288d27285a9050f5b3d002cc','remark','string',0,'-','订单','备注',0,25,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (108,'1a6b14f345d366d3af77eea2b55ebe1e','code','integer',0,'-','0','状态码，0：成功',0,25,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (109,'27ad96bbf6ec46b1ebbabb224a072171','data','object',0,'','','数据',0,25,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (110,'b3e7da61e988ee4c0dee9aaa6686fe07','orderNo','string',0,'-','aaaa','订单id',0,25,109,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (111,'70a57deae301407483abc9db8e93e502','remark','string',0,'-','订单','备注',0,25,109,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (112,'36460eff715e9a7a21e82625dc88837b','100001','String',0,'-','','id错误',0,25,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (113,'cefb9f0a1892401bae4be1e82dc9cd2c','100002','String',0,'-','','错误描述2',0,25,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (114,'0ff32e576117c67e72089874cb3881ed','100003','String',0,'-','','错误描述3',0,25,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (115,'e3bcac59c41eba2c6b20bc35df75ce3b','productNo','integer',1,'-','11','产品id',0,26,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (116,'812ab1c9b1aea48d2c66f3d1004b323b','token','String',1,'-','asdfe','token',0,26,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (117,'6114eff1c655e6cfaaba4b4becb87683','qid','string',1,'-','xx','查询id',0,26,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (118,'3d3efbc3c37dfad9e7dd888afe453b1b','id','integer',0,'-','123','id',0,26,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (119,'01c1470e7d40c141bc35b13f802c4f1c','orderNo','string',0,'-','aaaa','订单id',0,26,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (122,'20934eaeb137fe4d252b855ce54e8226','code','integer',0,'-','0','状态码，0：成功',0,26,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (123,'630e4eb3e3e14642a23ab7de50cc2c32','data','object',0,'-','','数据',0,26,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (124,'30bf99206592c3c5cda8e88cf07ed843','productNo','integer',1,'-','11','产品id',0,27,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (125,'1c47d4981f3794628413f9d2487070cd','token','String',1,'-','asdfe','token',0,27,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (126,'9e2c90b18330dbff3c6385fa91b291c6','qid','string',1,'-','xx','查询id',0,27,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (127,'411e79440592ce90e4f1c962d980c394','id','integer',0,'-','123','id',0,27,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (128,'493df97a0e7c4deeb10747cfcf90413b','orderNo','string',0,'-','aaaa','订单id',0,27,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (131,'80b140ca86e47d8ffdc2c2b76389e342','code','integer',0,'-','0','状态码，0：成功',0,27,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (132,'4829a5875f0615563a0f1690e0bdf8aa','data','object',0,'','','数据',0,27,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (133,'c0bd0b0494c82f80f8b5009e7c33b94e','orderNo','string',0,'-','aaaa','订单id',0,27,132,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (134,'073a7c8d6311158093f418612c60f79a','remark','string',0,'-','订单','备注',0,27,132,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (135,'40b407613393b5f780d7406094408dcf','orderDetail','object',0,'','','订单详情',0,27,132,3,1,1,2,'Jim',2,'Jim',2,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (136,'008d41e5fe3b99793b6c8b5cf11f4367','userId','number',0,'-','123','用户id',0,27,135,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (137,'18d2124e2ff8eb7db18fafa333b4862b','orderNo','string',0,'-','xxx','订单号',0,27,135,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (138,'238f52a609b6419e3efff0779bb42a60','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,27,135,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (139,'92abae892c22b8d8cda54d42fc4b317c','products','array',0,'','','产品详情',0,27,132,3,1,1,2,'Jim',2,'Jim',3,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (140,'ba3d41d86a0711cdc47b9422fbc326b8','productNo','string',0,'-','aaaa','产品id',0,27,139,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (141,'c44f35372e4b2b5f4c09c12eaf5acf71','remark','string',0,'-','小米','备注',0,27,139,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (142,'a2b600f413f8650bdefb138b6142f8b8','productDetailVO','object',0,'','','产品详情',0,27,139,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (143,'418edf852a19682a02deec259c264cca','productNo','string',0,'-','aaaa','产品id',0,27,142,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (144,'376a4476b37dd4b074c8af0db90a2c17','remark','string',0,'-','小米','备注',0,27,142,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (145,'77605c8e1debfe3e3fa924c23a10921c','products2','array',0,'','','产品详情2',0,27,132,3,1,1,2,'Jim',2,'Jim',4,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (146,'9ceea0a4180f9f2a3ef3f1728fa60882','productNo','string',0,'-','aaaa','产品id',0,27,145,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (147,'ed9061be7a63df541ade512f2235c88e','remark','string',0,'-','小米','备注',0,27,145,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (148,'ac5b31efb27c156c5a9ffc9974fa86b6','productDetailVO','object',0,'','','产品详情',0,27,145,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (149,'e590f30b98f1a3df9eb9196a170dc7f2','productNo','string',0,'-','aaaa','产品id',0,27,148,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (150,'a329de67e21b67540195f06224e30d3d','remark','string',0,'-','小米','备注',0,27,148,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (151,'7ed2b828ed63209954ef76b74fbdd15d','products3','array',0,'','','产品详情3',0,27,132,3,1,1,2,'Jim',2,'Jim',5,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (152,'335aa1d39325afcf300d3447d6d550d9','productNo','string',0,'-','aaaa','产品id',0,27,151,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (153,'912a57df158ee9fb98fa8cb0aee7025e','remark','string',0,'-','小米','备注',0,27,151,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (154,'1aba8c51efdb50af0a69dad5b8b676ca','productDetailVO','object',0,'','','产品详情',0,27,151,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (155,'4dd4f1c544ac437ed4119db5050dcda0','productNo','string',0,'-','aaaa','产品id',0,27,154,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (156,'f8712c097fa1d7555220161602e14ea6','remark','string',0,'-','小米','备注',0,27,154,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (157,'783167554ab8b18505c1cd357a1d735c','productArr','array',0,'','','产品详情arr',0,27,132,3,1,1,2,'Jim',2,'Jim',6,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (158,'06d10c6b7f5eb1bbc6997063969dfe54','productNo','string',0,'-','aaaa','产品id',0,27,157,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (159,'e51e5b0705a70b9f284ae222349d2845','remark','string',0,'-','小米','备注',0,27,157,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (160,'361db781672ecbbb9aee554536d6167f','productDetailVO','object',0,'','','产品详情',0,27,157,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (161,'5eaed8547bd3e93341bba30c9943f168','productNo','string',0,'-','aaaa','产品id',0,27,160,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (162,'87d7638b15d71216e4231a2e60679af0','remark','string',0,'-','小米','备注',0,27,160,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (163,'cb13d1285b6be3f1b3f67decd3013d2a','productNo','integer',1,'-','11','产品id',0,28,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (164,'eb54f27393dad80ad9f6fcf1ca3f345a','token','String',1,'-','asdfe','token',0,28,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (165,'9fbdb578a090adef2742b305e673a8ec','qid','string',1,'-','xx','查询id',0,28,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (166,'a9fc89056f306181cd8b0dd541a3fcbb','file','file',1,'-','','文件',0,28,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (167,'800accd0038c97f428c5259de89c5c5f','code','integer',0,'-','0','状态码，0：成功',0,28,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (168,'89527b4d92f55c290d87cbc843b32f2b','data','object',0,'-','','数据',0,28,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (169,'29ddea9191d77a38facf5ad51e743e7d','orderNo','string',0,'-','aaaa','订单id',0,29,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (170,'05a8322c9a6c2a161b3a3f967aedc851','remark','string',0,'-','订单','备注',0,29,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (171,'a2ef677b2a0f9de1049066b22789fc82','code','integer',0,'-','0','状态码，0：成功',0,29,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (172,'17b3538b64573f55d4f2dd3f7d9e340b','data','object',0,'','','数据',0,29,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (173,'2607d8f643981968c0181b2bd034bb64','orderNo','string',0,'-','aaaa','订单id',0,29,172,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (174,'9f48f962adf03de7547311670345368e','remark','string',0,'-','订单','备注',0,29,172,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (175,'635f25e5d792caaf985ab84537200f4d','orderNo','String',1,'-','xxx','订单id',0,30,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (176,'7a658cf66f3fe5d6c956ab9db0dcba00','orderNo','String',0,'-','xxx','订单id',0,30,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (177,'09565b835b400eb7ff300eaca52dcb7f','code','integer',0,'-','0','状态码，0：成功',0,30,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (178,'9a47544fd3e0d1d18550658e81601e4e','data','object',0,'','','数据',0,30,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (179,'12270736d940c7a6b12d9100fc04dccd','userId','number',0,'-','123','用户id',0,30,178,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (180,'1d00eba251f5f620901c87d4ca1432c6','orderNo','string',0,'-','xxx','订单号',0,30,178,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (181,'9dc25c45377fc5a9414d53162694c47b','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,30,178,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (182,'ffd132900589dcae6503c424943e9e4c','orderNo','String',0,'-','xxx','订单id',0,31,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (183,'ba80f33728800383642d5e2f681c008c','code','integer',0,'-','0','状态码，0：成功',0,31,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (184,'8be75c2c683e4cad7b094f42e5f5f9ce','data','object',0,'','','数据',0,31,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (185,'8e7cb6f00fd77e4b433517aeef7962b4','userId','number',0,'-','123','用户id',0,31,184,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (186,'94d8979c238fde4e19413ba5f982e44a','orderNo','string',0,'-','xxx','订单号',0,31,184,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (187,'7b95ebe4a4e3058f9b7b54beb27c11ee','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,31,184,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (188,'9013ae7e090a1d78a88a3add789a77f5','productNo','Integer',1,'-','11','产品id',0,32,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (189,'194fee94586186f23954a223cb7f3be7','token','String',1,'-','asdfe','token',0,32,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (190,'45417aba02cd8f62b95310b1977ed9c5','qid','String',0,'-','xx','查询id',0,32,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (191,'4e8ee7ee5db785e025df5da6a4be52d2','id','integer',0,'-','123','id',0,32,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (192,'1e98f88ae58383c9c38c903021d81ed1','orderNo','string',0,'-','aaaa','订单id',0,32,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (193,'99a8616ca96b3764796d25982a6410c6','code','integer',0,'-','0','状态码，0：成功',0,32,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (194,'b7bdde2bd2de256e47cbca48ff541ca0','data','object',0,'','','数据',0,32,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (195,'9e86472c86bf53f791f12eda4ef885bf','orderNo','string',0,'-','aaaa','订单id',0,32,194,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (196,'4360655b9cd479ffa3ee7e3c3e9effd2','remark','string',0,'-','订单','备注',0,32,194,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (197,'51d099a09028b5ffa86683f90a3e893c','orderDetail','object',0,'','','订单详情',0,32,194,3,1,1,2,'Jim',2,'Jim',2,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (198,'2e4421daada6bb561ea9d4ce17293176','userId','number',0,'-','123','用户id',0,32,197,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (199,'d8154aa3347a09292ac7276973f1a84c','orderNo','string',0,'-','xxx','订单号',0,32,197,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (200,'a022cbc10e9807d285ca0f81b5a04326','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,32,197,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (201,'f5cb61d2604178f894e45594a425ce97','products','array',0,'','','产品详情',0,32,194,3,1,1,2,'Jim',2,'Jim',3,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (202,'8b2b379b755f0e9e776331c26cc629c1','productNo','string',0,'-','aaaa','产品id',0,32,201,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (203,'a80b6d57b8ebd715e591fb3495ccc1ff','remark','string',0,'-','小米','备注',0,32,201,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (204,'392b4c1999136e82af3f8df461200fb2','productDetailVO','object',0,'','','产品详情',0,32,201,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (205,'87fdd7c17f5ab1f36dedb605cb8bcfe2','productNo','string',0,'-','aaaa','产品id',0,32,204,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (206,'a4e84a92dffb419991412907087fde65','remark','string',0,'-','小米','备注',0,32,204,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (207,'fb4f0382a10404bb580496754f9daa02','products2','array',0,'','','产品详情2',0,32,194,3,1,1,2,'Jim',2,'Jim',4,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (208,'a9a1ffc1c291254126313236b89f2e73','productNo','string',0,'-','aaaa','产品id',0,32,207,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (209,'08325c86d943776d490446808c8856fa','remark','string',0,'-','小米','备注',0,32,207,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (210,'959abba7ee8c1591773f029ed156276e','productDetailVO','object',0,'','','产品详情',0,32,207,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (211,'3eff17b737d7ec788d832c2386bcdaf2','productNo','string',0,'-','aaaa','产品id',0,32,210,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (212,'da91f958dd723257785a8e4f239d7512','remark','string',0,'-','小米','备注',0,32,210,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (213,'cc77b4577154bb7a3d11be3c9d40d9c4','products3','array',0,'','','产品详情3',0,32,194,3,1,1,2,'Jim',2,'Jim',5,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (214,'50f92b6dff998eb1ea6f04eb2e049d2a','productNo','string',0,'-','aaaa','产品id',0,32,213,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (215,'ec1d74c13715b6850755e1ca09242013','remark','string',0,'-','小米','备注',0,32,213,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (216,'171fd4c155b34ff25b3d5dd01624edfa','productDetailVO','object',0,'','','产品详情',0,32,213,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (217,'3e4959ab4fddddf8dca2bd6f64829fee','productNo','string',0,'-','aaaa','产品id',0,32,216,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (218,'07732a51890afd0f7fa49fdad82490e2','remark','string',0,'-','小米','备注',0,32,216,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (219,'e98334be70e2db4010aa2f9acd4446c5','productArr','array',0,'','','产品详情arr',0,32,194,3,1,1,2,'Jim',2,'Jim',6,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (220,'f2d59b634f94eebb1d1d3e6004e6e7f7','productNo','string',0,'-','aaaa','产品id',0,32,219,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (221,'548d553e2ac6ce7d4371fa00e95fd165','remark','string',0,'-','小米','备注',0,32,219,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (222,'ecd05b58c4a684520fc558513aa845a3','productDetailVO','object',0,'','','产品详情',0,32,219,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (223,'0bb0d90ab68cb1f29481ae97f85a84ab','productNo','string',0,'-','aaaa','产品id',0,32,222,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (224,'46c293af244b047b340bdb4ef9710a3a','remark','string',0,'-','小米','备注',0,32,222,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (225,'ffa37f95b949f54b48d68e5737860d33','productNo','Integer',1,'-','','',0,33,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (226,'e512fefcd6798cca4a6c61f3387b1828','token','String',1,'-','','',0,33,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (227,'cb997b29362e102257401aeb1ce1736d','qid','String',0,'-','','',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (228,'470811a0ef439cff787fefa1928f1953','productNo','Integer',0,'-','','',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (229,'4ac70e1396bbca9a3135f2f261bb40b3','token','String',0,'-','','',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (230,'6eaa61d80915cd5e39663663e3c46cf8','id','integer',1,'-','1','查询id',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (231,'1a8643766058a62d720a4f31958446c3','orderNo','integer',0,'-','xxx','订单id',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (232,'1fd1770abb5c6dbaec548c4ce64a4749','code','integer',0,'-','0','状态码，0：成功',0,33,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (233,'d1b9be6652142432b2b00c3dd210eecc','data','array',0,'','','数据',0,33,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (234,'2a7093b3e7a9b0a05d9bf4e79dc4a206','userId','number',0,'-','123','用户id',0,33,233,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (235,'1cb84c7c0ed96d582d3a9d9116dee89e','orderNo','string',0,'-','xxx','订单号',0,33,233,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (236,'bffa32e265bb443213a91ef3ada21305','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,33,233,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (237,'4bad03085b444504c796679865ca8108','code','integer',0,'-','0','状态码，0：成功',0,35,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (238,'cfef20e6813836873cf506952879c382','data','object',0,'','','数据',0,35,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (239,'db18308c17fbf630b57d0303a7a9af03','id','integer',0,'-','','',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (240,'126f895f424fe90eefc86d3b9a0e8561','name','string',0,'-','','名称',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (241,'f4413905452fe4821eeb52872604f435','parentId','integer',0,'-','','父id',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (242,'5d622869a4ee2b93129b991904662273','children','array',0,'','','子节点',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (243,'404c22450e9a8d80f55964d6acd1f9bb','id','integer',0,'-','','',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (244,'253240af265774bbf2f25bc84e264cad','name','string',0,'-','','名称',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (245,'470885a96535f07de1af8c682b3119d5','parentId','integer',0,'-','','父id',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (246,'25c8203117d1147a8694fc87a21bdd58','children','array',0,'-','','子节点',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (247,'748c4ab34e286c9f56a42820772f26b8','productNo','Integer',1,'-','123','产品id',0,36,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (248,'339733d17bd4a7bd0ef50e9c9195b559','productNo','Integer',0,'-','123','产品id',0,36,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (249,'036bd027d059a5df1a68da8564a2fbe3','productNo','string',0,'-','aaaa','产品id',0,36,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (250,'4f990edab98fe3a3f9a99cc89350a5ac','remark','string',0,'-','小米','备注',0,36,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (251,'894ae45061adcdd417619fb633575b4b','productDetailVO','object',0,'','','产品详情',0,36,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (252,'fdd2db7c376976b31cfff04798d7a52f','productNo','string',0,'-','aaaa','产品id',0,36,251,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (253,'29883c730cf9d36bba9758d5bb52fa3e','remark','string',0,'-','小米','备注',0,36,251,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (254,'b04de9854965a39a2f3268e3b9d4c0d1','100001','String',0,'-','','id错误',0,36,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (255,'788b90ef067d5c8f977fcf98606fc073','100002','String',0,'-','','错误描述2',0,36,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (256,'32bf6eb90790a489eb16c6ead71549af','100003','String',0,'-','','错误描述3',0,36,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (257,'20fa7cf58fd296569d59ccdfe2708177','file','file',1,'-','','产品模板文件',0,37,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (258,'f7b2209cabe7d77128a20f3feab79e5a','productNo','String',1,'-','111','产品id',0,37,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (259,'ed4a68feeca8bbc3116be7d3c02238f2','code','integer',0,'-','0','状态码，0：成功',0,37,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (260,'993aac43e5e977be867b163404057717','data','object',0,'-','','数据',0,37,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (261,'fb948d90f6987762ba09bd4b59ad11ca','file','file',0,'-','','产品模板文件',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (262,'8b5e84f261c5707090f05806a7d10982','files','file[]',0,'-','','产品模板文件Array',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (263,'4c96dba27235f710168a893889ab7874','fileList','file[]',0,'-','','产品模板文件List',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (264,'3d8d331903744306c6d76a0c150f515b','productNo','string',1,'-','111','产品id',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (265,'3b3fb4ae48177d3d7c76e9319393635a','code','integer',0,'-','0','状态码，0：成功',0,38,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (266,'82dd57c7dee4618f97068bf271cdb2f8','data','object',0,'-','','数据',0,38,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (267,'166e20da9e17c235d9e9e25c25f43640','files','file[]',1,'-','','产品模板文件',0,39,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (268,'39a5f028ec63030df158e4aeff9da4ed','productNo','String',1,'-','111','产品id',0,39,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (269,'db930770f6a9ec313407f8f4aa7e0448','code','integer',0,'-','0','状态码，0：成功',0,39,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (270,'df5ac720266566ed4e6e66df96330af8','data','object',0,'-','','数据',0,39,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'); INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -571,7 +775,8 @@ INSERT INTO `module` (`id`, `name`, `project_id`, `type`, `import_url`, `basic_a INSERT INTO `module_config` (`id`, `module_id`, `type`, `config_key`, `config_value`, `extend_id`, `description`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,0,'debughost_1','http://10.1.30.165:2222',0,'',0,'2020-12-15 10:01:48','2021-01-22 11:51:05'), - (2,2,0,'debughost_2','http://www.aaa.com',0,'',0,'2020-12-16 15:41:14','2020-12-16 15:41:14'); + (2,2,0,'debughost_2','http://www.aaa.com',0,'',0,'2020-12-16 15:41:14','2020-12-16 15:41:14'), + (3,3,2,'test','http://127.0.0.1:8088',0,'',0,'2021-06-08 13:54:23','2021-06-08 13:54:23'); INSERT INTO `open_user` (`id`, `app_key`, `secret`, `status`, `applicant`, `space_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -678,7 +883,3 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (6,1,1,2,0,'2021-01-18 17:18:07','2021-01-18 17:18:07'), (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); - - - - diff --git a/torna-docker-compose/mysql.sql b/torna-docker-compose/mysql.sql index 3d840136..e6c2e150 100644 --- a/torna-docker-compose/mysql.sql +++ b/torna-docker-compose/mysql.sql @@ -1,12 +1,11 @@ -- 适用于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`; @@ -105,7 +104,7 @@ CREATE TABLE `doc_info` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_data_id` (`data_id`) USING BTREE, KEY `idx_moduleid` (`module_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8mb4 COMMENT='文档信息'; +) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8mb4 COMMENT='文档信息'; CREATE TABLE `doc_param` ( @@ -134,7 +133,7 @@ CREATE TABLE `doc_param` ( PRIMARY KEY (`id`), UNIQUE KEY `uk_dataid` (`data_id`) USING BTREE, KEY `idx_docid` (`doc_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=84 DEFAULT CHARSET=utf8mb4 COMMENT='文档参数'; +) ENGINE=InnoDB AUTO_INCREMENT=271 DEFAULT CHARSET=utf8mb4 COMMENT='文档参数'; CREATE TABLE `enum_info` ( @@ -234,7 +233,7 @@ CREATE TABLE `module_config` ( `gmt_modified` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, PRIMARY KEY (`id`), KEY `idx_moduleid_type` (`module_id`,`type`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb4 COMMENT='系统配置'; +) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb4 COMMENT='系统配置'; CREATE TABLE `open_user` ( @@ -466,7 +465,29 @@ INSERT INTO `doc_info` (`id`, `data_id`, `name`, `description`, `author`, `type` (14,'3f3aab998c9785fe13d41e02c95f7ef4','食物接口','','',0,'','','',1,0,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (15,'4942c1bd41bbf75d995722986f70a9f4','获取食物','','',0,'/food/getFoodById','GET','',0,14,1,1,1,1,0,0,'object','object',0,0,3,'',3,'',0,'',1,0,'2020-12-15 10:01:48','2020-12-15 10:01:48'), (16,'940818d032209bc3628895d483463ce1','获取用户接口','获取用户接口','',0,'get/group/{groupId}/id/{id}','GET','',0,0,2,1,1,1,0,0,'object','object',0,0,12,'李四',1,'超级管理员',0,'ccc',1,0,'2020-12-15 10:15:55','2021-01-18 15:05:16'), - (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'); + (17,'2df0b4e87fc3a8c37d08e3d7a95d0cf4','comment','','',0,'phoenix/web/v1/comment/list/101426186','GET','',0,0,1,1,1,1,0,0,'object','object',0,0,2,'研发一部经理',1,'研发一部经理',0,'',1,1,'2021-01-19 17:29:23','2021-01-22 11:52:21'), + (18,'c018597c3da062833820d46754d8d74f','订单模块','','',0,'','','',1,0,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:22','2021-06-08 13:54:22'), + (19,'1d3c432b05bf4b7203ebace0bf044c1f','提交数组/返回数组5','List方式','',0,'/order/postArr5','POST','application/json',0,18,3,1,1,1,1,1,'integer','integer',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (20,'4b5436a9e81ac22371e0f7b6b00afb8c','提交数组/返回数组3','','',0,'/order/postArr3','POST','application/json',0,18,3,1,1,1,1,1,'object','integer',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (21,'2ced912c74e4eb9a53479413f39d4b19','提交数组/返回数组2','','',0,'/order/postArr2','POST','application/json',0,18,3,1,1,1,1,1,'integer','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (22,'b60a5a7e94a05644bf50254d9fdf6eab','提交数组/返回数组4','List方式','',0,'/order/postArr4','POST','application/json',0,18,3,1,1,1,1,1,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (23,'1d8483ef6bb80ccd79cf114d56461b05','提交数组/返回数组','','',0,'/order/postArr','POST','application/json',0,18,3,1,1,1,1,1,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (24,'0e36106f99a0adb4d4f3160c1c2ae6c3','演示query参数,不加@RequestParam','演示query参数,不加@RequestParam','',0,'/order/get','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (25,'1d0253f8f8fb2f3e2ae352dddfa5f2be','提交订单信息，application/json','提交订单信息，application/json','Tom',0,'/order/create','POST','application/json',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (26,'1081d1f598bcc0df2a48894a506212ae','全部参数form，全部由@ApiImplicitParams实现','全部由@ApiImplicitParams实现','',0,'/order/submit3/{productNo}','POST','application/x-www-form-urlencoded',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (27,'73e15ad9d976104a63ae2771dc5223d2','全部参数json，全部由@ApiImplicitParams实现','全部由@ApiImplicitParams实现','',0,'/order/submit2/{productNo}','POST','application/json',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (28,'874136230933126ceb9e164411ae059b','全部参数upload，全部由@ApiImplicitParams实现','全部由@ApiImplicitParams实现','',0,'/order/submit4/{productNo}','POST','multipart/form-data',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (29,'b9bdb068beda69e48579c7725a835030','提交订单信息，application/x-www-form-urlencoded','提交订单信息，application/x-www-form-urlencoded','',0,'/order/create2','POST','application/x-www-form-urlencoded',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (30,'e7b907533f53eb25306c649c2f3cc2f9','演示path参数','演示path参数','',0,'/order/get/{orderNo}','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (31,'b34e5dcb5db2e798861857ec008a9bc9','演示query参数,加@RequestParam','演示query参数,加@RequestParam','',0,'/order/get2','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (32,'52cf7d54d887867c18a229ab93fe4df1','演示path参数+query参数+body参数+header','提交订单信息说明。。','',0,'/order/submit/{productNo}','POST','application/json',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (33,'4fbc6d999497b96a284eff0f110e5fcb','获取某个产品下的订单','注意：html演示。。','',0,'/order/get/{productNo}','GET','',0,18,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (34,'16f0ece214cf202e41fe482494b0ebce','产品模块','','',0,'','','',1,0,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',-1,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (35,'1ab4dee15c5cb5f16205446f16e8ba01','返回树','','',0,'/product/getTree','GET','',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (36,'2146fa58a9dcdb3f7c52d350e9732a27','获取产品','获取产品说明。。','Tom,Jim',0,'/product/get/{productNo}','GET','',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',0,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (37,'d8fe88fd74144ac90b50d94bde7414ee','上传文件','','',0,'/product/upload','POST','multipart/form-data',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',11,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (38,'9edd7624130fe72727016b02df1e9d77','上传文件2','','',0,'/product/upload2','POST','multipart/form-data',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',12,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (39,'8bccd6dd861c2671738b56e179d8804d','上传文件3','','',0,'/product/upload3','POST','multipart/form-data',0,34,3,1,1,1,0,0,'object','object',1,1,2,'Jim',2,'Jim',13,'',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'); INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_length`, `example`, `description`, `enum_id`, `doc_id`, `parent_id`, `style`, `create_mode`, `modify_mode`, `creator_id`, `creator_name`, `modifier_id`, `modifier_name`, `order_index`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -552,7 +573,190 @@ INSERT INTO `doc_param` (`id`, `data_id`, `name`, `type`, `required`, `max_lengt (80,'9584e01340755ba6f8c82df9eb032d89','token','string',1,'64','1111','token',0,2,0,1,0,0,1,'超级管理员',1,'超级管理员',0,0,'2021-01-19 10:32:09','2021-01-19 16:39:35'), (81,'e50bb76340fd01b339e1a2aa8d3215f3','page','string',1,'64','1','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'), (82,'227be5c273852f1927611268522efa00','size','string',1,'64','10','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'), - (83,'14c5f6044d9ce6850dc4e1951d0151f2','commentId','string',1,'64','','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'); + (83,'14c5f6044d9ce6850dc4e1951d0151f2','commentId','string',1,'64','','',0,17,0,2,0,0,2,'研发一部经理',2,'研发一部经理',0,0,'2021-01-19 17:29:23','2021-01-19 17:29:23'), + (84,'a5b6cf48c787af0c5134e913be3d9430','','integer',0,'-','1,2,3','订单id',0,19,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (85,'f9af347c3f5ed5c3806cf599d3fbe451','','integer',0,'-','4,5,6','返回订单id',0,19,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (86,'d6d70fa7d4772f7ebc78202136e5bf68','orderNo','string',0,'-','aaaa','订单id',0,20,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (87,'d052a21bd76ba3ed86c5c9ac6bc1955c','remark','string',0,'-','订单','备注',0,20,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (88,'f7c14baf034ef3dd91bb5ef6313fe3e9','','integer',0,'-','1,2,3','订单id',0,20,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (89,'05d8e546708fef42108b7f635c7ec5dc','','integer',0,'-','1,2,3','订单id',0,21,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (90,'5f9026861a38004ef982d262742db7c1','orderNo','string',0,'-','aaaa','订单id',0,21,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (91,'e7f04c283b820db984a3ca6bd27993be','remark','string',0,'-','订单','备注',0,21,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (92,'6ef100c9aa2e124f83c5f801d85f796a','orderNo','string',0,'-','aaaa','订单id',0,22,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (93,'4e50d9fba9c00acaaf63c8c2ed886460','remark','string',0,'-','订单','备注',0,22,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (94,'6355281c7ff265f27fbeebc32ce42a01','orderNo','string',0,'-','aaaa','订单id',0,22,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (95,'4ad48afcca35dad0317a4fbbd7f9ac21','remark','string',0,'-','订单','备注',0,22,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (96,'0c4e2f79eb1e495953f3dfa0a4159f66','orderNo','string',0,'-','aaaa','订单id',0,23,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (97,'7add78ade786825bf96865a71562898f','remark','string',0,'-','订单','备注',0,23,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (98,'e90aa6c4c29198933369486e39984ec8','orderNo','string',0,'-','aaaa','订单id',0,23,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (99,'afc4724bc99d08b6250a809e1b1040a1','remark','string',0,'-','订单','备注',0,23,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (100,'7ea1604dd117d666c8c84670a7cf69c1','orderNo','String',0,'-','xxx','订单id',0,24,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (101,'091108ac8e8bb814395b016000a7e782','code','integer',0,'-','0','状态码，0：成功',0,24,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (102,'a978c803be3842a481df0332070a3d90','data','object',0,'','','数据',0,24,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (103,'77ef81567422ca97bc902a7b349115a5','userId','number',0,'-','123','用户id',0,24,102,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (104,'d37b4490cc780f62d3fad9fb1db38d67','orderNo','string',0,'-','xxx','订单号',0,24,102,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (105,'e649fc70bccec7d4f626bb686c73ea9d','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,24,102,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (106,'d21177825d839cebb97c81990e70fc8d','orderNo','string',0,'-','aaaa','订单id',0,25,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (107,'87affcf6288d27285a9050f5b3d002cc','remark','string',0,'-','订单','备注',0,25,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (108,'1a6b14f345d366d3af77eea2b55ebe1e','code','integer',0,'-','0','状态码，0：成功',0,25,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (109,'27ad96bbf6ec46b1ebbabb224a072171','data','object',0,'','','数据',0,25,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (110,'b3e7da61e988ee4c0dee9aaa6686fe07','orderNo','string',0,'-','aaaa','订单id',0,25,109,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (111,'70a57deae301407483abc9db8e93e502','remark','string',0,'-','订单','备注',0,25,109,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (112,'36460eff715e9a7a21e82625dc88837b','100001','String',0,'-','','id错误',0,25,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (113,'cefb9f0a1892401bae4be1e82dc9cd2c','100002','String',0,'-','','错误描述2',0,25,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (114,'0ff32e576117c67e72089874cb3881ed','100003','String',0,'-','','错误描述3',0,25,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (115,'e3bcac59c41eba2c6b20bc35df75ce3b','productNo','integer',1,'-','11','产品id',0,26,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (116,'812ab1c9b1aea48d2c66f3d1004b323b','token','String',1,'-','asdfe','token',0,26,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (117,'6114eff1c655e6cfaaba4b4becb87683','qid','string',1,'-','xx','查询id',0,26,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (118,'3d3efbc3c37dfad9e7dd888afe453b1b','id','integer',0,'-','123','id',0,26,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (119,'01c1470e7d40c141bc35b13f802c4f1c','orderNo','string',0,'-','aaaa','订单id',0,26,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (122,'20934eaeb137fe4d252b855ce54e8226','code','integer',0,'-','0','状态码，0：成功',0,26,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (123,'630e4eb3e3e14642a23ab7de50cc2c32','data','object',0,'-','','数据',0,26,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (124,'30bf99206592c3c5cda8e88cf07ed843','productNo','integer',1,'-','11','产品id',0,27,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (125,'1c47d4981f3794628413f9d2487070cd','token','String',1,'-','asdfe','token',0,27,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (126,'9e2c90b18330dbff3c6385fa91b291c6','qid','string',1,'-','xx','查询id',0,27,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (127,'411e79440592ce90e4f1c962d980c394','id','integer',0,'-','123','id',0,27,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (128,'493df97a0e7c4deeb10747cfcf90413b','orderNo','string',0,'-','aaaa','订单id',0,27,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (131,'80b140ca86e47d8ffdc2c2b76389e342','code','integer',0,'-','0','状态码，0：成功',0,27,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (132,'4829a5875f0615563a0f1690e0bdf8aa','data','object',0,'','','数据',0,27,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (133,'c0bd0b0494c82f80f8b5009e7c33b94e','orderNo','string',0,'-','aaaa','订单id',0,27,132,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (134,'073a7c8d6311158093f418612c60f79a','remark','string',0,'-','订单','备注',0,27,132,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (135,'40b407613393b5f780d7406094408dcf','orderDetail','object',0,'','','订单详情',0,27,132,3,1,1,2,'Jim',2,'Jim',2,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (136,'008d41e5fe3b99793b6c8b5cf11f4367','userId','number',0,'-','123','用户id',0,27,135,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (137,'18d2124e2ff8eb7db18fafa333b4862b','orderNo','string',0,'-','xxx','订单号',0,27,135,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (138,'238f52a609b6419e3efff0779bb42a60','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,27,135,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (139,'92abae892c22b8d8cda54d42fc4b317c','products','array',0,'','','产品详情',0,27,132,3,1,1,2,'Jim',2,'Jim',3,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (140,'ba3d41d86a0711cdc47b9422fbc326b8','productNo','string',0,'-','aaaa','产品id',0,27,139,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (141,'c44f35372e4b2b5f4c09c12eaf5acf71','remark','string',0,'-','小米','备注',0,27,139,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (142,'a2b600f413f8650bdefb138b6142f8b8','productDetailVO','object',0,'','','产品详情',0,27,139,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (143,'418edf852a19682a02deec259c264cca','productNo','string',0,'-','aaaa','产品id',0,27,142,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (144,'376a4476b37dd4b074c8af0db90a2c17','remark','string',0,'-','小米','备注',0,27,142,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (145,'77605c8e1debfe3e3fa924c23a10921c','products2','array',0,'','','产品详情2',0,27,132,3,1,1,2,'Jim',2,'Jim',4,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (146,'9ceea0a4180f9f2a3ef3f1728fa60882','productNo','string',0,'-','aaaa','产品id',0,27,145,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (147,'ed9061be7a63df541ade512f2235c88e','remark','string',0,'-','小米','备注',0,27,145,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (148,'ac5b31efb27c156c5a9ffc9974fa86b6','productDetailVO','object',0,'','','产品详情',0,27,145,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (149,'e590f30b98f1a3df9eb9196a170dc7f2','productNo','string',0,'-','aaaa','产品id',0,27,148,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (150,'a329de67e21b67540195f06224e30d3d','remark','string',0,'-','小米','备注',0,27,148,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (151,'7ed2b828ed63209954ef76b74fbdd15d','products3','array',0,'','','产品详情3',0,27,132,3,1,1,2,'Jim',2,'Jim',5,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (152,'335aa1d39325afcf300d3447d6d550d9','productNo','string',0,'-','aaaa','产品id',0,27,151,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (153,'912a57df158ee9fb98fa8cb0aee7025e','remark','string',0,'-','小米','备注',0,27,151,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (154,'1aba8c51efdb50af0a69dad5b8b676ca','productDetailVO','object',0,'','','产品详情',0,27,151,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (155,'4dd4f1c544ac437ed4119db5050dcda0','productNo','string',0,'-','aaaa','产品id',0,27,154,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (156,'f8712c097fa1d7555220161602e14ea6','remark','string',0,'-','小米','备注',0,27,154,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (157,'783167554ab8b18505c1cd357a1d735c','productArr','array',0,'','','产品详情arr',0,27,132,3,1,1,2,'Jim',2,'Jim',6,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (158,'06d10c6b7f5eb1bbc6997063969dfe54','productNo','string',0,'-','aaaa','产品id',0,27,157,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (159,'e51e5b0705a70b9f284ae222349d2845','remark','string',0,'-','小米','备注',0,27,157,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (160,'361db781672ecbbb9aee554536d6167f','productDetailVO','object',0,'','','产品详情',0,27,157,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (161,'5eaed8547bd3e93341bba30c9943f168','productNo','string',0,'-','aaaa','产品id',0,27,160,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (162,'87d7638b15d71216e4231a2e60679af0','remark','string',0,'-','小米','备注',0,27,160,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (163,'cb13d1285b6be3f1b3f67decd3013d2a','productNo','integer',1,'-','11','产品id',0,28,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (164,'eb54f27393dad80ad9f6fcf1ca3f345a','token','String',1,'-','asdfe','token',0,28,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (165,'9fbdb578a090adef2742b305e673a8ec','qid','string',1,'-','xx','查询id',0,28,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (166,'a9fc89056f306181cd8b0dd541a3fcbb','file','file',1,'-','','文件',0,28,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (167,'800accd0038c97f428c5259de89c5c5f','code','integer',0,'-','0','状态码，0：成功',0,28,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (168,'89527b4d92f55c290d87cbc843b32f2b','data','object',0,'-','','数据',0,28,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (169,'29ddea9191d77a38facf5ad51e743e7d','orderNo','string',0,'-','aaaa','订单id',0,29,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (170,'05a8322c9a6c2a161b3a3f967aedc851','remark','string',0,'-','订单','备注',0,29,0,2,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (171,'a2ef677b2a0f9de1049066b22789fc82','code','integer',0,'-','0','状态码，0：成功',0,29,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (172,'17b3538b64573f55d4f2dd3f7d9e340b','data','object',0,'','','数据',0,29,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (173,'2607d8f643981968c0181b2bd034bb64','orderNo','string',0,'-','aaaa','订单id',0,29,172,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (174,'9f48f962adf03de7547311670345368e','remark','string',0,'-','订单','备注',0,29,172,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (175,'635f25e5d792caaf985ab84537200f4d','orderNo','String',1,'-','xxx','订单id',0,30,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (176,'7a658cf66f3fe5d6c956ab9db0dcba00','orderNo','String',0,'-','xxx','订单id',0,30,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (177,'09565b835b400eb7ff300eaca52dcb7f','code','integer',0,'-','0','状态码，0：成功',0,30,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (178,'9a47544fd3e0d1d18550658e81601e4e','data','object',0,'','','数据',0,30,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (179,'12270736d940c7a6b12d9100fc04dccd','userId','number',0,'-','123','用户id',0,30,178,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (180,'1d00eba251f5f620901c87d4ca1432c6','orderNo','string',0,'-','xxx','订单号',0,30,178,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (181,'9dc25c45377fc5a9414d53162694c47b','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,30,178,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (182,'ffd132900589dcae6503c424943e9e4c','orderNo','String',0,'-','xxx','订单id',0,31,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (183,'ba80f33728800383642d5e2f681c008c','code','integer',0,'-','0','状态码，0：成功',0,31,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (184,'8be75c2c683e4cad7b094f42e5f5f9ce','data','object',0,'','','数据',0,31,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (185,'8e7cb6f00fd77e4b433517aeef7962b4','userId','number',0,'-','123','用户id',0,31,184,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (186,'94d8979c238fde4e19413ba5f982e44a','orderNo','string',0,'-','xxx','订单号',0,31,184,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (187,'7b95ebe4a4e3058f9b7b54beb27c11ee','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,31,184,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (188,'9013ae7e090a1d78a88a3add789a77f5','productNo','Integer',1,'-','11','产品id',0,32,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (189,'194fee94586186f23954a223cb7f3be7','token','String',1,'-','asdfe','token',0,32,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (190,'45417aba02cd8f62b95310b1977ed9c5','qid','String',0,'-','xx','查询id',0,32,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (191,'4e8ee7ee5db785e025df5da6a4be52d2','id','integer',0,'-','123','id',0,32,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (192,'1e98f88ae58383c9c38c903021d81ed1','orderNo','string',0,'-','aaaa','订单id',0,32,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (193,'99a8616ca96b3764796d25982a6410c6','code','integer',0,'-','0','状态码，0：成功',0,32,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (194,'b7bdde2bd2de256e47cbca48ff541ca0','data','object',0,'','','数据',0,32,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (195,'9e86472c86bf53f791f12eda4ef885bf','orderNo','string',0,'-','aaaa','订单id',0,32,194,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (196,'4360655b9cd479ffa3ee7e3c3e9effd2','remark','string',0,'-','订单','备注',0,32,194,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (197,'51d099a09028b5ffa86683f90a3e893c','orderDetail','object',0,'','','订单详情',0,32,194,3,1,1,2,'Jim',2,'Jim',2,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (198,'2e4421daada6bb561ea9d4ce17293176','userId','number',0,'-','123','用户id',0,32,197,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (199,'d8154aa3347a09292ac7276973f1a84c','orderNo','string',0,'-','xxx','订单号',0,32,197,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (200,'a022cbc10e9807d285ca0f81b5a04326','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,32,197,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (201,'f5cb61d2604178f894e45594a425ce97','products','array',0,'','','产品详情',0,32,194,3,1,1,2,'Jim',2,'Jim',3,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (202,'8b2b379b755f0e9e776331c26cc629c1','productNo','string',0,'-','aaaa','产品id',0,32,201,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (203,'a80b6d57b8ebd715e591fb3495ccc1ff','remark','string',0,'-','小米','备注',0,32,201,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (204,'392b4c1999136e82af3f8df461200fb2','productDetailVO','object',0,'','','产品详情',0,32,201,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (205,'87fdd7c17f5ab1f36dedb605cb8bcfe2','productNo','string',0,'-','aaaa','产品id',0,32,204,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (206,'a4e84a92dffb419991412907087fde65','remark','string',0,'-','小米','备注',0,32,204,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (207,'fb4f0382a10404bb580496754f9daa02','products2','array',0,'','','产品详情2',0,32,194,3,1,1,2,'Jim',2,'Jim',4,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (208,'a9a1ffc1c291254126313236b89f2e73','productNo','string',0,'-','aaaa','产品id',0,32,207,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (209,'08325c86d943776d490446808c8856fa','remark','string',0,'-','小米','备注',0,32,207,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (210,'959abba7ee8c1591773f029ed156276e','productDetailVO','object',0,'','','产品详情',0,32,207,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (211,'3eff17b737d7ec788d832c2386bcdaf2','productNo','string',0,'-','aaaa','产品id',0,32,210,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (212,'da91f958dd723257785a8e4f239d7512','remark','string',0,'-','小米','备注',0,32,210,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (213,'cc77b4577154bb7a3d11be3c9d40d9c4','products3','array',0,'','','产品详情3',0,32,194,3,1,1,2,'Jim',2,'Jim',5,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (214,'50f92b6dff998eb1ea6f04eb2e049d2a','productNo','string',0,'-','aaaa','产品id',0,32,213,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (215,'ec1d74c13715b6850755e1ca09242013','remark','string',0,'-','小米','备注',0,32,213,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (216,'171fd4c155b34ff25b3d5dd01624edfa','productDetailVO','object',0,'','','产品详情',0,32,213,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (217,'3e4959ab4fddddf8dca2bd6f64829fee','productNo','string',0,'-','aaaa','产品id',0,32,216,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (218,'07732a51890afd0f7fa49fdad82490e2','remark','string',0,'-','小米','备注',0,32,216,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (219,'e98334be70e2db4010aa2f9acd4446c5','productArr','array',0,'','','产品详情arr',0,32,194,3,1,1,2,'Jim',2,'Jim',6,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (220,'f2d59b634f94eebb1d1d3e6004e6e7f7','productNo','string',0,'-','aaaa','产品id',0,32,219,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (221,'548d553e2ac6ce7d4371fa00e95fd165','remark','string',0,'-','小米','备注',0,32,219,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (222,'ecd05b58c4a684520fc558513aa845a3','productDetailVO','object',0,'','','产品详情',0,32,219,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (223,'0bb0d90ab68cb1f29481ae97f85a84ab','productNo','string',0,'-','aaaa','产品id',0,32,222,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (224,'46c293af244b047b340bdb4ef9710a3a','remark','string',0,'-','小米','备注',0,32,222,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (225,'ffa37f95b949f54b48d68e5737860d33','productNo','Integer',1,'-','','',0,33,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (226,'e512fefcd6798cca4a6c61f3387b1828','token','String',1,'-','','',0,33,0,1,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (227,'cb997b29362e102257401aeb1ce1736d','qid','String',0,'-','','',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (228,'470811a0ef439cff787fefa1928f1953','productNo','Integer',0,'-','','',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (229,'4ac70e1396bbca9a3135f2f261bb40b3','token','String',0,'-','','',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (230,'6eaa61d80915cd5e39663663e3c46cf8','id','integer',1,'-','1','查询id',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (231,'1a8643766058a62d720a4f31958446c3','orderNo','integer',0,'-','xxx','订单id',0,33,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (232,'1fd1770abb5c6dbaec548c4ce64a4749','code','integer',0,'-','0','状态码，0：成功',0,33,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (233,'d1b9be6652142432b2b00c3dd210eecc','data','array',0,'','','数据',0,33,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (234,'2a7093b3e7a9b0a05d9bf4e79dc4a206','userId','number',0,'-','123','用户id',0,33,233,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (235,'1cb84c7c0ed96d582d3a9d9116dee89e','orderNo','string',0,'-','xxx','订单号',0,33,233,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (236,'bffa32e265bb443213a91ef3ada21305','payTime','date',0,'-','2021-05-24 19:59:51','订单id',0,33,233,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (237,'4bad03085b444504c796679865ca8108','code','integer',0,'-','0','状态码，0：成功',0,35,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (238,'cfef20e6813836873cf506952879c382','data','object',0,'','','数据',0,35,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (239,'db18308c17fbf630b57d0303a7a9af03','id','integer',0,'-','','',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (240,'126f895f424fe90eefc86d3b9a0e8561','name','string',0,'-','','名称',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (241,'f4413905452fe4821eeb52872604f435','parentId','integer',0,'-','','父id',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (242,'5d622869a4ee2b93129b991904662273','children','array',0,'','','子节点',0,35,238,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (243,'404c22450e9a8d80f55964d6acd1f9bb','id','integer',0,'-','','',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (244,'253240af265774bbf2f25bc84e264cad','name','string',0,'-','','名称',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (245,'470885a96535f07de1af8c682b3119d5','parentId','integer',0,'-','','父id',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (246,'25c8203117d1147a8694fc87a21bdd58','children','array',0,'-','','子节点',0,35,242,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (247,'748c4ab34e286c9f56a42820772f26b8','productNo','Integer',1,'-','123','产品id',0,36,0,0,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (248,'339733d17bd4a7bd0ef50e9c9195b559','productNo','Integer',0,'-','123','产品id',0,36,0,5,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (249,'036bd027d059a5df1a68da8564a2fbe3','productNo','string',0,'-','aaaa','产品id',0,36,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (250,'4f990edab98fe3a3f9a99cc89350a5ac','remark','string',0,'-','小米','备注',0,36,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (251,'894ae45061adcdd417619fb633575b4b','productDetailVO','object',0,'','','产品详情',0,36,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (252,'fdd2db7c376976b31cfff04798d7a52f','productNo','string',0,'-','aaaa','产品id',0,36,251,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (253,'29883c730cf9d36bba9758d5bb52fa3e','remark','string',0,'-','小米','备注',0,36,251,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (254,'b04de9854965a39a2f3268e3b9d4c0d1','100001','String',0,'-','','id错误',0,36,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (255,'788b90ef067d5c8f977fcf98606fc073','100002','String',0,'-','','错误描述2',0,36,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (256,'32bf6eb90790a489eb16c6ead71549af','100003','String',0,'-','','错误描述3',0,36,0,4,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (257,'20fa7cf58fd296569d59ccdfe2708177','file','file',1,'-','','产品模板文件',0,37,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (258,'f7b2209cabe7d77128a20f3feab79e5a','productNo','String',1,'-','111','产品id',0,37,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (259,'ed4a68feeca8bbc3116be7d3c02238f2','code','integer',0,'-','0','状态码，0：成功',0,37,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (260,'993aac43e5e977be867b163404057717','data','object',0,'-','','数据',0,37,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (261,'fb948d90f6987762ba09bd4b59ad11ca','file','file',0,'-','','产品模板文件',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (262,'8b5e84f261c5707090f05806a7d10982','files','file[]',0,'-','','产品模板文件Array',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (263,'4c96dba27235f710168a893889ab7874','fileList','file[]',0,'-','','产品模板文件List',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (264,'3d8d331903744306c6d76a0c150f515b','productNo','string',1,'-','111','产品id',0,38,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (265,'3b3fb4ae48177d3d7c76e9319393635a','code','integer',0,'-','0','状态码，0：成功',0,38,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (266,'82dd57c7dee4618f97068bf271cdb2f8','data','object',0,'-','','数据',0,38,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (267,'166e20da9e17c235d9e9e25c25f43640','files','file[]',1,'-','','产品模板文件',0,39,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (268,'39a5f028ec63030df158e4aeff9da4ed','productNo','String',1,'-','111','产品id',0,39,0,2,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (269,'db930770f6a9ec313407f8f4aa7e0448','code','integer',0,'-','0','状态码，0：成功',0,39,0,3,1,1,2,'Jim',2,'Jim',0,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'), + (270,'df5ac720266566ed4e6e66df96330af8','data','object',0,'-','','数据',0,39,0,3,1,1,2,'Jim',2,'Jim',1,0,'2021-06-08 13:54:23','2021-06-08 13:54:23'); INSERT INTO `enum_info` (`id`, `data_id`, `name`, `description`, `module_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -571,7 +775,8 @@ INSERT INTO `module` (`id`, `name`, `project_id`, `type`, `import_url`, `basic_a INSERT INTO `module_config` (`id`, `module_id`, `type`, `config_key`, `config_value`, `extend_id`, `description`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES (1,1,0,'debughost_1','http://10.1.30.165:2222',0,'',0,'2020-12-15 10:01:48','2021-01-22 11:51:05'), - (2,2,0,'debughost_2','http://www.aaa.com',0,'',0,'2020-12-16 15:41:14','2020-12-16 15:41:14'); + (2,2,0,'debughost_2','http://www.aaa.com',0,'',0,'2020-12-16 15:41:14','2020-12-16 15:41:14'), + (3,3,2,'test','http://127.0.0.1:8088',0,'',0,'2021-06-08 13:54:23','2021-06-08 13:54:23'); INSERT INTO `open_user` (`id`, `app_key`, `secret`, `status`, `applicant`, `space_id`, `is_deleted`, `gmt_create`, `gmt_modified`) VALUES @@ -678,7 +883,3 @@ INSERT INTO `user_subscribe` (`id`, `user_id`, `type`, `source_id`, `is_deleted` (6,1,1,2,0,'2021-01-18 17:18:07','2021-01-18 17:18:07'), (7,1,1,3,0,'2021-01-18 17:18:10','2021-01-18 17:18:10'), (8,2,1,2,0,'2021-01-19 10:24:11','2021-01-19 10:24:11'); - - - - -- Gitee From 4b7eb30b9fc19df14978aee8edf02485840b3cc7 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 9 Jun 2021 09:49:40 +0800 Subject: [PATCH 33/50] 1.8.4 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 6 ++++++ plugin/swagger-plugin-starter/pom.xml | 12 ++++++------ plugin/swagger-plugin/pom.xml | 4 ++-- pom.xml | 2 +- readme.md | 7 ++++--- release.sh | 2 +- sdk/sdk-java/pom.xml | 2 +- 9 files changed, 23 insertions(+), 16 deletions(-) diff --git a/build.bat b/build.bat index b7db1b2b..7c2f44af 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.3" +set version="1.8.4" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 42204d76..b573ca62 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.3" +version="1.8.4" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 2434afa6..ec684749 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # 更新日志 +1.8.4 + +- 【修复】修复调试页提交数组参数问题 +- 【优化】文档预览页面可调整菜单显示宽度（resizeBar） +- 【新增】推送接口新增`isReplace`参数，决定文档是否替换 + ## 1.8.3 - 【优化】后台添加的用户可重置密码 diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index f79ff77f..1ee91db8 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.4 + 1.0.5 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.4 + 1.0.5 @@ -81,7 +81,7 @@ - + @@ -114,7 +114,7 @@ - + org.apache.maven.plugins diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index a203f540..19bd1ea7 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.0.4 + 1.0.5 jar swagger-plugin @@ -41,7 +41,7 @@ cn.torna torna-sdk - 1.0.9 + 1.0.10 junit diff --git a/pom.xml b/pom.xml index 58b136af..c93da651 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.3 + 1.8.4 1.8 diff --git a/readme.md b/readme.md index 8c34c2b1..90f536e0 100644 --- a/readme.md +++ b/readme.md @@ -8,9 +8,10 @@ | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.3 | -| sdk-java | 1.0.9 | -| swagger-plugin | 1.0.4 | +| Torna | 1.8.4 | +| sdk-java | 1.0.10 | +| swagger-plugin | 1.0.5 | +| smart-doc | 2.1.9 | ## 特性介绍 diff --git a/release.sh b/release.sh index f3df1bb8..23c614b9 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.3" +version="1.8.4" build_folder="${app_name}-${version}" diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index f842fe36..704033c5 100644 --- a/sdk/sdk-java/pom.xml +++ b/sdk/sdk-java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna torna-sdk - 1.0.9 + 1.0.10 jar torna-sdk -- Gitee From d426d62a799ea4732d84c330633b435f79f9a855 Mon Sep 17 00:00:00 2001 From: tanghc Date: Wed, 9 Jun 2021 10:03:16 +0800 Subject: [PATCH 34/50] 1.8.4 --- changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index ec684749..fea829a4 100644 --- a/changelog.md +++ b/changelog.md @@ -1,6 +1,6 @@ # 更新日志 -1.8.4 +## 1.8.4 - 【修复】修复调试页提交数组参数问题 - 【优化】文档预览页面可调整菜单显示宽度（resizeBar） -- Gitee From e59a81e1a69fc9c6563169829301215c9e08b39a Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 10 Jun 2021 09:23:11 +0800 Subject: [PATCH 35/50] 1.8.5 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 5 +++++ pom.xml | 2 +- release.sh | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 7c2f44af..5219c0a1 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.4" +set version="1.8.5" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index b573ca62..c3ce709c 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.4" +version="1.8.5" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index fea829a4..718135b5 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # 更新日志 +## 1.8.5 + +- 【优化】优化登录失败报错日志 +- 【增强】admin后台新增用户id查询条件 + ## 1.8.4 - 【修复】修复调试页提交数组参数问题 diff --git a/pom.xml b/pom.xml index c93da651..1dbcfae8 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.4 + 1.8.5 1.8 diff --git a/release.sh b/release.sh index 23c614b9..e383143b 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.4" +version="1.8.5" build_folder="${app_name}-${version}" -- Gitee From ce15b0e17a808e56ad433867b94e8f149297956a Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 10 Jun 2021 09:26:04 +0800 Subject: [PATCH 36/50] 1.8.5 --- front/public/static/help/swagger-plugin.md | 4 ++-- readme.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/front/public/static/help/swagger-plugin.md b/front/public/static/help/swagger-plugin.md index eeb2ed56..68c6a530 100644 --- a/front/public/static/help/swagger-plugin.md +++ b/front/public/static/help/swagger-plugin.md @@ -12,7 +12,7 @@ pom.xml添加依赖： cn.torna swagger-plugin-starter - 1.0.3 + 1.0.5 provided ``` @@ -53,7 +53,7 @@ pom.xml添加依赖： cn.torna swagger-plugin - 1.0.3 + 1.0.5 ``` diff --git a/readme.md b/readme.md index 90f536e0..3137d73f 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.4 | +| Torna | 1.8.5 | | sdk-java | 1.0.10 | | swagger-plugin | 1.0.5 | | smart-doc | 2.1.9 | -- Gitee From 442c98ac7ae78aa55afa2d0ded4c31b8215acb46 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 17 Jun 2021 18:07:49 +0800 Subject: [PATCH 37/50] 1.8.6 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 4 ++++ pom.xml | 2 +- readme.md | 2 +- release.sh | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.bat b/build.bat index 5219c0a1..d324ed48 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.5" +set version="1.8.6" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index c3ce709c..6bb20b59 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.5" +version="1.8.6" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 718135b5..d7a665fc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 1.8.6 + +- 【修复】mock路径后面加queryString无法访问 + ## 1.8.5 - 【优化】优化登录失败报错日志 diff --git a/pom.xml b/pom.xml index 1dbcfae8..f5ca49ca 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.5 + 1.8.6 1.8 diff --git a/readme.md b/readme.md index 3137d73f..1ebbf96c 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.5 | +| Torna | 1.8.6 | | sdk-java | 1.0.10 | | swagger-plugin | 1.0.5 | | smart-doc | 2.1.9 | diff --git a/release.sh b/release.sh index e383143b..42c3d513 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.5" +version="1.8.6" build_folder="${app_name}-${version}" -- Gitee From b6768b0030cf473f9a710b0792c85822d728b388 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 18 Jun 2021 17:19:07 +0800 Subject: [PATCH 38/50] 1.8.7 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 4 ++++ pom.xml | 2 +- readme.md | 2 +- release.sh | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build.bat b/build.bat index d324ed48..ec8c4f6c 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.6" +set version="1.8.7" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 6bb20b59..3364e064 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.6" +version="1.8.7" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index d7a665fc..bc3c9d2b 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 1.8.7 + +- 【优化】优化文档搜索 + ## 1.8.6 - 【修复】mock路径后面加queryString无法访问 diff --git a/pom.xml b/pom.xml index f5ca49ca..b626e6b5 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.6 + 1.8.7 1.8 diff --git a/readme.md b/readme.md index 1ebbf96c..87bcdd83 100644 --- a/readme.md +++ b/readme.md @@ -8,7 +8,7 @@ | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.6 | +| Torna | 1.8.7 | | sdk-java | 1.0.10 | | swagger-plugin | 1.0.5 | | smart-doc | 2.1.9 | diff --git a/release.sh b/release.sh index 42c3d513..b2d183c2 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.6" +version="1.8.7" build_folder="${app_name}-${version}" -- Gitee From 374de50eb28f2d587c9af97e84a81cceaa09e475 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 21 Jun 2021 14:40:09 +0800 Subject: [PATCH 39/50] UPDATE --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 87bcdd83..3633a9c0 100644 --- a/readme.md +++ b/readme.md @@ -11,7 +11,7 @@ | Torna | 1.8.7 | | sdk-java | 1.0.10 | | swagger-plugin | 1.0.5 | -| smart-doc | 2.1.9 | +| smart-doc | 2.2.0 | ## 特性介绍 -- Gitee From be4e00e673770f359caa26b455f409b3f8652e0c Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 21 Jun 2021 19:36:44 +0800 Subject: [PATCH 40/50] UPDATE --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 3633a9c0..178e7820 100644 --- a/readme.md +++ b/readme.md @@ -11,7 +11,7 @@ | Torna | 1.8.7 | | sdk-java | 1.0.10 | | swagger-plugin | 1.0.5 | -| smart-doc | 2.2.0 | +| smart-doc | ![maven](https://img.shields.io/maven-central/v/com.github.shalousun/smart-doc) | ## 特性介绍 -- Gitee From 92f0703257ab4fa4f4f5b5b1a4ba73763fa39b5d Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 21 Jun 2021 19:39:51 +0800 Subject: [PATCH 41/50] UPDATE --- readme.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 178e7820..70db3c22 100644 --- a/readme.md +++ b/readme.md @@ -9,10 +9,13 @@ | 模块 | 版本 | | :----: | :----: | | Torna | 1.8.7 | -| sdk-java | 1.0.10 | -| swagger-plugin | 1.0.5 | +| 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) | | smart-doc | ![maven](https://img.shields.io/maven-central/v/com.github.shalousun/smart-doc) | + + ## 特性介绍 - 支持接口文档增删改查 -- Gitee From 25490e569de99c7c64d09e1e846cd18c3f9c6099 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 25 Jun 2021 16:11:07 +0800 Subject: [PATCH 42/50] 1.9.0 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 8 ++++++++ plugin/swagger-plugin-starter/pom.xml | 4 ++-- plugin/swagger-plugin/pom.xml | 2 +- pom.xml | 2 +- release.sh | 2 +- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/build.bat b/build.bat index ec8c4f6c..16bbb4da 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.8.7" +set version="1.9.0" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 3364e064..06ec58b9 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.7" +version="1.9.0" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index bc3c9d2b..12ff37c0 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,13 @@ # 更新日志 +## 1.9.0 + +- 【新增】排序字段，可调整文档/参数顺序 +- 【增强】文档表格新增收缩/展开控制 +- 【修复】修复swagger插件泛型参数展示问题 +- 【修复】修改文档空指针问题 +- 【修复】导入postman空指针问题 + ## 1.8.7 - 【优化】优化文档搜索 diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 1ee91db8..8de30ce6 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.5 + 1.0.6 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.5 + 1.0.6 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 19bd1ea7..b06e5a95 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.0.5 + 1.0.6 jar swagger-plugin diff --git a/pom.xml b/pom.xml index b626e6b5..cb426599 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.8.7 + 1.9.0 1.8 diff --git a/release.sh b/release.sh index b2d183c2..b44d8090 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.8.7" +version="1.9.0" build_folder="${app_name}-${version}" -- Gitee From fdfdf34f72073d52618a9f671779d7d6fc851e62 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 25 Jun 2021 18:43:15 +0800 Subject: [PATCH 43/50] 1.9.0 --- readme.md | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/readme.md b/readme.md index 70db3c22..d2406d0f 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,9 @@ 企业接口文档解决方案，目标是让文档管理变得更加方便、快捷。Torna采用团队协作的方式管理和维护项目API文档，将不同形式的文档纳入进来，形成一个统一的维护方式。 - +Torna弥补了传统文档生成工具（如swagger）的不如之处，在保持原有功能的前提下丰富并增强了一些实用的功能。 + + ## 当前版本号 @@ -15,34 +17,6 @@ | smart-doc | ![maven](https://img.shields.io/maven-central/v/com.github.shalousun/smart-doc) | - -## 特性介绍 - -- 支持接口文档增删改查 -- 支持导入外部接口（支持导入swagger、postman） -- 支持分享文档（匿名访问、密码访问） -- 支持OpenAPI管理接口 -- 支持字典管理 -- 支持导出为markdown格式、html格式 -- 支持文档聚合，将不同模块中的文档聚合展示 -- 支持多环境接口调试 -- 支持Mock数据 -- 支持文档权限管理，访客、开发者、管理员对应不同权限 -- 支持第三方登录接入/OAuth认证登录 -- 支持钉钉免密登录 -- 支持设置全局请求头/请求参数/响应参数 -- 支持中英文切换(i18n) -- 支持docker运行 -- 提供swagger插件，快速导入swagger文档 -- 提供`管理模式`和`浏览模式`双模式，管理模式用来编辑文档内容，浏览模式纯粹查阅文档，界面无其它元素干扰 -- 部署简单，直接运行脚本启动程序 - ---- - -[演示地址](http://demo.torna.cn/) 演示账号：`guest@torna.cn` 密码：`123456` - -当前账号是访问者，只能阅读文档，可以自行部署到本地体验更多功能。 - ## 使用步骤 ### 方式1：下载zip本地运行 -- Gitee From 3c7b6679ad4d5fddaa600bf47f3c28cea486b63a Mon Sep 17 00:00:00 2001 From: tanghc Date: Sun, 27 Jun 2021 16:52:46 +0800 Subject: [PATCH 44/50] 1.1.0 --- plugin/swagger-plugin-starter/pom.xml | 4 ++-- plugin/swagger-plugin/pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 8de30ce6..8758d15f 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.0.6 + 1.1.0 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.0.6 + 1.1.0 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index b06e5a95..f3a194bb 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.0.6 + 1.1.0 jar swagger-plugin -- Gitee From 45885fd80d4575b754d10f353c8d14c28b4a1403 Mon Sep 17 00:00:00 2001 From: tanghc Date: Sun, 27 Jun 2021 17:27:10 +0800 Subject: [PATCH 45/50] 1.9.0 --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index d2406d0f..9c14a8c9 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ Torna弥补了传统文档生成工具（如swagger）的不如之处，在保 | 模块 | 版本 | | :----: | :----: | -| Torna | 1.8.7 | +| Torna | 1.9.0 | | 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) | -- Gitee From 8bcf9056e23b930d57a8914e3911ac6769b41d77 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 28 Jun 2021 11:06:23 +0800 Subject: [PATCH 46/50] =?UTF-8?q?=E5=A4=9A=E7=8E=AF=E5=A2=83=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/swagger-plugin-starter/pom.xml | 4 ++-- plugin/swagger-plugin/pom.xml | 2 +- plugin/swagger-plugin/readme.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 8758d15f..9d8a459e 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.1.0 + 1.1.1 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.1.0 + 1.1.1 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index f3a194bb..5f559c9b 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.1.0 + 1.1.1 jar swagger-plugin diff --git a/plugin/swagger-plugin/readme.md b/plugin/swagger-plugin/readme.md index 6e2644a7..d2fbd407 100644 --- a/plugin/swagger-plugin/readme.md +++ b/plugin/swagger-plugin/readme.md @@ -2,6 +2,7 @@ ## 更新日志 +- 1.1.1：支持多环境配置 - 1.1.0：优化泛型参数显示，支持定义第三方类文档信息 - 1.0.7：修复`Result>`不显示List问题 - 1.0.6：修复泛型参数不显示问题 -- Gitee From 97022156ce658657fe9273926daa5eab9ea0ab94 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 28 Jun 2021 16:16:44 +0800 Subject: [PATCH 47/50] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BE=AA=E7=8E=AF?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin/swagger-plugin-starter/pom.xml | 4 ++-- plugin/swagger-plugin/pom.xml | 2 +- plugin/swagger-plugin/readme.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/plugin/swagger-plugin-starter/pom.xml b/plugin/swagger-plugin-starter/pom.xml index 9d8a459e..741293d1 100644 --- a/plugin/swagger-plugin-starter/pom.xml +++ b/plugin/swagger-plugin-starter/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin-starter - 1.1.1 + 1.1.2 jar swagger-plugin-starter @@ -57,7 +57,7 @@ cn.torna swagger-plugin - 1.1.1 + 1.1.2 diff --git a/plugin/swagger-plugin/pom.xml b/plugin/swagger-plugin/pom.xml index 5f559c9b..8eb59591 100644 --- a/plugin/swagger-plugin/pom.xml +++ b/plugin/swagger-plugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 cn.torna swagger-plugin - 1.1.1 + 1.1.2 jar swagger-plugin diff --git a/plugin/swagger-plugin/readme.md b/plugin/swagger-plugin/readme.md index d2fbd407..bbdc5198 100644 --- a/plugin/swagger-plugin/readme.md +++ b/plugin/swagger-plugin/readme.md @@ -2,6 +2,7 @@ ## 更新日志 +- 1.1.2：解决循环依赖问题 - 1.1.1：支持多环境配置 - 1.1.0：优化泛型参数显示，支持定义第三方类文档信息 - 1.0.7：修复`Result>`不显示List问题 -- Gitee From afe276a3b21f140706f9ef9eee5fb9153ea7fc11 Mon Sep 17 00:00:00 2001 From: tanghc Date: Mon, 28 Jun 2021 17:20:46 +0800 Subject: [PATCH 48/50] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/public/static/help/swagger-plugin.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/front/public/static/help/swagger-plugin.md b/front/public/static/help/swagger-plugin.md index f693bc57..e2e7fe27 100644 --- a/front/public/static/help/swagger-plugin.md +++ b/front/public/static/help/swagger-plugin.md @@ -1,4 +1,4 @@ -插件的作用是将本地项目中的Swagger文档内容推送到Torna服务器。 +插件的作用是将本地项目中的Swagger文档内容推送到Torna服务器。[参考文档](http://torna.cn/dev/swagger-plugin.html) **使用步骤：** @@ -12,11 +12,13 @@ pom.xml添加依赖： cn.torna swagger-plugin-starter - 1.1.0 + 最新版本 provided ``` +`swagger-plugin-starter`最新版本：![maven](https://img.shields.io/maven-central/v/cn.torna/swagger-plugin-starter) + `src/main/resources`下添加一个`torna.json`文件，内容如下： ```json @@ -55,10 +57,13 @@ pom.xml添加依赖： cn.torna swagger-plugin - 1.1.0 + 最新版本 ``` +`swagger-plugin`最新版本： ![maven](https://img.shields.io/maven-central/v/cn.torna/swagger-plugin) + + 新建一个类，继承`SwaggerPluginConfiguration` ```java -- Gitee From 2f1fc4055c7374e2bd95e4dc26be9606b1a7d25b Mon Sep 17 00:00:00 2001 From: tanghc Date: Sat, 3 Jul 2021 07:52:28 +0800 Subject: [PATCH 49/50] 1.9.1 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 7 +++++++ pom.xml | 2 +- release.sh | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build.bat b/build.bat index 16bbb4da..ff6a8433 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.9.0" +set version="1.9.1" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 06ec58b9..6df72230 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.9.0" +version="1.9.1" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 12ff37c0..1435a197 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # 更新日志 +## 1.9.1 + +- 【增强】mock添加一个配置，忽略query + body +- 【优化】mock的content-type默认选择json +- 【优化】优化Postman导入 +- 【修复】修复推送出现NPE问题 + ## 1.9.0 - 【新增】排序字段，可调整文档/参数顺序 diff --git a/pom.xml b/pom.xml index cb426599..1fab6c4b 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.9.0 + 1.9.1 1.8 diff --git a/release.sh b/release.sh index b44d8090..4d4f5945 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.9.0" +version="1.9.1" build_folder="${app_name}-${version}" -- Gitee From 737d6bd70423c2bfb19e35522997277fa4b5b41b Mon Sep 17 00:00:00 2001 From: "sunmch@163.com" Date: Tue, 6 Jul 2021 08:05:18 +0000 Subject: [PATCH 50/50] #I3Z9NS --- front/src/utils/convert-markdown.js | 56 +++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/front/src/utils/convert-markdown.js b/front/src/utils/convert-markdown.js index 9dd6642d..7f6695f9 100644 --- a/front/src/utils/convert-markdown.js +++ b/front/src/utils/convert-markdown.js @@ -75,29 +75,55 @@ function createTable(params, style) { } const MarkdownUtil = { - toMarkdownByData(docInfoList, title) { - title = title || $ts('document') - const treeData = convert_tree(docInfoList) - const markdown_content = new StringBuilder(`# ${title}\n\n`) - const appendMarkdown = (doc_info) => { - init_docInfo(doc_info) - const markdown = MarkdownUtil.toMarkdown(doc_info) - markdown_content.append(markdown) - } + + appendMarkdown(doc_info, markdown_content) { + init_docInfo(doc_info) + const markdown = MarkdownUtil.toMarkdown(doc_info) + markdown_content.append(markdown) + }, + doMarkdownByData(treeData, markdown_content) { treeData.forEach(docInfo => { const children = docInfo.children - const isFolder = children && children.length > 0 - if (isFolder) { + if (docInfo.isFolder === 1) { + console.log(`${docInfo.name} is folder`) markdown_content.append(`## ${docInfo.name}\n\n`) - children.forEach(child => { - appendMarkdown(child) - }) + this.doMarkdownByData(children, markdown_content) } else { - appendMarkdown(docInfo) + MarkdownUtil.appendMarkdown(docInfo, markdown_content) } }) + return markdown_content + }, + toMarkdownByData(docInfoList, title) { + title = title || $ts('document') + const treeData = convert_tree(docInfoList) + const markdown_content = new StringBuilder(`# ${title}\n\n`) + MarkdownUtil.doMarkdownByData(treeData, markdown_content) return markdown_content.toString() }, + // toMarkdownByData(docInfoList, title) { + // title = title || $ts('document') + // const treeData = convert_tree(docInfoList) + // const markdown_content = new StringBuilder(`# ${title}\n\n`) + // const appendMarkdown = (doc_info) => { + // init_docInfo(doc_info) + // const markdown = MarkdownUtil.toMarkdown(doc_info) + // markdown_content.append(markdown) + // } + // treeData.forEach(docInfo => { + // const children = docInfo.children + // const isFolder = children && children.length > 0 + // if (isFolder) { + // markdown_content.append(`## ${docInfo.name}\n\n`) + // children.forEach(child => { + // appendMarkdown(child) + // }) + // } else { + // appendMarkdown(docInfo) + // } + // }) + // return markdown_content.toString() + // }, toMarkdown(docInfo) { const builder = new StringBuilder() const append = (str) => { -- Gitee