Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
member-api
Project
Project
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
曲欣亮
member-api
Commits
fce2a9cc
Commit
fce2a9cc
authored
Nov 20, 2018
by
Quxl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
xxx
parent
f730b062
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
3 deletions
+12
-3
MemberApplyController.java
...java/com/egolm/film/api/member/MemberApplyController.java
+5
-1
application-dev.properties
src/main/resources/application-dev.properties
+3
-1
application-pro.properties
src/main/resources/application-pro.properties
+4
-1
No files found.
src/main/java/com/egolm/film/api/member/MemberApplyController.java
View file @
fce2a9cc
...
@@ -4,6 +4,7 @@ import java.util.List;
...
@@ -4,6 +4,7 @@ import java.util.List;
import
java.util.Map
;
import
java.util.Map
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.transaction.annotation.Transactional
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.PostMapping
;
...
@@ -37,6 +38,9 @@ public class MemberApplyController {
...
@@ -37,6 +38,9 @@ public class MemberApplyController {
@Autowired
@Autowired
private
MemberTokenService
tokenService
;
private
MemberTokenService
tokenService
;
@Value
(
"${opt.member_id}"
)
private
Integer
opt_member_id
;
@ResponseBody
@ResponseBody
@PostMapping
(
"get_list"
)
@PostMapping
(
"get_list"
)
@ApiOperation
(
"申报项目查询"
)
@ApiOperation
(
"申报项目查询"
)
...
@@ -47,7 +51,7 @@ public class MemberApplyController {
...
@@ -47,7 +51,7 @@ public class MemberApplyController {
LoginToken
loginToken
=
tokenService
.
getToken
();
LoginToken
loginToken
=
tokenService
.
getToken
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
Integer
member_id
=
(
Integer
)
loginToken
.
getId
();
List
<
Map
<
String
,
Object
>>
list
=
null
;
List
<
Map
<
String
,
Object
>>
list
=
null
;
if
(
member_id
==
3785
)
{
if
(
member_id
==
opt_member_id
)
{
list
=
memberService
.
queryListAll
(
keyword
);
list
=
memberService
.
queryListAll
(
keyword
);
}
else
{
}
else
{
list
=
memberService
.
queryListByMemberID
(
member_id
);
list
=
memberService
.
queryListByMemberID
(
member_id
);
...
...
src/main/resources/application-dev.properties
View file @
fce2a9cc
...
@@ -15,3 +15,5 @@ spring.datasource.min-idle=10
...
@@ -15,3 +15,5 @@ spring.datasource.min-idle=10
aliyun.sts.accessKeyId
=
LTAIOtHCCpDLXYp8
aliyun.sts.accessKeyId
=
LTAIOtHCCpDLXYp8
aliyun.sts.accessKeySecret
=
9XTHW7P9TTRvCsBHBSclOue2tdWOoa
aliyun.sts.accessKeySecret
=
9XTHW7P9TTRvCsBHBSclOue2tdWOoa
opt.member_id
=
3785
\ No newline at end of file
src/main/resources/application-pro.properties
View file @
fce2a9cc
...
@@ -15,3 +15,6 @@ spring.datasource.min-idle=10
...
@@ -15,3 +15,6 @@ spring.datasource.min-idle=10
aliyun.sts.accessKeyId
=
LTAIOtHCCpDLXYp8
aliyun.sts.accessKeyId
=
LTAIOtHCCpDLXYp8
aliyun.sts.accessKeySecret
=
9XTHW7P9TTRvCsBHBSclOue2tdWOoa
aliyun.sts.accessKeySecret
=
9XTHW7P9TTRvCsBHBSclOue2tdWOoa
opt.member_id
=
4
\ No newline at end of file
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