x

src/main/java/com/egolm/film/api/web/member/MemberApplyController.java

@@ -4,7 +4,6 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,24 +34,17 @@ public class MemberApplyController {
 	@Autowired
 	private MemberTokenService tokenService;
 	
-	@Value("${opt.member_id}")
-	private Integer opt_member_id;
-
 	@ResponseBody
 	@PostMapping("get_list")
 	@ApiOperation("申报项目查询")
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language")
 	})
-	public Object list(String keyword) {
+	public Object list() {
 		LoginToken loginToken = tokenService.getToken();
 		Integer member_id = (Integer)loginToken.getId();
 		List<Map<String, Object>> list = null;
-		if(member_id.intValue() ==  opt_member_id.intValue()) {
-			list = memberFilmService.queryListAll(keyword);
-		} else {
-			list = memberService.queryListByMemberID(member_id);
-		}
+		list = memberService.queryListByMemberID(member_id);
 		return Rjx.jsonOk().setData(list);
 	}
 	

src/main/java/com/egolm/film/api/web/member/MemberInfoController.java

 package com.egolm.film.api.web.member;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,9 +33,6 @@ public class MemberInfoController {
 	@Autowired
 	private Messages messages;
 	
-	@Value("${opt.member_id}")
-	private Integer opt_member_id;
-	
 	@ResponseBody
 	@PostMapping("query")
 	@ApiOperation("查询会员基本信息")
@@ -47,7 +43,7 @@ public class MemberInfoController {
 		LoginToken loginToken = tokenService.getToken();
 		Integer id = (Integer)loginToken.getId();
 		Fc_member member = memberService.getMemberById(id);
-		return Rjx.jsonOk().setData(member).set("show", id.compareTo(opt_member_id) == 0);
+		return Rjx.jsonOk().setData(member);
 	}
 	
 	@ResponseBody

src/main/resources/application-dev.properties

@@ -34,5 +34,4 @@ spring.datasource.min-idle=10
 aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
 aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
 
-opt.project.type=1
-opt.member_id=3785
+opt.project.type=1
\ No newline at end of file
\ No newline at end of file

src/main/resources/application-pro.properties

@@ -34,5 +34,4 @@ spring.datasource.min-idle=10
 aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
 aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
 
-opt.project.type=1
-opt.member_id=3785
+opt.project.type=1
\ No newline at end of file
\ No newline at end of file

src/main/resources/application-tvdev.properties

-server.tomcat.max-threads=1000
-server.tomcat.min-spare-threads=30
-server.port=20003
-server.context-path=/tv
-server.tomcat.uri-encoding=utf-8
-server.session.timeout=90000
-spring.http.multipart.maxFileSize=5MB
-spring.http.multipart.maxRequestSize=5MB
-spring.http.encoding.force=true
-spring.http.encoding.enabled=true
-spring.http.encoding.charset=utf-8
-com.egolm.film.email.smtp.host=smtp.siff.com
-com.egolm.film.email.smtp.port=25
-com.egolm.film.email.smtp.is_auth=true
-com.egolm.film.email.smtp.from=filmpassword@siff.com
-com.egolm.film.email.smtp.username=filmpassword@siff.com
-com.egolm.film.email.smtp.password=siffstvf2018
-
-spring.datasource.url=jdbc:mysql://10.10.0.111:3306/tv?useSSL=false&useUnicode=true&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=egolm#2018
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.test-while-idle=true
-spring.datasource.test-on-borrow=false
-spring.datasource.test-on-return=false
-spring.datasource.validation-query=select 1 from dual
-spring.datasource.time-between-eviction-runs-millis=300000
-spring.datasource.min-evictable-idle-time-millis=1800000
-spring.datasource.max-wait=10000
-spring.datasource.initial-size=10
-spring.datasource.max-active=100
-spring.datasource.min-idle=10
-
-aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
-aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
-
-opt.project.type=2
-opt.member_id=3785
\ No newline at end of file

src/main/resources/application-tvpro.properties

-server.tomcat.max-threads=1000
-server.tomcat.min-spare-threads=30
-server.port=20003
-server.context-path=/tv
-server.tomcat.uri-encoding=utf-8
-server.session.timeout=90000
-spring.http.multipart.maxFileSize=5MB
-spring.http.multipart.maxRequestSize=5MB
-spring.http.encoding.force=true
-spring.http.encoding.enabled=true
-spring.http.encoding.charset=utf-8
-com.egolm.film.email.smtp.host=smtp.siff.com
-com.egolm.film.email.smtp.port=25
-com.egolm.film.email.smtp.is_auth=true
-com.egolm.film.email.smtp.from=filmpassword@siff.com
-com.egolm.film.email.smtp.username=filmpassword@siff.com
-com.egolm.film.email.smtp.password=siffstvf2018
-
-spring.datasource.url=jdbc:mysql://10.10.0.111:3306/tv?useSSL=false&useUnicode=true&characterEncoding=utf8
-spring.datasource.username=root
-spring.datasource.password=egolm#2018
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.test-while-idle=true
-spring.datasource.test-on-borrow=false
-spring.datasource.test-on-return=false
-spring.datasource.validation-query=select 1 from dual
-spring.datasource.time-between-eviction-runs-millis=300000
-spring.datasource.min-evictable-idle-time-millis=1800000
-spring.datasource.max-wait=10000
-spring.datasource.initial-size=10
-spring.datasource.max-active=100
-spring.datasource.min-idle=10
-
-aliyun.sts.accessKeyId=LTAIOtHCCpDLXYp8
-aliyun.sts.accessKeySecret=9XTHW7P9TTRvCsBHBSclOue2tdWOoa
-
-opt.project.type=2
-opt.member_id=3785
\ No newline at end of file