Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Eladmin
Commits
f9bb8cf2
Commit
f9bb8cf2
authored
Sep 26, 2019
by
dqjdda
Browse files
修复定时任务执行失败后还继续执行的bug,优化Redis发生异常时,程序正常执行,优化Excel大数据导出,优化QueryHelp,其他细节优化
parent
a481b16b
Changes
25
Hide whitespace changes
Inline
Side-by-side
eladmin-tools/src/main/java/me/zhengjie/rest/PictureController.java
View file @
f9bb8cf2
...
...
@@ -45,7 +45,7 @@ public class PictureController {
public
ResponseEntity
upload
(
@RequestParam
MultipartFile
file
){
String
userName
=
SecurityUtils
.
getUsername
();
Picture
picture
=
pictureService
.
upload
(
file
,
userName
);
Map
map
=
new
HashMap
(
3
);
Map
<
String
,
Object
>
map
=
new
HashMap
<>
(
3
);
map
.
put
(
"errno"
,
0
);
map
.
put
(
"id"
,
picture
.
getId
());
map
.
put
(
"data"
,
new
String
[]{
picture
.
getUrl
()});
...
...
eladmin-tools/src/main/java/me/zhengjie/service/LocalStorageService.java
View file @
f9bb8cf2
...
...
@@ -22,7 +22,7 @@ public interface LocalStorageService {
* @param pageable
* @return
*/
@Cacheable
(
keyGenerator
=
"keyGenerator"
)
@Cacheable
Object
queryAll
(
LocalStorageQueryCriteria
criteria
,
Pageable
pageable
);
/**
...
...
@@ -30,7 +30,7 @@ public interface LocalStorageService {
* @param criteria
* @return
*/
@Cacheable
(
keyGenerator
=
"keyGenerator"
)
@Cacheable
public
Object
queryAll
(
LocalStorageQueryCriteria
criteria
);
/**
...
...
eladmin-tools/src/main/java/me/zhengjie/service/PictureService.java
View file @
f9bb8cf2
...
...
@@ -20,7 +20,7 @@ public interface PictureService {
* @param pageable
* @return
*/
@Cacheable
(
keyGenerator
=
"keyGenerator"
)
@Cacheable
Object
queryAll
(
PictureQueryCriteria
criteria
,
Pageable
pageable
);
/**
...
...
eladmin-tools/src/main/java/me/zhengjie/service/QiNiuService.java
View file @
f9bb8cf2
...
...
@@ -24,7 +24,7 @@ public interface QiNiuService {
* @param pageable
* @return
*/
@Cacheable
(
keyGenerator
=
"keyGenerator"
)
@Cacheable
Object
queryAll
(
QiniuQueryCriteria
criteria
,
Pageable
pageable
);
/**
...
...
pom.xml
View file @
f9bb8cf2
...
...
@@ -160,6 +160,17 @@
<artifactId>
poi
</artifactId>
<version>
3.17
</version>
</dependency>
<dependency>
<groupId>
org.apache.poi
</groupId>
<artifactId>
poi-ooxml
</artifactId>
<version>
3.17
</version>
</dependency>
<!-- https://mvnrepository.com/artifact/xerces/xercesImpl -->
<dependency>
<groupId>
xerces
</groupId>
<artifactId>
xercesImpl
</artifactId>
<version>
2.11.0
</version>
</dependency>
<!-- fastjson -->
<dependency>
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment