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
4ca68195
Commit
4ca68195
authored
Dec 14, 2021
by
吴迪
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/main/java/io/office/config/ShiroConfig.java
parents
5ee2286d
a7020248
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
ShiroConfig.java
src/main/java/io/office/config/ShiroConfig.java
+1
-1
TycpdmFirmController.java
...ffice/modules/manage/controller/TycpdmFirmController.java
+2
-3
BarcodeGenerationServiceImpl.java
...les/manage/service/impl/BarcodeGenerationServiceImpl.java
+0
-1
No files found.
src/main/java/io/office/config/ShiroConfig.java
View file @
4ca68195
...
...
@@ -61,8 +61,8 @@ public class ShiroConfig {
filterMap
.
put
(
"/captcha.jpg"
,
"anon"
);
filterMap
.
put
(
"/aaa.txt"
,
"anon"
);
//不需要登录的接口
filterMap
.
put
(
"/*/api/**"
,
"anon"
);
filterMap
.
put
(
"/*/api/login"
,
"anon"
);
filterMap
.
put
(
"/*/api/**"
,
"anon"
);
filterMap
.
put
(
"/**"
,
"oauth2"
);
shiroFilter
.
setFilterChainDefinitionMap
(
filterMap
);
...
...
src/main/java/io/office/modules/manage/controller/TycpdmFirmController.java
View file @
4ca68195
...
...
@@ -147,15 +147,14 @@ public class TycpdmFirmController extends AbstractController {
*/
@RequestMapping
(
"/api/findTycpdmFirmLogoutFlagCount"
)
// @RequiresPermissions("manage:tycpdmfirm:delete")
@Login
public
R
findTycpdmFirmLogoutFlagCount
(
@RequestParam
(
"userId"
)
Integer
userId
){
/*Integer id=getMemberUserId().intValue();
if(id==null){
return R.error("用户信息有误");
}
MemberEntity userMember = getMemberUser();*/
MemberEntity
member
Entity
=
memberDao
.
selectById
(
userId
);
Map
<
String
,
Integer
>
map
=
tycpdmFirmService
.
findTycpdmFirmLogoutFlagCount
(
member
Entity
);
MemberEntity
member
User
=
getMemberUser
(
);
Map
<
String
,
Integer
>
map
=
tycpdmFirmService
.
findTycpdmFirmLogoutFlagCount
(
member
User
);
return
R
.
ok
().
put
(
"data"
,
map
);
}
...
...
src/main/java/io/office/modules/manage/service/impl/BarcodeGenerationServiceImpl.java
View file @
4ca68195
package
io
.
office
.
modules
.
manage
.
service
.
impl
;
import
com.sun.javaws.jnl.RContentDesc
;
import
io.office.common.exception.RRException
;
import
io.office.modules.manage.dao.QRcodeDao
;
import
io.office.modules.manage.entity.GS1CodeListEntity
;
...
...
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