From eaad56d0a8472749afba8277f2c5ef0e4e161c06 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Sat, 5 Mar 2022 14:33:02 +0800 Subject: [PATCH] =?UTF-8?q?JimuReport=E7=A7=AF=E6=9C=A8=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20v1.4.3=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83=EF=BC=8C=E5=85=8D?= =?UTF-8?q?=E8=B4=B9=E7=9A=84=E5=8F=AF=E8=A7=86=E5=8C=96=E4=BD=8E=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +++--- jimureport-example/pom.xml | 4 ++-- .../main/java/org/jeecg/modules/JimuReportApplication.java | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e96c940..ba08dec 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # JimuReport - 积木报表 -v1.4.2 | 2021-12-06 +v1.4.3 | 2022-03-07 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://jimureport.com) -[![](https://img.shields.io/badge/version-1.4.2-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport) +[![](https://img.shields.io/badge/version-1.4.3-brightgreen.svg)](https://github.com/zhangdaiscott/JimuReport) [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/JimuReport.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/JimuReport) [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/JimuReport.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/JimuReport) @@ -44,7 +44,7 @@ v1.4.2 | 2021-12-06 org.jeecgframework.jimureport jimureport-spring-boot-starter - 1.4.2 + 1.4.3 ``` diff --git a/jimureport-example/pom.xml b/jimureport-example/pom.xml index 39c1972..31a71a4 100644 --- a/jimureport-example/pom.xml +++ b/jimureport-example/pom.xml @@ -12,7 +12,7 @@ jimureport-example org.jeecg jimureport-example - 1.4.2 + 1.4.3 http://www.jimureport.com 积木报表集成示例 @@ -49,7 +49,7 @@ org.jeecgframework.jimureport jimureport-spring-boot-starter - 1.4.2 + 1.4.3 diff --git a/jimureport-example/src/main/java/org/jeecg/modules/JimuReportApplication.java b/jimureport-example/src/main/java/org/jeecg/modules/JimuReportApplication.java index fed1e07..7a4d407 100644 --- a/jimureport-example/src/main/java/org/jeecg/modules/JimuReportApplication.java +++ b/jimureport-example/src/main/java/org/jeecg/modules/JimuReportApplication.java @@ -1,6 +1,5 @@ package org.jeecg.modules; -import org.jeecg.modules.jmreport.common.util.oConvertUtils; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -19,7 +18,7 @@ public static void main(String[] args) { ConfigurableApplicationContext application = SpringApplication.run(JimuReportApplication.class, args); Environment env = application.getEnvironment(); String port = env.getProperty("server.port"); - String path = oConvertUtils.getString(env.getProperty("server.servlet.context-path")); + String path = env.containsProperty("server.servlet.context-path")?env.getProperty("server.servlet.context-path"):""; System.out.print("\n----------------------------------------------------------\n\t" + "Application JimuReport Demo is running! Access URL:\n\t" + "Local: \t\thttp://localhost:" + port + path + "/jmreport/list\n\t" +