Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gs1-office-web-sit
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
吴迪
gs1-office-web-sit
Commits
7c34f41c
Commit
7c34f41c
authored
Dec 14, 2021
by
唐功亮
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改token认证
parent
a7020248
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
8 deletions
+8
-8
ShiroConfig.java
src/main/java/io/office/config/ShiroConfig.java
+1
-1
LogLoginController.java
.../office/modules/manage/controller/LogLoginController.java
+1
-1
MemberController.java
...io/office/modules/manage/controller/MemberController.java
+4
-4
TycpdmFirmController.java
...ffice/modules/manage/controller/TycpdmFirmController.java
+2
-2
No files found.
src/main/java/io/office/config/ShiroConfig.java
View file @
7c34f41c
...
@@ -61,7 +61,7 @@ public class ShiroConfig {
...
@@ -61,7 +61,7 @@ public class ShiroConfig {
filterMap
.
put
(
"/captcha.jpg"
,
"anon"
);
filterMap
.
put
(
"/captcha.jpg"
,
"anon"
);
filterMap
.
put
(
"/aaa.txt"
,
"anon"
);
filterMap
.
put
(
"/aaa.txt"
,
"anon"
);
//不需要登录的接口
//不需要登录的接口
filterMap
.
put
(
"/*/api/login"
,
"anon"
);
filterMap
.
put
(
"/*/a
uthA
pi/login"
,
"anon"
);
filterMap
.
put
(
"/*/api/**"
,
"anon"
);
filterMap
.
put
(
"/*/api/**"
,
"anon"
);
filterMap
.
put
(
"/**"
,
"oauth2"
);
filterMap
.
put
(
"/**"
,
"oauth2"
);
shiroFilter
.
setFilterChainDefinitionMap
(
filterMap
);
shiroFilter
.
setFilterChainDefinitionMap
(
filterMap
);
...
...
src/main/java/io/office/modules/manage/controller/LogLoginController.java
View file @
7c34f41c
...
@@ -47,7 +47,7 @@ public class LogLoginController {
...
@@ -47,7 +47,7 @@ public class LogLoginController {
/**
/**
* 用户登录
* 用户登录
*/
*/
@RequestMapping
(
"/api/login"
)
@RequestMapping
(
"/a
uthA
pi/login"
)
@Login
@Login
// @RequiresPermissions("manage:member:list")
// @RequiresPermissions("manage:member:list")
public
R
login
(
@RequestBody
Map
<
String
,
Object
>
params
,
HttpServletRequest
request
,
HttpServletResponse
response
){
public
R
login
(
@RequestBody
Map
<
String
,
Object
>
params
,
HttpServletRequest
request
,
HttpServletResponse
response
){
...
...
src/main/java/io/office/modules/manage/controller/MemberController.java
View file @
7c34f41c
...
@@ -84,11 +84,11 @@ public class MemberController extends AbstractController {
...
@@ -84,11 +84,11 @@ public class MemberController extends AbstractController {
/**
/**
* 信息
* 信息
*/
*/
@RequestMapping
(
"/api/info/{id}"
)
@RequestMapping
(
"/api/info/"
)
@Login
// @RequiresPermissions("manage:member:info")
// @RequiresPermissions("manage:member:info")
public
R
info
(
@PathVariable
(
"id"
)
Integer
id
){
public
R
info
(){
MemberEntity
member
=
memberService
.
getById
(
id
);
Integer
memberUserId
=
getMemberUserId
();
MemberEntity
member
=
memberService
.
getById
(
memberUserId
);
return
R
.
ok
().
put
(
"data"
,
member
);
return
R
.
ok
().
put
(
"data"
,
member
);
}
}
...
...
src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java
View file @
7c34f41c
...
@@ -91,7 +91,6 @@ public class TycpdmFirmController extends AbstractController {
...
@@ -91,7 +91,6 @@ public class TycpdmFirmController extends AbstractController {
* 保存(保存企业信息)
* 保存(保存企业信息)
*/
*/
@RequestMapping
(
"/api/save"
)
@RequestMapping
(
"/api/save"
)
@Login
// @RequiresPermissions("manage:tycpdmfirm:save")
// @RequiresPermissions("manage:tycpdmfirm:save")
public
R
save
(
@RequestBody
TycpdmFirmEntity
tycpdmFirm
,
@RequestParam
(
"file"
)
MultipartFile
file
){
public
R
save
(
@RequestBody
TycpdmFirmEntity
tycpdmFirm
,
@RequestParam
(
"file"
)
MultipartFile
file
){
String
baseUser
=
tycpdmFirm
.
getBaseUser
();
String
baseUser
=
tycpdmFirm
.
getBaseUser
();
...
@@ -147,13 +146,14 @@ public class TycpdmFirmController extends AbstractController {
...
@@ -147,13 +146,14 @@ public class TycpdmFirmController extends AbstractController {
*/
*/
@RequestMapping
(
"/api/findTycpdmFirmLogoutFlagCount"
)
@RequestMapping
(
"/api/findTycpdmFirmLogoutFlagCount"
)
// @RequiresPermissions("manage:tycpdmfirm:delete")
// @RequiresPermissions("manage:tycpdmfirm:delete")
public
R
findTycpdmFirmLogoutFlagCount
(
@RequestParam
(
"userId"
)
Integer
userId
){
public
R
findTycpdmFirmLogoutFlagCount
(){
/*Integer id=getMemberUserId().intValue();
/*Integer id=getMemberUserId().intValue();
if(id==null){
if(id==null){
return R.error("用户信息有误");
return R.error("用户信息有误");
}
}
MemberEntity userMember = getMemberUser();*/
MemberEntity userMember = getMemberUser();*/
MemberEntity
memberUser
=
getMemberUser
();
MemberEntity
memberUser
=
getMemberUser
();
Map
<
String
,
Integer
>
map
=
tycpdmFirmService
.
findTycpdmFirmLogoutFlagCount
(
memberUser
);
Map
<
String
,
Integer
>
map
=
tycpdmFirmService
.
findTycpdmFirmLogoutFlagCount
(
memberUser
);
return
R
.
ok
().
put
(
"data"
,
map
);
return
R
.
ok
().
put
(
"data"
,
map
);
}
}
...
...
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