Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/helpers/application_helper.rb

@@ -130,15 +130,15 @@ module ApplicationHelper
       if source.class.to_s == 'User'
         File.join(relative_path, ["#{source.class}", "#{source.id}"])
       else
-        File.join("images/avatars", ["#{source.class}", "#{source.id}"])
+        File.join("avatars", ["#{source.class}", "#{source.id}"])
       end
     elsif source.class.to_s == 'User'
       str = source.user_extension.try(:gender).to_i == 0 ? "b" : "g"
       File.join(relative_path, "#{source.class}", str)
     elsif source.class.to_s == 'Subject'
-      File.join("images","educoder", "index", "subject", "subject#{rand(17)}.jpg")
+      File.join("educoder", "index", "subject", "subject#{rand(17)}.jpg")
     elsif source.class.to_s == 'Shixun'
-      File.join("images","educoder", "index", "shixun", "shixun#{rand(23)}.jpg")
+      File.join("educoder","index", "shixun", "shixun#{rand(23)}.jpg")
     end
   end
 

public/react/src/modules/forums/PostPaginationHOC.js

@@ -267,7 +267,7 @@ return function wrap(WrappedComponent) {
 	    	this.setTop(memo);
 	    }
 	    onMemoDelete(memo) {
-	    	const deleteUrl = `/api/v1/memos/${memo.id}`;
+	    	const deleteUrl = `/memos/${memo.id}.json`;
 	    	// 获取memo list
 	      	axios.delete(deleteUrl, {
 	          	// withCredentials: true,