升级springboot版本到3.1.2

pom.xml

@@ -27,15 +27,16 @@
  <netty.version>4.1.90.Final</netty.version>
  <gson.version>2.10.1</gson.version>
 
- <spring.version>5.3.26</spring.version>
- <spring-boot.version>2.7.9</spring-boot.version>
+ <spring.version>6.0.11</spring.version>
+ <spring-boot.version>3.1.2</spring-boot.version>
 
  <mybatis-spring-boot-starter.version>2.3.0</mybatis-spring-boot-starter.version>
  <mysql-connector-j.version>8.0.32</mysql-connector-j.version>
 
  <slf4j-api.version>1.7.36</slf4j-api.version>
  <junit-jupiter.version>5.9.2</junit-jupiter.version>
- <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
+ <jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
+ <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
 
  <groovy.version>4.0.10</groovy.version>
 

xxl-job-admin/Dockerfile

@@ -1,11 +1,13 @@
-FROM openjdk:8-jre-slim
-MAINTAINER xuxueli
+# 基础镜像使用java
+FROM eclipse-temurin:17-jre
 
-ENV PARAMS=""
+MAINTAINER enjoy-ai
 
-ENV TZ=PRC
+ENV PARAMS=""
+WORKDIR /home/admin
+ADD target/xxl-job-admin-*.jar /home/admin/app.jar
+# TODO 时区调整
+ENV TZ=UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
-ADD target/xxl-job-admin-*.jar /app.jar
-
-ENTRYPOINT ["sh","-c","java -jar $JAVA_OPTS /app.jar $PARAMS"]
+ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/home/admin/app.jar"]

xxl-job-admin/pom.xml

@@ -59,21 +59,34 @@
  <artifactId>mybatis-spring-boot-starter</artifactId>
  <version>${mybatis-spring-boot-starter.version}</version>
  </dependency>
- <!-- mysql -->
- <dependency>
- <groupId>com.mysql</groupId>
- <artifactId>mysql-connector-j</artifactId>
- <version>${mysql-connector-j.version}</version>
- </dependency>
+
 
  <!-- xxl-job-core -->
  <dependency>
  <groupId>com.xuxueli</groupId>
  <artifactId>xxl-job-core</artifactId>
  <version>${project.parent.version}</version>
  </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotation-api.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.servlet</groupId>
+ <artifactId>jakarta.servlet-api</artifactId>
+ <version>${jakarta.servlet-api.version}</version>
+ <scope>compile</scope>
+ </dependency>
 
- </dependencies>
+ <!-- postgresql -->
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.6.0</version>
+ </dependency>
+ </dependencies>
 
  <build>
  <plugins>

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/IndexController.java

@@ -1,9 +1,13 @@
 package com.xxl.job.admin.controller;
 
 import com.xxl.job.admin.controller.annotation.PermissionLimit;
+import com.xxl.job.admin.core.model.XxlJobUser;
 import com.xxl.job.admin.service.LoginService;
 import com.xxl.job.admin.service.XxlJobService;
 import com.xxl.job.core.biz.model.ReturnT;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -15,9 +19,6 @@
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.view.RedirectView;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Map;
@@ -36,11 +37,12 @@ public class IndexController {
 
 
  @RequestMapping("/")
- public String index(Model model) {
+ public String index(Model model, HttpServletRequest request) {
 
+ XxlJobUser loginUser = (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY);
  Map<String, Object> dashboardMap = xxlJobService.dashboardInfo();
+ dashboardMap.put("user", loginUser);
  model.addAllAttributes(dashboardMap);
-
  return "index";
  }
 
@@ -58,6 +60,7 @@ public ModelAndView toLogin(HttpServletRequest request, HttpServletResponse resp
  modelAndView.setView(new RedirectView("/",true,false));
  return modelAndView;
  }
+
  return new ModelAndView("login");
  }
 
@@ -77,12 +80,13 @@ public ReturnT<String> logout(HttpServletRequest request, HttpServletResponse re
  }
 
  @RequestMapping("/help")
- public String help() {
+ public String help(HttpServletRequest request, Model model) {
 
  /*if (!PermissionInterceptor.ifLogin(request)) {
  return "redirect:/toLogin";
  }*/
 
+ model.addAttribute("user", (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY));
  return "help";
  }
 

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobApiController.java

@@ -8,14 +8,14 @@
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.util.GsonTool;
 import com.xxl.job.core.util.XxlJobRemotingUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobCodeController.java

@@ -2,18 +2,20 @@
 
 import com.xxl.job.admin.core.model.XxlJobInfo;
 import com.xxl.job.admin.core.model.XxlJobLogGlue;
+import com.xxl.job.admin.core.model.XxlJobUser;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.admin.dao.XxlJobInfoDao;
 import com.xxl.job.admin.dao.XxlJobLogGlueDao;
+import com.xxl.job.admin.service.LoginService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.glue.GlueTypeEnum;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 
@@ -50,6 +52,7 @@ public String index(HttpServletRequest request, Model model, int jobId) {
 
  model.addAttribute("jobInfo", jobInfo);
  model.addAttribute("jobLogGlues", jobLogGlues);
+ model.addAttribute("user", (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY));
  return "jobcode/jobcode.index";
  }
 

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobGroupController.java

@@ -3,20 +3,22 @@
 import com.xxl.job.admin.controller.annotation.PermissionLimit;
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobRegistry;
+import com.xxl.job.admin.core.model.XxlJobUser;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.admin.dao.XxlJobGroupDao;
 import com.xxl.job.admin.dao.XxlJobInfoDao;
 import com.xxl.job.admin.dao.XxlJobRegistryDao;
+import com.xxl.job.admin.service.LoginService;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.enums.RegistryConfig;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 /**
@@ -36,7 +38,8 @@ public class JobGroupController {
 
  @RequestMapping
  @PermissionLimit(adminuser = true)
- public String index(Model model) {
+ public String index(Model model, HttpServletRequest request) {
+ model.addAttribute("user", (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY));
  return "jobgroup/jobgroup.index";
  }
 

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobInfoController.java

@@ -1,6 +1,5 @@
 package com.xxl.job.admin.controller;
 
-import com.xxl.job.admin.core.cron.CronExpression;
 import com.xxl.job.admin.core.exception.XxlJobException;
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobInfo;
@@ -19,6 +18,8 @@
 import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
 import com.xxl.job.core.glue.GlueTypeEnum;
 import com.xxl.job.core.util.DateUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -27,9 +28,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.text.ParseException;
 import java.util.*;
 
 /**
@@ -67,6 +65,7 @@ public String index(HttpServletRequest request, Model model, @RequestParam(requi
 
  model.addAttribute("JobGroupList", jobGroupList);
  model.addAttribute("jobGroup", jobGroup);
+ model.addAttribute("user", (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY));
 
  return "jobinfo/jobinfo.index";
  }

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -5,17 +5,21 @@
 import com.xxl.job.admin.core.model.XxlJobGroup;
 import com.xxl.job.admin.core.model.XxlJobInfo;
 import com.xxl.job.admin.core.model.XxlJobLog;
+import com.xxl.job.admin.core.model.XxlJobUser;
 import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.admin.dao.XxlJobGroupDao;
 import com.xxl.job.admin.dao.XxlJobInfoDao;
 import com.xxl.job.admin.dao.XxlJobLogDao;
+import com.xxl.job.admin.service.LoginService;
 import com.xxl.job.core.biz.ExecutorBiz;
 import com.xxl.job.core.biz.model.KillParam;
 import com.xxl.job.core.biz.model.LogParam;
 import com.xxl.job.core.biz.model.LogResult;
 import com.xxl.job.core.biz.model.ReturnT;
 import com.xxl.job.core.util.DateUtil;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -24,8 +28,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -73,6 +75,7 @@ public String index(HttpServletRequest request, Model model, @RequestParam(requi
  // valid permission
  JobInfoController.validPermission(request, jobInfo.getJobGroup());
  }
+ model.addAttribute("user", (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY));
 
  return "joblog/joblog.index";
  }

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/UserController.java

@@ -8,6 +8,8 @@
 import com.xxl.job.admin.dao.XxlJobUserDao;
 import com.xxl.job.admin.service.LoginService;
 import com.xxl.job.core.biz.model.ReturnT;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.util.DigestUtils;
@@ -16,8 +18,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -36,11 +36,13 @@ public class UserController {
 
  @RequestMapping
  @PermissionLimit(adminuser = true)
- public String index(Model model) {
+ public String index(Model model, HttpServletRequest request) {
 
  // 执行器列表
  List<XxlJobGroup> groupList = xxlJobGroupDao.findAll();
  model.addAttribute("groupList", groupList);
+ model.addAttribute("user", (XxlJobUser) request.getAttribute(LoginService.LOGIN_IDENTITY_KEY));
+
 
  return "user/user.index";
  }

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/CookieInterceptor.java

@@ -2,13 +2,13 @@
 
 import com.xxl.job.admin.core.util.FtlUtil;
 import com.xxl.job.admin.core.util.I18nUtil;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 
 /**

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/PermissionInterceptor.java

@@ -4,14 +4,13 @@
 import com.xxl.job.admin.core.model.XxlJobUser;
 import com.xxl.job.admin.core.util.I18nUtil;
 import com.xxl.job.admin.service.LoginService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Component;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 权限拦截
  *

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/interceptor/WebMvcConfig.java

@@ -1,11 +1,10 @@
 package com.xxl.job.admin.controller.interceptor;
 
+import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
-import javax.annotation.Resource;
-
 /**
  * web mvc config
  *