From c56176b01b62cf8c07be3c65c13947616d22bb01 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 25 Feb 2022 13:20:44 +0800 Subject: [PATCH 1/9] 1.0.13 --- 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 487d5568..6dd58d46 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.12 + 1.0.13 jar torna-sdk -- Gitee From 295a69818c1501c8c99fa04b5edf3fea03ce8005 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 25 Feb 2022 13:21:01 +0800 Subject: [PATCH 2/9] 1.14.0 --- build.bat | 2 +- build.sh | 2 +- front/src/utils/global.js | 2 +- pom.xml | 2 +- release.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.bat b/build.bat index a415c342..66b05b77 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.13.1" +set version="1.14.0" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 343b9735..3b661ae2 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.13.1" +version="1.14.0" build_folder="${app_name}-${version}" diff --git a/front/src/utils/global.js b/front/src/utils/global.js index 0aad6fc7..a304c4b2 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.13.1" +const VERSION="1.14.0" 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 215ecd82..6f34fb1d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.13.1 + 1.14.0 1.8 diff --git a/release.sh b/release.sh index a0e6e2e9..d9031668 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.13.1" +version="1.14.0" build_folder="${app_name}-${version}" -- Gitee From f1944ea3f00690c0ee62d283df176b68cbe7bccc Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 25 Feb 2022 15:40:02 +0800 Subject: [PATCH 3/9] 1.14.0 --- .../torna/web/controller/ExceptionHandlerController.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/server-web/src/main/java/cn/torna/web/controller/ExceptionHandlerController.java b/server/server-web/src/main/java/cn/torna/web/controller/ExceptionHandlerController.java index 420fdf2f..362d4610 100644 --- a/server/server-web/src/main/java/cn/torna/web/controller/ExceptionHandlerController.java +++ b/server/server-web/src/main/java/cn/torna/web/controller/ExceptionHandlerController.java @@ -4,6 +4,7 @@ import cn.torna.common.bean.Result; import cn.torna.common.exception.BizException; import cn.torna.common.exception.ErrorCode; import cn.torna.common.exception.ExceptionCode; +import cn.torna.common.util.RequestUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.support.DefaultMessageSourceResolvable; import org.springframework.validation.ObjectError; @@ -11,6 +12,7 @@ import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.stream.Collectors; @@ -24,7 +26,7 @@ import java.util.stream.Collectors; public class ExceptionHandlerController { @ExceptionHandler(Exception.class) - public Object exceptionHandler(Exception e) { + public Object exceptionHandler(HttpServletRequest request, Exception e) { if (e instanceof ExceptionCode) { ExceptionCode exceptionCode = (ExceptionCode) e; ErrorCode errorCode = exceptionCode.getCode(); @@ -44,7 +46,8 @@ public class ExceptionHandlerController { .collect(Collectors.joining(", ")); return Result.err(msg); } - log.error("未知错误：", e); + log.error("未知错误，IP：{}，URI：{}，HttpMethod：{}", + RequestUtil.getIP(request), request.getRequestURI(), request.getMethod(), e); return Result.err("系统错误，请查看日志"); } -- Gitee From f1c4465221f3b0346123298ef9f43f903ac5b0b8 Mon Sep 17 00:00:00 2001 From: tanghc Date: Thu, 3 Mar 2022 15:03:23 +0800 Subject: [PATCH 4/9] 1.14.1 --- build.bat | 2 +- build.sh | 2 +- changelog.md | 4 ++++ front/src/utils/global.js | 2 +- pom.xml | 2 +- readme.md | 2 +- readme_CN.md | 2 +- release.sh | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-) diff --git a/build.bat b/build.bat index 66b05b77..d9a20548 100755 --- a/build.bat +++ b/build.bat @@ -4,7 +4,7 @@ set dist_dir=dist set app_name=torna -set version="1.14.0" +set version="1.14.1" set build_folder=%app_name%-%version% diff --git a/build.sh b/build.sh index 3b661ae2..5e3892c7 100644 --- a/build.sh +++ b/build.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.14.0" +version="1.14.1" build_folder="${app_name}-${version}" diff --git a/changelog.md b/changelog.md index 19d8c387..1d5c3d95 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,9 @@ # 更新日志 +## 1.14.1 + +- 【修复】推送报空指针异常问题 + ## 1.14.0 - 【新增】推送文档新增`deprecated`指定废弃信息 diff --git a/front/src/utils/global.js b/front/src/utils/global.js index a304c4b2..cfadb9de 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.0" +const VERSION="1.14.1" 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 6f34fb1d..61003a4d 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ - 1.14.0 + 1.14.1 1.8 diff --git a/readme.md b/readme.md index 82610372..de465042 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.0 | +| Torna | 1.14.1 | | 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 909f0130..a9cf965d 100644 --- a/readme_CN.md +++ b/readme_CN.md @@ -12,7 +12,7 @@ Torna弥补了传统文档生成工具（如swagger）的不如之处，在保 | 模块 | 版本 | | :----: |:-------------------------------------------------------------------------------:| -| Torna | 1.14.0 | +| Torna | 1.14.1 | | 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/release.sh b/release.sh index d9031668..14315b3f 100644 --- a/release.sh +++ b/release.sh @@ -6,7 +6,7 @@ dist_dir="dist" # 执行文件名称 app_name="torna" -version="1.14.0" +version="1.14.1" build_folder="${app_name}-${version}" -- Gitee From 23aba3122efa7ba53f80addb7ec549049114ab98 Mon Sep 17 00:00:00 2001 From: tanghc Date: Fri, 4 Mar 2022 17:09:57 +0800 Subject: [PATCH 5/9] UPDATE --- readme.md | 2 +- readme_CN.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/readme.md b/readme.md index de465042..b4463613 100644 --- a/readme.md +++ b/readme.md @@ -70,7 +70,7 @@ Need modify： - MYSQL_HOST：MySQL host - MYSQL_SCHEMA：database name -- MYSQL_USERNAME：MySQL username +- MYSQL_USERNAME：MySQL username,make sure the account can run CREATE/ALTER sql. - MYSQL_PASSWORD：MySQL password diff --git a/readme_CN.md b/readme_CN.md index a9cf965d..b4eb52c7 100644 --- a/readme_CN.md +++ b/readme_CN.md @@ -71,7 +71,7 @@ docker run --name torna --restart=always \ - MYSQL_HOST：MySQL服务器地址 - MYSQL_SCHEMA：数据库名称，默认不用改 -- MYSQL_USERNAME：MySQL用户名 +- MYSQL_USERNAME：MySQL用户名，要求账号能运行DDL/DML/ALTER语句 - MYSQL_PASSWORD：MySQL密码 浏览器访问`http://ip:7700`，ip对应docker宿主机器ip，非docker容器ip -- Gitee From 1b06d23dec037f0561790c46513ebb433b59debd Mon Sep 17 00:00:00 2001 From: liu xm Date: Sun, 13 Mar 2022 08:54:59 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=A4=9A=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=20gitee=20issues/I4LRYX=E3=80=81I4JQND?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layout_view/components/Sidebar/index.vue | 4 +- .../components/TabsRouter/index.vue | 194 ++++++++++++++++++ front/src/layout_view/components/ViewMain.vue | 13 +- front/src/layout_view/components/index.js | 1 + front/src/layout_view/index.vue | 11 +- front/src/store/index.js | 4 +- front/src/store/modules/tabsRouter.js | 64 ++++++ 7 files changed, 285 insertions(+), 6 deletions(-) create mode 100644 front/src/layout_view/components/TabsRouter/index.vue create mode 100644 front/src/store/modules/tabsRouter.js diff --git a/front/src/layout_view/components/Sidebar/index.vue b/front/src/layout_view/components/Sidebar/index.vue index 4fed6928..fe2e66fa 100644 --- a/front/src/layout_view/components/Sidebar/index.vue +++ b/front/src/layout_view/components/Sidebar/index.vue @@ -56,7 +56,9 @@ export default { // 树点击事件 onNodeClick(data, node, tree) { if (data.type === this.types.TYPE_DOC) { - this.goRoute(`/view/${data.docId}`) + // 目前没想到好的办法传输文档名称到标签路由中 + // this.goRoute(`/view/${data.docId}`) + this.$router.push({ path: `/view/${data.docId}`, query: { meta_title: data.label }}) } }, onSpaceChange(spaceId) { diff --git a/front/src/layout_view/components/TabsRouter/index.vue b/front/src/layout_view/components/TabsRouter/index.vue new file mode 100644 index 00000000..53d7499e --- /dev/null +++ b/front/src/layout_view/components/TabsRouter/index.vue @@ -0,0 +1,194 @@ + + + + + diff --git a/front/src/layout_view/components/ViewMain.vue b/front/src/layout_view/components/ViewMain.vue index 3bce3647..2ddae932 100644 --- a/front/src/layout_view/components/ViewMain.vue +++ b/front/src/layout_view/components/ViewMain.vue @@ -17,7 +17,7 @@ export default { } - diff --git a/front/src/layout_view/components/index.js b/front/src/layout_view/components/index.js index f93678ec..1c828837 100644 --- a/front/src/layout_view/components/index.js +++ b/front/src/layout_view/components/index.js @@ -1,3 +1,4 @@ export { default as Navbar } from './Navbar' export { default as Sidebar } from './Sidebar' export { default as ViewMain } from './ViewMain' +export { default as TabsRouter } from './TabsRouter' diff --git a/front/src/layout_view/index.vue b/front/src/layout_view/index.vue index 8cc3b765..95adadcb 100644 --- a/front/src/layout_view/index.vue +++ b/front/src/layout_view/index.vue @@ -1,10 +1,11 @@