mirror of https://github.com/jeecgboot/JimuReport
升级到最新版1.4.4-beta,解决静态资源加载冲突等问题
parent
3ffa2ea61d
commit
f0e4988965
|
@ -12,7 +12,7 @@
|
|||
<name>jimureport-example</name>
|
||||
<groupId>org.jeecg</groupId>
|
||||
<artifactId>jimureport-example</artifactId>
|
||||
<version>1.4.3</version>
|
||||
<version>1.4.4</version>
|
||||
|
||||
<url>http://www.jimureport.com</url>
|
||||
<description>积木报表集成示例</description>
|
||||
|
@ -37,6 +37,7 @@
|
|||
</repositories>
|
||||
|
||||
<properties>
|
||||
<jimureport.version>1.4.4-beta</jimureport.version>
|
||||
<java.version>1.8</java.version>
|
||||
<minio.version>8.0.3</minio.version>
|
||||
<!-- DB驱动 -->
|
||||
|
@ -49,7 +50,7 @@
|
|||
<dependency>
|
||||
<groupId>org.jeecgframework.jimureport</groupId>
|
||||
<artifactId>jimureport-spring-boot-starter</artifactId>
|
||||
<version>1.4.32</version>
|
||||
<version>${jimureport.version}</version>
|
||||
</dependency>
|
||||
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
package org.jeecg.modules;
|
||||
package com.jeecg.modules;
|
||||
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
|
||||
|
@ -10,7 +10,7 @@ import org.springframework.core.env.Environment;
|
|||
/**
|
||||
* 积木报表独立服务启动类
|
||||
*/
|
||||
@SpringBootApplication(scanBasePackages = {"org.jeecg.modules.jmreport"})
|
||||
@SpringBootApplication
|
||||
@EnableAutoConfiguration(exclude={MongoAutoConfiguration.class})
|
||||
public class JimuReportApplication {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package org.jeecg.modules.jmreport.config;
|
||||
package com.jeecg.modules.jmreport.config;
|
||||
|
||||
import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
|
@ -21,6 +21,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
|
|||
*/
|
||||
@Override
|
||||
public String getToken(HttpServletRequest request) {
|
||||
//System.out.println("---------call---------getToken-----------------------");
|
||||
//return TokenUtils.getTokenByRequest(request);
|
||||
return "123456";
|
||||
}
|
||||
|
@ -43,6 +44,7 @@ public class JimuReportTokenService implements JmReportTokenServiceI {
|
|||
*/
|
||||
@Override
|
||||
public Boolean verifyToken(String token) {
|
||||
System.out.println("---------verify-----Token---------------");
|
||||
//return TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
|
||||
return true;
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
package org.jeecg.modules.jmreport.controller;
|
||||
package com.jeecg.modules.jmreport.controller;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
|
@ -1,4 +1,4 @@
|
|||
package org.jeecg.modules.jmreport.controller;
|
||||
package com.jeecg.modules.jmreport.controller;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
|
@ -1,21 +1,12 @@
|
|||
server:
|
||||
port: 8085
|
||||
spring:
|
||||
#配置静态资源
|
||||
mvc:
|
||||
static-path-pattern: /**
|
||||
resource:
|
||||
static-locations: classpath:/static/
|
||||
#配置数据库
|
||||
#数据库
|
||||
datasource:
|
||||
url: jdbc:mysql://${MYSQL-HOST:127.0.0.1}:${MYSQL-PORT:3306}/${MYSQL-DB:jimureport}?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
|
||||
username: root
|
||||
password: root
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
#Minidao配置
|
||||
minidao :
|
||||
base-package: org.jeecg.modules.jmreport.*
|
||||
#JimuReport[上传配置]
|
||||
jeecg :
|
||||
# local|minio|alioss
|
||||
uploadType: local
|
||||
|
|
Loading…
Reference in New Issue