diff --git a/build.bat b/build.bat index d9a20548f547efa62aef77e783b3141639e5b458..7fd3febe9f43817ff5a76776abc60e2b7d1357d7 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.14.1" +set version="1.14.5" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 5e3892c7a380f873cb4c3d81f180073063ad8911..1e424b71e325cbb61707e907cee4a8313a8601df 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.14.1" +version="1.14.5" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 1d5c3d9548c18b59e53bc06dd33231fdc2f13604..53ed17b0ab6de29caa9f0efcd57cdde67cf5b15f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,24 @@ # 更新日志 +## 1.14.5 + +- 【修复】修复导出和query参数展示bug + +## 1.14.4 + +- 【修复】修复分享整个模块只显示部分文档问题 +- 【修复】修复调试返回非200状态不显示错误信息问题 [#I4Y25X](https://gitee.com/durcframework/torna/issues/I4Y25X) + +## 1.14.3 + +- 【优化】优化消息推送 [#I4XGER](https://gitee.com/durcframework/torna/issues/I4XGER) +- 【升级】升级fastmybatis到2.1.0 + +## 1.14.2 + +- 【新增】文档浏览页新增tab标签。默认未启用，启用方式：个人中心-系统设置 +- 【优化】优化LDAP登录 + ## 1.14.1 - 【修复】推送报空指针异常问题 diff --git a/front/public/static/images/group2.jpg b/front/public/static/images/group2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e557ee301b41a9170fb5f8c268f27c28882504fa Binary files /dev/null and b/front/public/static/images/group2.jpg differ diff --git a/front/src/utils/global.js b/front/src/utils/global.js index cfadb9de37f777d94149aaad02420388f70673ef..d71eb254d151690216ef1e88af2594b75f661580 100644 --- a/front/src/utils/global.js +++ b/front/src/utils/global.js @@ -18,7 +18,7 @@ import { Enums } from './enums' import { add_init } from './init' // eslint-disable-next-line -const VERSION="1.14.1" +const VERSION="1.14.5" const SPACE_ID_KEY = 'torna.spaceid' const PROJECT_ID_KEY = 'torna.projectid' const TORNA_FROM = 'torna.from' diff --git a/pom.xml b/pom.xml index 61003a4d62272ae1bf81372411082ecf95ee6fa9..8d29df9b4efd164170dfbe92cd0d3e4fe987a2f0 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.14.1 + 1.14.5 1.8 diff --git a/readme.md b/readme.md index b44636136baf2328687f43d68ec05c5b511488a0..e9c66c605e3e9d237ebd6047608a71d539402fa4 100644 --- a/readme.md +++ b/readme.md @@ -12,7 +12,7 @@ Torna makes up for the shortcomings of traditional document generation tools suc | Module | Version | | :----: |:-------------------------------------------------------------------------------:| -| Torna | 1.14.1 | +| Torna | 1.14.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) | | smart-doc | ![maven](https://img.shields.io/maven-central/v/com.github.shalousun/smart-doc) | diff --git a/readme_CN.md b/readme_CN.md index b4eb52c70e92b95c1eb1ead8c3a1944b3ff495ac..2822b8a179e5d61fef66007f54e7d9fe93931d13 100644 --- a/readme_CN.md +++ b/readme_CN.md @@ -12,7 +12,7 @@ Torna弥补了传统文档生成工具（如swagger）的不如之处，在保 | 模块 | 版本 | | :----: |:-------------------------------------------------------------------------------:| -| Torna | 1.14.1 | +| Torna | 1.14.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) | | smart-doc | ![maven](https://img.shields.io/maven-central/v/com.github.shalousun/smart-doc) | @@ -127,4 +127,20 @@ docker run --name torna --restart=always \ ## 沟通交流 - + + + + + + + + + +
一群(满)二群
+ + + + + + + diff --git a/release.sh b/release.sh index 14315b3ff72e9212bbf48b63e080b63a969a129f..b8d5019f3d354d7b731ccad242b91e0063558221 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.14.1" +version="1.14.5" build_folder="${app_name}-${version}" diff --git a/sdk/sdk-java/pom.xml b/sdk/sdk-java/pom.xml index 6dd58d46d4ab2e45e8993d0b9e3488278a302bb6..912dbbb38142591848474bd540b2366c97949a9c 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.13 + 1.0.14 jar torna-sdk diff --git a/server/server-service/src/main/java/cn/torna/service/DocImportService.java b/server/server-service/src/main/java/cn/torna/service/DocImportService.java index 0e58f90469f05965aaa3938b8da42d3731b73136..7899ba052096c9d8894a6d99cbbe8431d27d5678 100644 --- a/server/server-service/src/main/java/cn/torna/service/DocImportService.java +++ b/server/server-service/src/main/java/cn/torna/service/DocImportService.java @@ -197,6 +197,9 @@ public class DocImportService { private List parseBody(Body body) { String mode = body.getMode(); + if(mode == null){ + return Collections.emptyList(); + } switch (mode) { case "raw": String json = body.getRaw(); @@ -406,6 +409,9 @@ public class DocImportService { return ""; } String mode = body.getMode(); + if(mode == null){ + return ""; + } switch (mode) { case "raw": JSONObject options = body.getOptions();