WANG hace 6 años
padre
commit
3ea23d9e73

+ 2 - 2
src/main/java/cn/com/qmth/examcloud/web/upyun/UpyunService.java

@@ -39,9 +39,9 @@ public interface UpyunService {
 	 *
 	 * @author WANGWEI
 	 * @param siteId
-	 * @param filePath
+	 * @param env
 	 */
-	void delete(String siteId, String filePath);
+	void delete(String siteId, UpyunPathEnvironmentInfo env);
 
 	/**
 	 * 创建签名

+ 5 - 2
src/main/java/cn/com/qmth/examcloud/web/upyun/UpyunServiceImpl.java

@@ -46,9 +46,12 @@ public class UpyunServiceImpl implements UpyunService {
 	}
 
 	@Override
-	public void delete(String siteId, String filePath) {
+	public void delete(String siteId, UpyunPathEnvironmentInfo env) {
+		UpyunSite upyunSite = UpyunSiteManager.getUpyunSite(siteId);
 		UpYunClient upYunClient = UpyunSiteManager.getUpYunClient(siteId);
-		upYunClient.deleteFile(filePath);
+
+		String path = FreeMarkerUtil.process(upyunSite.getPath(), env);
+		upYunClient.deleteFile(path);
 	}
 
 	@Override