diff --git 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 deleted file mode 100644 index 854350a95..000000000 --- a/accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/BannerAdminVo.java +++ /dev/null @@ -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; - } -} diff --git a/accompany-base/accompany-core/src/main/resources/banner.txt b/accompany-base/accompany-core/src/main/resources/banner.txt index eb563a106..a842a6870 100644 --- a/accompany-base/accompany-core/src/main/resources/banner.txt +++ b/accompany-base/accompany-core/src/main/resources/banner.txt @@ -1,8 +1,5 @@ - _______ _________ _ _______ -( ____ )\__ __/| \ /\( ___ ) -| ( )| ) ( | \ / /| ( ) | -| (____)| | | | (_/ / | | | | -| _____) | | | _ ( | | | | -| ( | | | ( \ \ | | | | -| ) ___) (___| / \ \| (___) | -|/ \_______/|_/ \/(_______) + __ ___ ___ __ + / |/ /___ / (_)____/ /_____ ______ + / /|_/ / __ \/ / / ___/ __/ __ `/ ___/ + / / / / /_/ / / (__ ) /_/ /_/ / / +/_/ /_/\____/_/_/____/\__/\__,_/_/ \ No newline at end of file diff --git a/accompany-dependencies/pom.xml b/accompany-dependencies/pom.xml index 72900393a..843642e71 100644 --- a/accompany-dependencies/pom.xml +++ b/accompany-dependencies/pom.xml @@ -16,8 +16,8 @@ 1.0.0 UTF-8 - 11 - 11 + 17 + 17 ${basedir}/target 2021.0.5 @@ -26,7 +26,7 @@ 3.10.0 3.1 3.2.5.RELEASE - 8.0.33 + 9.3.0 3.1.0 4.5 31.1-jre @@ -36,7 +36,6 @@ 7.14.0 4.12.0 3.0.0 - 0.1.10 3.0.0 4.1.2 3.15.5 @@ -60,14 +59,14 @@ 1.5.4 2.0.1.RELEASE 1.2.0 - 3.5.9 + 3.5.12 1.0.4 - 3.38.0 + 3.45.1 4.0.3 - 8.13.49 + 9.0.5 2.7.0 1.7.2 - 5.8.27 + 5.8.38 1.5.0 v3-rev24-1.24.1 1.0.12 @@ -144,8 +143,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j ${mysql-connector-java.version} @@ -532,8 +531,8 @@ - mysql - mysql-connector-java + com.mysql + mysql-connector-j runtime diff --git a/pom.xml b/pom.xml index b0ad0842b..aefec95f8 100644 --- a/pom.xml +++ b/pom.xml @@ -31,10 +31,10 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.14.0 - 11 - 11 + 17 + 17 UTF-8 256m 1024m