Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
device-new-platform
Commits
199b1e4d
Commit
199b1e4d
authored
Oct 20, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更改上传文件大小限制
parent
5514c41c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
.../java/com/mortals/xhx/base/login/web/LoginController.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/base/system/resource/dao/ResourceDao.java
...com/mortals/xhx/base/system/resource/dao/ResourceDao.java
+1
-1
device-manager/src/main/java/com/mortals/xhx/base/system/resource/service/ResourceService.java
...als/xhx/base/system/resource/service/ResourceService.java
+4
-4
No files found.
device-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @
199b1e4d
...
@@ -156,7 +156,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
...
@@ -156,7 +156,7 @@ public class LoginController extends BaseCRUDJsonBodyMappingController<UserServi
return
JSONObject
.
toJSONString
(
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
));
return
JSONObject
.
toJSONString
(
Rest
.
fail
(
ERROR_TOKEN_EXPIRED
,
ERROR_TOKEN_EXPIRED_CONTENT
));
}
}
Set
<
String
>
urls
=
resourceService
.
findUrlSetByUserId
(
user
.
getId
());
Set
<
String
>
urls
=
resourceService
.
findUrlSetByUserId
(
user
.
getId
());
log
.
info
(
"u
rls:{}"
,
JSON
.
toJSONString
(
urls
));
log
.
info
(
"u
serId:{},urls:{}"
,
user
.
getId
(),
JSON
.
toJSONString
(
urls
));
List
<
MenuEntity
>
outlookBarList
=
menuService
.
findTreeMenu
(
user
,
urls
);
List
<
MenuEntity
>
outlookBarList
=
menuService
.
findTreeMenu
(
user
,
urls
);
String
currUserName
=
user
.
getRealName
();
String
currUserName
=
user
.
getRealName
();
if
(
currUserName
==
null
||
currUserName
.
trim
().
length
()
==
0
)
{
if
(
currUserName
==
null
||
currUserName
.
trim
().
length
()
==
0
)
{
...
...
device-manager/src/main/java/com/mortals/xhx/base/system/resource/dao/ResourceDao.java
View file @
199b1e4d
...
@@ -24,7 +24,7 @@ import java.util.List;
...
@@ -24,7 +24,7 @@ import java.util.List;
*/
*/
public
interface
ResourceDao
extends
ICRUDDao
<
ResourceEntity
,
Long
>
{
public
interface
ResourceDao
extends
ICRUDDao
<
ResourceEntity
,
Long
>
{
public
List
<
ResourceEntity
>
getListByUserId
(
Long
userId
);
List
<
ResourceEntity
>
getListByUserId
(
Long
userId
);
List
<
ResourceEntity
>
getAll
(
int
userType
);
List
<
ResourceEntity
>
getAll
(
int
userType
);
}
}
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/base/system/resource/service/ResourceService.java
View file @
199b1e4d
...
@@ -31,7 +31,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
...
@@ -31,7 +31,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
* @return
* @return
* @throws AppException
* @throws AppException
*/
*/
public
List
<
ResourceEntity
>
findAllEnable
()
throws
AppException
;
List
<
ResourceEntity
>
findAllEnable
()
throws
AppException
;
/**
/**
* 根据用户查询可用资源
* 根据用户查询可用资源
...
@@ -39,7 +39,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
...
@@ -39,7 +39,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
* @return
* @return
* @throws AppException
* @throws AppException
*/
*/
public
List
<
ResourceEntity
>
findListByUserId
(
Long
userId
)
throws
AppException
;
List
<
ResourceEntity
>
findListByUserId
(
Long
userId
)
throws
AppException
;
/**
/**
* 查询用户可用资源
* 查询用户可用资源
...
@@ -47,7 +47,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
...
@@ -47,7 +47,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
* @return 字符串,多个以逗号分隔
* @return 字符串,多个以逗号分隔
* @throws AppException
* @throws AppException
*/
*/
public
String
findUrlByUserId
(
Long
userId
)
throws
AppException
;
String
findUrlByUserId
(
Long
userId
)
throws
AppException
;
/**
/**
* 查询用户用资源集合
* 查询用户用资源集合
...
@@ -55,7 +55,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
...
@@ -55,7 +55,7 @@ public interface ResourceService extends ICRUDService<ResourceEntity,Long> {
* @return
* @return
* @throws AppException
* @throws AppException
*/
*/
public
Set
<
String
>
findUrlSetByUserId
(
Long
userId
)
throws
AppException
;
Set
<
String
>
findUrlSetByUserId
(
Long
userId
)
throws
AppException
;
/**
/**
* 获取所有资源,不分页
* 获取所有资源,不分页
...
...
Write
Preview
Markdown
is supported
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