gitee
/
guns
mirror of https://gitee.com/stylefeng/guns
1
0
Fork 0
Code Issues Releases Wiki Activity

【8.3.0】更新jdk17配置

master
stylefeng 2024-08-03 19:18:04 +08:00
parent e12a0f86f7
commit 90c7d60bdd
14 changed files with 36 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pom.xml
View File

@ -7,12 +7,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.14</version>
<version>3.3.2</version>
</parent>
<groupId>com.javaguns.guns</groupId>
<artifactId>guns</artifactId>
<version>8.1.9</version>
<version>8.3.0</version>
<name>guns</name>
<description>Guns主项目</description>
@ -22,9 +22,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<java.version>17</java.version>
<mysql-connector-java.version>8.0.33</mysql-connector-java.version>
<roses.kernel.version>8.1.9</roses.kernel.version>
<roses.kernel.version>8.3.0</roses.kernel.version>
<flyway.version>7.1.1</flyway.version>
</properties>
@ -80,8 +80,6 @@
</execution>
</executions>
<configuration>
<!-- 如果没有该项配置，则devtools不会起作用，即应用不会restart -->
<fork>true</fork>
<excludes>
<exclude>
<groupId>org.projectlombok</groupId>
@ -93,21 +91,25 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.13.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
<release>17</release>
<source>17</source>
<target>17</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.1</version>
<configuration>
<attach>true</attach>
</configuration>
<executions>
<execution>
<phase>package</phase>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
<goal>jar</goal>
</goals>
</execution>
</executions>

4
src/main/java/cn/stylefeng/guns/ProjectStartApplication.java
View File

@ -1,6 +1,5 @@
package cn.stylefeng.guns;
import cn.stylefeng.roses.kernel.db.starter.SingleDataSourceAutoConfiguration;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@ -13,8 +12,7 @@ import org.springframework.boot.autoconfigure.flyway.FlywayAutoConfiguration;
* @since 2020/12/1 17:50
*/
@Slf4j
@SpringBootApplication(scanBasePackages = {"cn.stylefeng"},
exclude = {FlywayAutoConfiguration.class, SingleDataSourceAutoConfiguration.class})
@SpringBootApplication(scanBasePackages = {"cn.stylefeng"}, exclude = {FlywayAutoConfiguration.class})
public class ProjectStartApplication {
public static void main(String[] args) {

6
src/main/java/cn/stylefeng/guns/config/web/EmptyResourceFilter.java
View File

@ -3,10 +3,10 @@ package cn.stylefeng.guns.config.web;
import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import javax.servlet.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URL;
import java.util.HashMap;

3
src/main/java/cn/stylefeng/guns/config/web/SpringMvcConfiguration.java
View File

@ -5,6 +5,7 @@ import cn.stylefeng.guns.core.security.BlackWhiteInterceptor;
import cn.stylefeng.guns.core.security.TokenAndPermissionInterceptor;
import cn.stylefeng.roses.kernel.wrapper.field.jackson.CustomJacksonIntrospector;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import jakarta.annotation.Resource;
import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
@ -14,8 +15,6 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource;
/**
* spring mvc的配置
*

6
src/main/java/cn/stylefeng/guns/core/error/GlobalExceptionHandler.java
View File

@ -20,6 +20,9 @@ import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
import cn.stylefeng.roses.kernel.rule.util.ResponseRenderUtil;
import cn.stylefeng.roses.kernel.validator.api.exception.ParamValidateException;
import cn.stylefeng.roses.kernel.validator.api.exception.enums.ValidatorExceptionEnum;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.ValidationException;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.exceptions.PersistenceException;
import org.mybatis.spring.MyBatisSystemException;
@ -39,9 +42,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.servlet.NoHandlerFoundException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.validation.ValidationException;
import java.util.List;
import static cn.stylefeng.guns.core.consts.ProjectConstants.ROOT_PACKAGE_NAME;

7
src/main/java/cn/stylefeng/guns/core/security/BlackWhiteInterceptor.java
View File

@ -2,14 +2,13 @@ package cn.stylefeng.guns.core.security;
import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
import cn.stylefeng.roses.kernel.security.blackwhite.BlackWhiteValidateService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* 黑白名单的web拦截器·
*

7
src/main/java/cn/stylefeng/guns/core/security/TokenAndPermissionInterceptor.java
View File

@ -13,14 +13,13 @@ import cn.stylefeng.roses.kernel.rule.util.AntPathMatcherUtil;
import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceDefinition;
import cn.stylefeng.roses.kernel.scanner.api.pojo.resource.ResourceUrlParam;
import cn.stylefeng.roses.kernel.sys.api.ResourceServiceApi;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Token和权限校验的综合过滤器
*

2
src/main/java/cn/stylefeng/guns/modular/demo/controller/DevOpsController.java
View File

@ -19,11 +19,11 @@ import cn.stylefeng.roses.kernel.sys.modular.user.pojo.request.SysUserRequest;
import cn.stylefeng.roses.kernel.sys.modular.user.service.SysUserService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
import java.util.stream.Collectors;

4
src/main/java/cn/stylefeng/guns/modular/deploy/IndexController.java
View File

@ -3,11 +3,11 @@ package cn.stylefeng.guns.modular.deploy;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.io.resource.ResourceUtil;
import jakarta.servlet.ServletOutputStream;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;

3
src/main/java/cn/stylefeng/guns/modular/test/TestMultiTranController.java
View File

@ -5,10 +5,9 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 测试多数据源
*

3
src/main/java/cn/stylefeng/guns/modular/test/TestSingleTranController.java
View File

@ -5,10 +5,9 @@ import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
import jakarta.annotation.Resource;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
/**
* 测试单数据源回滚
*

3
src/main/java/cn/stylefeng/guns/modular/test/service/MasterDbService.java
View File

@ -6,10 +6,9 @@ import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUser;
import cn.stylefeng.roses.kernel.sys.modular.user.mapper.SysUserMapper;
import cn.stylefeng.roses.kernel.sys.modular.user.service.SysUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* Guns数据库操作
*

3
src/main/java/cn/stylefeng/guns/modular/test/service/OtherDbService.java
View File

@ -6,10 +6,9 @@ import cn.stylefeng.roses.kernel.sys.modular.user.entity.SysUser;
import cn.stylefeng.roses.kernel.sys.modular.user.mapper.SysUserMapper;
import cn.stylefeng.roses.kernel.sys.modular.user.service.SysUserService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* 其他数据库操作
*

3
src/main/java/cn/stylefeng/guns/modular/test/service/TranTestService.java
View File

@ -1,11 +1,10 @@
package cn.stylefeng.guns.modular.test.service;
import cn.stylefeng.guns.modular.test.factory.NormalUserFactory;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
/**
* 测试多数据源操作
*