github/Tbed
4
0
Fork 0
mirror of https://github.com/Hello-hao/Tbed.git synced 2024-04-21 12:32:10 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	sql/picturebed.sql
#	src/main/java/cn/hellohao/controller/AdminController.java
#	src/main/java/cn/hellohao/controller/AdminRootController.java
#	src/main/java/cn/hellohao/controller/AlbumController.java
#	src/main/java/cn/hellohao/controller/ClientController.java
#	src/main/java/cn/hellohao/controller/UpdateImgController.java
#	src/main/java/cn/hellohao/controller/UserController.java
#	src/main/java/cn/hellohao/interceptor/InterceptorConfig.java
#	src/main/java/cn/hellohao/interceptor/InterceptorConfigWeb.java
#	src/main/java/cn/hellohao/interceptor/WebAppConfig.java
#	src/main/java/cn/hellohao/pojo/Images.java
#	src/main/java/cn/hellohao/pojo/ImgAndAlbum.java
#	src/main/java/cn/hellohao/service/impl/COSImageupload.java
#	src/main/java/cn/hellohao/service/impl/FTPImageupload.java
#	src/main/java/cn/hellohao/service/impl/KODOImageupload.java
#	src/main/java/cn/hellohao/service/impl/NOSImageupload.java
#	src/main/java/cn/hellohao/service/impl/OSSImageupload.java
#	src/main/java/cn/hellohao/service/impl/USSImageupload.java
#	src/main/java/cn/hellohao/service/impl/UploadServicel.java
#	src/main/java/cn/hellohao/utils/FirstRun.java
#	src/main/java/cn/hellohao/utils/GetSource.java
#	src/main/java/cn/hellohao/utils/SetFiles.java
#	src/main/resources/application.properties
#	src/main/resources/mapper/ImgAndAlbumMapper.xml
#	src/main/resources/static/js/hellohao.js
#	src/main/resources/static/webuploade/js/upload.js
#	src/main/resources/templates/admin/about.html
#	src/main/resources/templates/admin/albumlist.html
#	src/main/resources/templates/admin/index.html
#	src/main/resources/templates/admin/storageconfig.html
#	src/main/resources/templates/admin/survey.html
#	src/main/resources/templates/admin/table.html
#	src/main/resources/templates/admin/webconfig.html
#	src/main/resources/templates/album/album_new.html
#	src/main/resources/templates/index-Minimalism.html
#	src/main/resources/templates/index.html
This commit is contained in:
tiansh
2021-03-25 09:35:00 +08:00
parent ee78074499 77364f7fb0
commit 498abcd83c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -111,7 +111,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
<version>2.2.1</version>
<version>2.3.2</version>
</dependency>
<dependency><!-- 该依赖必加，里面有sping对schedule的支持 -->