Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:
name: Build (JDK ${{ matrix.java }})
runs-on: ubuntu-latest

strategy:
fail-fast: false
matrix:
# 21 是项目的编译目标, 25 用于提前发现新 JDK 上的问题
java: [ '21', '25' ]

steps:
- name: Checkout repository
uses: actions/checkout@v7

- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v6
with:
distribution: temurin
java-version: ${{ matrix.java }}
cache: maven

- name: Build
run: mvn -B --no-transfer-progress clean install
17 changes: 13 additions & 4 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
branches: [ "main" ]
schedule:
- cron: '24 7 * * 0'
workflow_dispatch:

jobs:
analyze:
Expand All @@ -38,11 +39,19 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v7

# Spring Boot 4 需要 JDK 17+, 显式固定版本, 不依赖 runner 镜像的默认 JDK
- name: Set up JDK
uses: actions/setup-java@v6
with:
distribution: temurin
java-version: '21'
cache: maven

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -56,7 +65,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v4

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -69,4 +78,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v4
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
language: java
jdk:
- oraclejdk11
dist: trusty
- openjdk21
dist: jammy
11 changes: 8 additions & 3 deletions Readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/houko/SpringBootUnity.svg?branch=main)](https://travis-ci.org/houko/SpringBootUnity)
[![Build](https://github.com/houko/SpringBootUnity/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/houko/SpringBootUnity/actions/workflows/build.yml)
[![Backers on Open Collective](https://opencollective.com/SpringBootUnity/backers/badge.svg)](#backers) [![Sponsors on Open Collective](https://opencollective.com/SpringBootUnity/sponsors/badge.svg)](#sponsors) [![GitHub issues](https://img.shields.io/github/issues/houko/SpringBootUnity.svg)](https://github.com/houko/SpringBootUnity/issues)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/houko/SpringBootUnity/main/LICENSE)
[![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven/apache-maven.svg)]()
Expand All @@ -8,8 +8,8 @@

### 环境
- `maven` latest
- `jdk11`
- `spring boot 2.x release`
- `jdk21`
- `spring boot 4.x release`
- 个人推荐`idea`来代替eclipse
- git: 版本管理
- nginx: 反向代理服务器
Expand Down Expand Up @@ -71,6 +71,11 @@ http://localhost:808/doc.html bootstrap-ui
- 2020-10-09 升级mysql connector到8
- 2020-10-09 升级spring boot到2.3.0
- 2020-10-09 修复了升级后API的破坏性变动,修复了一些了编辑器警告
- 2026-09-09 升级spring boot到4.1.1,jdk升级到21,全部依赖更新到最新版本
- 2026-09-09 `javax.*` 迁移到 `jakarta.*`(persistence/servlet/mail/websocket)
- 2026-09-09 api文档从已停止维护的springfox迁移到springdoc-openapi,swagger注解升级到OpenAPI 3
- 2026-09-09 security模块改用SecurityFilterChain组件式配置,替换已移除的WebSecurityConfigurerAdapter
- 2026-09-09 fastjson迁移到fastjson2,jackson升级到3.x,poi升级到5.x,dom4j迁移到org.dom4j



Expand Down
6 changes: 3 additions & 3 deletions async/src/main/java/info/xiaomo/anysc/AsyncMain.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;

Expand Down
22 changes: 5 additions & 17 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@
<artifactId>spring-boot-starter-test</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand All @@ -48,27 +44,19 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/info/xiaomo/core/base/BaseModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import lombok.Data;

import javax.persistence.*;
import jakarta.persistence.*;
import java.io.Serializable;
import java.util.Date;

Expand Down
4 changes: 2 additions & 2 deletions core/src/main/java/info/xiaomo/core/filter/CorsFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import org.springframework.stereotype.Component;

import javax.servlet.*;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,22 +1,21 @@
package info.xiaomo.core.filter;

import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import info.xiaomo.core.untils.TimeUtil;
import tools.jackson.core.JsonGenerator;
import tools.jackson.databind.SerializationContext;
import tools.jackson.databind.ValueSerializer;

import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Date;

/**
* @author : xiaomo
*/
public class CustomDateSerializerFilter extends JsonSerializer<Date> {
public class CustomDateSerializerFilter extends ValueSerializer<Date> {

@Override
public void serialize(Date value, JsonGenerator jsonGenerator, SerializerProvider provider) throws IOException {
public void serialize(Date value, JsonGenerator jsonGenerator, SerializationContext context) {
SimpleDateFormat sdf = new SimpleDateFormat(TimeUtil.DEFAULT_FORMAT2);
jsonGenerator.writeString(sdf.format(value));
}
}
}
2 changes: 1 addition & 1 deletion core/src/main/java/info/xiaomo/core/untils/AuthUtil.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package info.xiaomo.core.untils;

import javax.servlet.http.HttpSession;
import jakarta.servlet.http.HttpSession;

/**
* 把今天最好的表现当作明天最新的起点..~
Expand Down
15 changes: 8 additions & 7 deletions core/src/main/java/info/xiaomo/core/untils/ExcelUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.ss.usermodel.DateUtil;

import java.io.*;
import java.text.DecimalFormat;
Expand Down Expand Up @@ -83,11 +84,11 @@ private static String[][] getData(File file, int ignoreRows)
cell = row.getCell(columnIndex);
if (cell != null) {
switch (cell.getCellType()) {
case HSSFCell.CELL_TYPE_STRING:
case STRING:
value = cell.getStringCellValue();
break;
case HSSFCell.CELL_TYPE_NUMERIC:
if (HSSFDateUtil.isCellDateFormatted(cell)) {
case NUMERIC:
if (DateUtil.isCellDateFormatted(cell)) {
Date date = cell.getDateCellValue();
if (date != null) {
value = new SimpleDateFormat("yyyy-MM-dd")
Expand All @@ -100,20 +101,20 @@ private static String[][] getData(File file, int ignoreRows)
.getNumericCellValue());
}
break;
case HSSFCell.CELL_TYPE_FORMULA:
case FORMULA:
// 导入时如果为公式生成的数据则无值
if (!"".equals(cell.getStringCellValue())) {
value = cell.getStringCellValue();
} else {
value = cell.getNumericCellValue() + "";
}
break;
case HSSFCell.CELL_TYPE_BLANK:
case BLANK:
break;
case HSSFCell.CELL_TYPE_ERROR:
case ERROR:
value = "";
break;
case HSSFCell.CELL_TYPE_BOOLEAN:
case BOOLEAN:
value = (cell.getBooleanCellValue() ? "Y"
: "N");
break;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/info/xiaomo/core/untils/HttpUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import org.apache.commons.lang3.StringUtils;

import javax.net.ssl.*;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URL;
Expand Down
6 changes: 3 additions & 3 deletions core/src/main/java/info/xiaomo/core/untils/MailUtil.java
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package info.xiaomo.core.untils;

import javax.mail.*;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
import jakarta.mail.*;
import jakarta.mail.internet.InternetAddress;
import jakarta.mail.internet.MimeMessage;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Date;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/info/xiaomo/core/untils/StringUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.apache.commons.lang3.StringUtils;

import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/info/xiaomo/core/untils/TokenUtil.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package info.xiaomo.core.untils;

import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson2.JSONObject;
import info.xiaomo.core.constant.SymbolConst;

import java.util.regex.Matcher;
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/info/xiaomo/core/untils/XmlUtil.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package info.xiaomo.core.untils;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import org.dom4j.*;
import org.dom4j.io.OutputFormat;
import org.dom4j.io.SAXReader;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import info.xiaomo.core.base.BaseModel;
import lombok.*;

import javax.persistence.Entity;
import javax.persistence.Table;
import jakarta.persistence.Entity;
import jakarta.persistence.Table;

/**
* @author : xiaomo (https://xiaomo.info) (https://github.com/houko)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package info.xiaomo.crawler.service.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSON;
import info.xiaomo.crawler.dao.ShikigamaDao;
import info.xiaomo.crawler.model.ShikigamiModel;
import info.xiaomo.crawler.service.ShikigamaService;
Expand Down
2 changes: 1 addition & 1 deletion crawler/src/main/resources/config/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.jackson.time-zone=GMT+8

#jpa
spring.jpa.database-platform=org.hibernate.dialect.MySQL5Dialect
spring.jpa.database-platform=org.hibernate.dialect.MySQLDialect
spring.jpa.hibernate.ddl-auto=update
spring.jpa.show-sql=true
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.persistence.autoconfigure.EntityScan;
import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;

Expand Down
13 changes: 2 additions & 11 deletions javase/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,8 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>swagger-bootstrap-ui</artifactId>
<version>1.5</version>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
</dependency>
</dependencies>

Expand Down
Loading
Loading