Merge branch 'master' of http://key@gitlab.egolm.com/hanxu/siff-film-api.git

src/main/java/com/egolm/film/api/web/AliyunApiController.java

@@ -143,7 +143,7 @@ public class AliyunApiController {
 		if(!StringUtil.isNotEmpty(videoId)) { 
 			return Rjx.jsonErr().setMessage(messages.get("err.param_null"));
 		}
-		
+	
 		AliyunUtil aliyunUtil = new AliyunUtil(accessKeyId,accessKeySecret);
 		try {
 			GetVideoPlayAuthResponse response = aliyunUtil.getVideoPlayAuth(videoId);

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

@@ -21,8 +21,8 @@ import com.egolm.common.HttpsUtil;
 import com.egolm.film.config.XRException;
 
 public class AliyunUtil {
-	private String accessKeyId = "";//"LTAIOtHCCpDLXYp8";
-	private String accessKeySecret = "";//"9XTHW7P9TTRvCsBHBSclOue2tdWOoa";
+	private String accessKeyId = "LTAIOtHCCpDLXYp8";
+	private String accessKeySecret = "9XTHW7P9TTRvCsBHBSclOue2tdWOoa";
 
 	private  final  DefaultAcsClient aliyunClient;
 
@@ -33,6 +33,8 @@ public class AliyunUtil {
 	public AliyunUtil(String accessKeyId,String accessKeySecret) {
 		this.accessKeyId = accessKeyId;
 		this.accessKeySecret = accessKeySecret;
+		System.out.println("accessKeyId----"+this.accessKeyId);
+		System.out.println("accessKeySecret----"+this.accessKeySecret);
 		this.aliyunClient = new DefaultAcsClient(DefaultProfile.getProfile("cn-shanghai", accessKeyId, accessKeySecret));
 	}