pom-jdk17

2025-05-17 22:57:59 +08:00
parent 6684f12931
commit 604ed97122
4 changed files with 19 additions and 157 deletions
--- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/BannerAdminVo.java
+++ b/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/BannerAdminVo.java
@@ -1,134 +0,0 @@
-package com.accompany.admin.vo;
-
-import com.accompany.common.annotation.ReplaceAppDomain;
-
-import java.util.Date;
-
-/**
- * 2 * @Author: zhuct
- * 3 * @Date: 2019/2/18 14:15
- * 4
- */
-public class BannerAdminVo {
-    private Integer bannerId;
-
-    private String bannerName;
-
-    @ReplaceAppDomain
-    private String bannerPic;
-
-    private Byte skipType;
-
-    @ReplaceAppDomain
-    private String skipUri;
-
-    private Integer seqNo;
-
-    private Byte bannerStatus;
-
-    private Date startTime;
-
-    private Date endTime;
-
-    private Byte displayType;
-
-    private String bannerType;
-
-    private String appId;
-
-    public String getAppId() {
-        return appId;
-    }
-
-    public void setAppId(String appId) {
-        this.appId = appId;
-    }
-
-    public Integer getBannerId() {
-        return bannerId;
-    }
-
-    public void setBannerId(Integer bannerId) {
-        this.bannerId = bannerId;
-    }
-
-    public String getBannerName() {
-        return bannerName;
-    }
-
-    public void setBannerName(String bannerName) {
-        this.bannerName = bannerName;
-    }
-
-    public String getBannerPic() {
-        return bannerPic;
-    }
-
-    public void setBannerPic(String bannerPic) {
-        this.bannerPic = bannerPic;
-    }
-
-    public Byte getSkipType() {
-        return skipType;
-    }
-
-    public void setSkipType(Byte skipType) {
-        this.skipType = skipType;
-    }
-
-    public String getSkipUri() {
-        return skipUri;
-    }
-
-    public void setSkipUri(String skipUri) {
-        this.skipUri = skipUri;
-    }
-
-    public Integer getSeqNo() {
-        return seqNo;
-    }
-
-    public void setSeqNo(Integer seqNo) {
-        this.seqNo = seqNo;
-    }
-
-    public Byte getBannerStatus() {
-        return bannerStatus;
-    }
-
-    public void setBannerStatus(Byte bannerStatus) {
-        this.bannerStatus = bannerStatus;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Byte getDisplayType() {
-        return displayType;
-    }
-
-    public void setDisplayType(Byte displayType) {
-        this.displayType = displayType;
-    }
-
-    public String getBannerType() {
-        return bannerType;
-    }
-
-    public void setBannerType(String bannerType) {
-        this.bannerType = bannerType;
-    }
-}
--- a/accompany-base/accompany-core/src/main/resources/banner.txt
+++ b/accompany-base/accompany-core/src/main/resources/banner.txt
@@ -1,8 +1,5 @@
- _______ _________ _        _______
-(  ____ )\__   __/| \    /\(  ___  )
-| (    )|   ) (   |  \  / /| (   ) |
-| (____)|   | |   |  (_/ / | |   | |
-|  _____)   | |   |   _ (  | |   | |
-| (         | |   |  ( \ \ | |   | |
-| )      ___) (___|  /  \ \| (___) |
-|/       \_______/|_/    \/(_______)
+    __  ___      ___      __
+   /  |/  /___  / (_)____/ /_____ ______
+  / /|_/ / __ \/ / / ___/ __/ __ `/ ___/
+ / /  / / /_/ / / (__  ) /_/ /_/ / /
+/_/  /_/\____/_/_/____/\__/\__,_/_/
--- a/accompany-dependencies/pom.xml
+++ b/accompany-dependencies/pom.xml
@@ -16,8 +16,8 @@
        <!-- 配置属性 -->
        <revision>1.0.0</revision>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
        <package.output.directory>${basedir}/target</package.output.directory>
        <!-- 依赖 -->
        <spring-cloud.version>2021.0.5</spring-cloud.version>
@@ -26,7 +26,7 @@
        <jedis.version>3.10.0</jedis.version>
        <httpclient.version>3.1</httpclient.version>
        <spring.security.version>3.2.5.RELEASE</spring.security.version>
-        <mysql-connector-java.version>8.0.33</mysql-connector-java.version>
+        <mysql-connector-java.version>9.3.0</mysql-connector-java.version>
        <servlet-api.version>3.1.0</servlet-api.version>
        <http-client.version>4.5</http-client.version>
        <guava.version>31.1-jre</guava.version>
@@ -36,7 +36,6 @@
        <qiniu.version>7.14.0</qiniu.version>
        <okhttp.version>4.12.0</okhttp.version>
        <swagger3.version>3.0.0</swagger3.version>
-        <aliyun-log-log4j2-appender.version>0.1.10</aliyun-log-log4j2-appender.version>
        <aliyun-java-sdk-sts.version>3.0.0</aliyun-java-sdk-sts.version>
        <aliyun-java-sdk-core.version>4.1.2</aliyun-java-sdk-core.version>
        <protobuf-java.version>3.15.5</protobuf-java.version>
@@ -60,14 +59,14 @@
        <orika-core.version>1.5.4</orika-core.version>
        <spring-security-oauth2-autoconfigure.version>2.0.1.RELEASE</spring-security-oauth2-autoconfigure.version>
        <aliyun-java-sdk-cloudauth.version>1.2.0</aliyun-java-sdk-cloudauth.version>
-        <mybatisplus.version>3.5.9</mybatisplus.version>
+        <mybatisplus.version>3.5.12</mybatisplus.version>
        <sud-mgp-auth-java.version>1.0.4</sud-mgp-auth-java.version>
-        <redisson.version>3.38.0</redisson.version>
+        <redisson.version>3.45.1</redisson.version>
        <easyexcel.version>4.0.3</easyexcel.version>
-        <googlecode-libphonenumber.version>8.13.49</googlecode-libphonenumber.version>
+        <googlecode-libphonenumber.version>9.0.5</googlecode-libphonenumber.version>
        <ip2region.version>2.7.0</ip2region.version>
        <opencc4j.version>1.7.2</opencc4j.version>
-        <hutool.version>5.8.27</hutool.version>
+        <hutool.version>5.8.38</hutool.version>
        <hippo4j-config-spring-boot-starter.version>1.5.0</hippo4j-config-spring-boot-starter.version>
        <google-api-services-androidpublisher.version>v3-rev24-1.24.1</google-api-services-androidpublisher.version>
        <payermax-server.version>1.0.12</payermax-server.version>
@@ -144,8 +143,8 @@
            </dependency>

            <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
+                <groupId>com.mysql</groupId>
+                <artifactId>mysql-connector-j</artifactId>
                <version>${mysql-connector-java.version}</version>
            </dependency>

@@ -532,8 +531,8 @@
        <!-- WEB end -->

        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
            <scope>runtime</scope>
        </dependency>

--- a/pom.xml
+++ b/pom.xml
@@ -31,10 +31,10 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.14.0</version>
                <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>17</source>
+                    <target>17</target>
                    <encoding>UTF-8</encoding>
                    <meminitial>256m</meminitial>
                    <maxmem>1024m</maxmem>