lxm_front/AJ-Report
1
0
Fork 0
mirror of https://gitee.com/anji-plus/report.git synced 2026-02-02 09:27:47 +08:00
Code Issues Projects Releases Wiki Activity

springboot升级到2.7.x

Browse Source
This commit is contained in:
wangbin
2024-12-30 17:32:21 +08:00
parent 3c455d9c82
commit 53db8b6c4c
6 changed files with 49 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
report-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.5.RELEASE</version>
<version>2.7.14</version>
<relativePath/>
</parent>
@@ -14,7 +14,7 @@
<groupId>com.anji-plus</groupId>
<artifactId>aj-report</artifactId>
<version>1.5.0.RELEASE</version>
<version>1.6.0.RELEASE</version>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -26,6 +26,16 @@
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-bootstrap</artifactId>
<version>3.1.5</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
<version>3.1.5</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -38,18 +48,11 @@
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-to-slf4j</artifactId>
<version>2.15.0</version>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.15.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
@@ -66,12 +69,6 @@
<artifactId>spring-test</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-context</artifactId>
<version>2.2.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
@@ -81,7 +78,7 @@
<dependency>
<groupId>com.anji-plus</groupId>
<artifactId>spring-boot-gaea</artifactId>
<version>2.0.5.RELEASE</version>
<version>2.9.4.RELEASE</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -97,15 +94,22 @@
<dependency>
<groupId>com.anji-plus</groupId>
<artifactId>spring-boot-starter-gaea-oss</artifactId>
<version>2.0.5.RELEASE</version>
<version>2.9.4.RELEASE</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>3.3.2</version>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjweaver</artifactId>
<version>1.9.7</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -137,7 +141,7 @@
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.10</version>
<version>1.18.34</version>
<optional>true</optional>
</dependency>
@@ -185,7 +189,6 @@
<artifactId>xmlworker</artifactId>
<version>5.5.13</version>
</dependency>
</dependencies>
<developers>
@@ -237,7 +240,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.3.0</version>
<!--<version>3.3.0</version>-->
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>

4
report-core/src/main/java/com/anjiplus/template/gaea/business/base/BaseController.java
View File

@@ -1,10 +1,10 @@
package com.anjiplus.template.gaea.business.base;
import com.anji.plus.gaea.curd.entity.GaeaBaseEntity;
import org.springframework.context.i18n.LocaleContextHolder;
import com.anji.plus.gaea.curd.controller.GaeaBaseController;
import com.anji.plus.gaea.curd.dto.BaseDTO;
import com.anji.plus.gaea.curd.entity.BaseEntity;
import com.anji.plus.gaea.curd.params.PageParam;
/**
@@ -13,7 +13,7 @@ import com.anji.plus.gaea.curd.params.PageParam;
* @author WongBin
* @date 2021/3/26
*/
public abstract class BaseController<P extends PageParam, T extends BaseEntity, D extends BaseDTO>
public abstract class BaseController<P extends PageParam, T extends GaeaBaseEntity, D extends BaseDTO>
extends GaeaBaseController<P,T,D> {
/**
* 获取当前语言类型

5
report-core/src/main/java/com/anjiplus/template/gaea/business/filter/UrlDecodeFilter.java
View File

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
import java.io.IOException;
import java.net.URLDecoder;
import java.util.Collections;
import java.util.Enumeration;
import java.util.Map;
import java.util.Set;
@@ -63,10 +64,8 @@ public class UrlDecodeFilter implements Filter {
@Override
public Enumeration<String> getParameterNames() {
Set<String> keySet = parameterMap.keySet();
IteratorEnumeration iteratorEnumeration = new IteratorEnumeration(keySet.iterator());
return iteratorEnumeration;
return Collections.enumeration(keySet);
}
@Override

4
report-core/src/main/java/com/anjiplus/template/gaea/business/modules/file/service/impl/GaeaFileServiceImpl.java
View File

@@ -20,11 +20,9 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.http.entity.ContentType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.http.ResponseEntity;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
@@ -41,7 +39,7 @@ import java.util.UUID;
*/
@Service
@Slf4j
@RefreshScope
//@RefreshScope
public class GaeaFileServiceImpl implements GaeaFileService {
@Value("${spring.gaea.subscribes.oss.downloadPath:''}")

7
report-core/src/main/resources/bootstrap-dev.yml
View File

@@ -4,17 +4,14 @@ spring:
url: jdbc:mysql://10.108.26.197:3306/aj_report?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
username: root
password: appuser@anji
type: com.alibaba.druid.pool.DruidDataSource
gaea:
subscribes:
oss: #文件存储
enabled: true
##允许上传的文件后缀
file-type-while-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi|.jpeg|.aaa|.svg
file-type-white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi|.jpeg|.aaa|.svg
# 用于文件上传成功后，生成文件的下载公网完整URL
downloadPath: http://127.0.0.1:9095/file/download
nfs:
path: D:\\aaa\\

14
report-core/src/main/resources/bootstrap.yml
View File

@@ -5,8 +5,20 @@ server:
charset: UTF-8
force: true
enabled: true
springfox:
documentation:
auto-startup: false
spring:
cloud:
bootstrap:
enabled: true
main:
allow-bean-definition-overriding: true
allow-circular-references: true
mvc:
pathmatch:
matching-strategy: ant_path_matcher
profiles:
active: dev
application:
@@ -78,7 +90,7 @@ spring:
oss: #文件存储 都配置的情况下优先级minio->amazonS3->nfs
enabled: true
##允许上传的文件后缀
file-type-while-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi|.jpeg|.aaa|.svg
file-type-white-list: .png|.jpg|.gif|.icon|.pdf|.xlsx|.xls|.csv|.mp4|.avi|.jpeg|.aaa|.svg
# 用于文件上传成功后，生成文件的下载公网完整URL，http://serverip:9095/file/download，注意填写IP必须填写后端服务所在的机器IP
downloadPath: http://10.108.26.197:9095/file/download
nfs: