xx

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.egolm.common.StringUtil;
 import com.egolm.common.bean.Rjx;
 import com.egolm.film.api.member.service.MemberService;
 import com.egolm.film.api.member.service.MemberTokenService;
@@ -43,9 +44,14 @@ public class MemberApplyController {
 	@ApiImplicitParams({
 		@ApiImplicitParam(paramType="header", dataType="string", name="i18n_language")
 	})
-	public Object list() {
-		LoginToken loginToken = tokenService.getToken();
-		Integer member_id = (Integer)loginToken.getId();
+	public Object list(String email) {
+		Integer member_id = null;
+		if(StringUtil.isNotBlank(email)) {
+			member_id = memberService.getMemberByEmail(email).getId();
+		} else {
+			LoginToken loginToken = tokenService.getToken();
+			member_id = (Integer)loginToken.getId();
+		}
 		List<Map<String, Object>> list = memberService.queryListByMemberID(member_id);
 		return Rjx.jsonOk().setData(list);
 	}

src/main/java/com/egolm/film/util/Common.java

@@ -22,7 +22,7 @@ public class Common {
 	}
 	
 	public static void main(String[] args) {
-		System.out.println(encodePassword("123456", "78hzar"));
+		System.out.println(encodePassword("Siff@2018", "78hzar"));
 		System.out.println(getGenerateString(6));
 	}