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
1b574b59
Commit
1b574b59
authored
Aug 05, 2019
by
dqjdda
Browse files
update resources\template\generator\front\index.ftl
parent
1d517316
Changes
4
Hide whitespace changes
Inline
Side-by-side
eladmin-system/src/main/java/me/zhengjie/modules/monitor/service/impl/RedisServiceImpl.java
View file @
1b574b59
...
...
@@ -48,8 +48,6 @@ public class RedisServiceImpl implements RedisService {
return
page
;
}
@Override
public
void
delete
(
String
key
)
{
redisTemplate
.
delete
(
key
);
...
...
eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java
View file @
1b574b59
...
...
@@ -171,6 +171,8 @@ public class UserController {
return
new
ResponseEntity
(
HttpStatus
.
OK
);
}
/**
* 如果当前用户的角色级别低于创建用户的角色级别,则抛出权限不足的错误
* @param resources
...
...
eladmin-system/src/main/resources/template/generator/front/index.ftl
View file @
1b574b59
...
...
@@ -62,8 +62,8 @@
<!--分页组件-->
<el-pagination
:total="total"
style="margin-top: 8px;"
:current-page="page + 1"
style="margin-top: 8px;"
layout="total, prev, pager, next, sizes"
@size-change="sizeChange"
@current-change="pageChange"/>
...
...
eladmin-tools/src/main/java/me/zhengjie/service/impl/PictureServiceImpl.java
View file @
1b574b59
...
...
@@ -48,7 +48,6 @@ public class PictureServiceImpl implements PictureService {
@Transactional
(
rollbackFor
=
Throwable
.
class
)
public
Picture
upload
(
MultipartFile
multipartFile
,
String
username
)
{
File
file
=
FileUtil
.
toFile
(
multipartFile
);
HashMap
<
String
,
Object
>
paramMap
=
new
HashMap
<>(
1
);
paramMap
.
put
(
"smfile"
,
file
);
...
...
@@ -66,7 +65,7 @@ public class PictureServiceImpl implements PictureService {
picture
.
setFilename
(
FileUtil
.
getFileNameNoEx
(
multipartFile
.
getOriginalFilename
())+
"."
+
FileUtil
.
getExtensionName
(
multipartFile
.
getOriginalFilename
()));
pictureRepository
.
save
(
picture
);
//删除临时文件
FileUtil
.
del
eteFile
(
file
);
FileUtil
.
del
(
file
);
return
picture
;
}
...
...
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