wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

feat: Spring Boot 3.5.14 全量升级 + 组件升级

Browse Source 
核心升级:
- Spring Boot 2.7.18 → 3.5.14
- MyBatis Plus 3.5.5 → 3.5.16 (spring-boot3-starter)
- Springdoc 1.8.0 → 2.8.6 (OpenAPI 3)
- Flowable 6.8.0 → 7.1.0
- Druid 1.2.x → 1.2.28 (boot3-starter)
- kotlin-reflect 1.9.10 → 1.9.25

迁移适配:
- javax → jakarta 命名空间 (620+ 文件)
- Swagger 注解迁移到 OpenAPI 3 (@Tag/@Schema/@Operation/@Parameter)
- Spring Security 6.2 适配 (antMatchers→requestMatchers, EnableMethodSecurity)
- Druid 包名迁移 (boot→boot3)
- Redis 配置路径迁移 (spring.redis→spring.data.redis)
- Flyway 适配 (flyway-database-postgresql)
- Flowable 7.x 适配 (MULE_TASK_IMAGE 移除)

修复:
- spring-boot-maven-plugin 2.5.15→3.5.14 (SPI服务发现失效)
- mybatis-plus-boot-starter 3.5.5→3.5.16 (kotlin-reflect+fastjson2冲突)
- Flowable database-schema-update 启用自动建表

验证: 23/23 测试通过, 1374 API端点正常
This commit is contained in:
华佗
2026-06-04 22:39:10 +08:00
parent b8d719429d
commit 1d21661a78
781 changed files with 57907 additions and 1301 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
openhis-server-new/core-system/src/main/java/com/core/system/controller/SysUserConfigController.java
View File

@@ -8,8 +8,9 @@ import com.core.common.enums.BusinessType;
import com.core.system.domain.SysUserConfig;
import com.core.system.service.ISysUserConfigService;
import com.core.common.utils.SecurityUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameters;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -22,7 +23,7 @@ import java.util.List;
* @author
* @date 2026-01-30
*/
@Api(tags = "用户配置")
@Tag(name = "用户配置")
@RestController
@RequestMapping("/system/userConfig")
public class SysUserConfigController extends BaseController
@@ -88,7 +89,7 @@ public class SysUserConfigController extends BaseController
/**
* 获取当前用户的指定配置
*/
@ApiOperation("获取当前用户的指定配置")
@Operation(summary = "获取当前用户的指定配置")
@GetMapping("/currentUserConfig")
public AjaxResult getCurrentUserConfig(@RequestParam String configKey)
{
@@ -101,7 +102,7 @@ public class SysUserConfigController extends BaseController
/**
* 保存当前用户的配置
*/
@ApiOperation("保存当前用户的配置")
@Operation(summary = "保存当前用户的配置")
@Log(title = "用户配置", businessType = BusinessType.UPDATE)
@PostMapping("/saveCurrentUserConfig")
public AjaxResult saveCurrentUserConfig(@RequestParam String configKey, @RequestParam String configValue)

25
openhis-server-new/core-system/src/main/java/com/core/system/domain/FlowProcDefDto.java
View File

@@ -1,8 +1,7 @@
package com.core.system.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -21,37 +20,37 @@ import java.util.Date;
@Data
@AllArgsConstructor
@NoArgsConstructor
@ApiModel("流程定义")
@Schema(description = "流程定义")
public class FlowProcDefDto implements Serializable {
@ApiModelProperty("流程id")
@Schema(description = "流程id")
private String id;
@ApiModelProperty("流程名称")
@Schema(description = "流程名称")
private String name;
@ApiModelProperty("流程key")
@Schema(description = "流程key")
private String flowKey;
@ApiModelProperty("流程分类")
@Schema(description = "流程分类")
private String category;
@ApiModelProperty("配置表单名称")
@Schema(description = "配置表单名称")
private String formName;
@ApiModelProperty("配置表单id")
@Schema(description = "配置表单id")
private Long formId;
@ApiModelProperty("版本")
@Schema(description = "版本")
private int version;
@ApiModelProperty("部署ID")
@Schema(description = "部署ID")
private String deploymentId;
@ApiModelProperty("流程定义状态: 1:激活 , 2:中止")
@Schema(description = "流程定义状态: 1:激活 , 2:中止")
private int suspensionState;
@ApiModelProperty("部署时间")
@Schema(description = "部署时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date deploymentTime;

4
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysConfig.java
View File

@@ -6,8 +6,8 @@ import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
/**
* 参数配置表 sys_config

4
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysNotice.java
View File

@@ -5,8 +5,8 @@ import com.core.common.xss.Xss;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Size;
/**
* 通知公告表 sys_notice

6
openhis-server-new/core-system/src/main/java/com/core/system/domain/SysPost.java
View File

@@ -6,9 +6,9 @@ import com.core.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
/**
* 岗位表 sys_post

2
openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysConfigServiceImpl.java
View File

@@ -14,7 +14,7 @@ import com.core.system.service.ISysConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;

2
openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java
View File

@@ -13,7 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.PostConstruct;
import jakarta.annotation.PostConstruct;
import java.util.Comparator;
import java.util.List;
import java.util.Map;

2
openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysUserServiceImpl.java
View File

@@ -25,7 +25,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import javax.validation.Validator;
import jakarta.validation.Validator;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;