Merge branches 'dev_jupyter' and 'dev_new_shixunsrepository' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_new_shixunsrepository

app/controllers/concerns/git_helper.rb

@@ -53,14 +53,16 @@ module GitHelper
   end
 
   # 添加目录
-  def git_add_folder(repo_path, folder_path, author_name, author_email, message)
-    GitService.add_tree(repo_path: repo_path, file_path: folder_path, message: message, author_name: author_name,
+  def git_add_folder(repo_path, tree_path, author_name, author_email, message)
+    Rails.logger.info("#####repo_path:#{repo_path}, tree_path: #{tree_path}")
+    GitService.add_tree(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name,
                         author_email: author_email)
   end
 
   # 删除文件
-  def git_delete_file(repo_path, file_path, author_name, author_email, message)
-    GitService.delete_file(repo_path, repo_path, file_path: file_path, message: message, author_name: author_name,
+  def git_delete_file(repo_path, tree_path, author_name, author_email, message)
+    Rails.logger.info("#####repo_path:#{repo_path}, tree_path: #{tree_path}")
+    GitService.delete_file(repo_path: repo_path, tree_path: tree_path, message: message, author_name: author_name,
                            author_email: author_email)
   end
 

app/controllers/shixuns_controller.rb

@@ -896,7 +896,8 @@ class ShixunsController < ApplicationController
 		author_email = current_user.git_mail
 		message = params[:message] || "upload file by browser"
 		uid_logger("-----author_email: #{author_email}")
-		update_file_base64_content(content, @repo_path, @path, author_email, author_name, message)
+		path = @path.present? ? "#{@path}/#{upload_file.original_filename}" : "#{upload_file.original_filename}"
+		update_file_base64_content(content, @repo_path, path, author_email, author_name, message)
 		render_ok
 	end
 

app/services/git_service.rb

@@ -68,8 +68,8 @@ class GitService
 
       content = JSON.parse(body)
       if content["code"] != 0
-        raise("版本库异常")
         logger.error("repository error: #{content['msg']}")
+        raise("版本库异常")
       end
       #raise content["msg"] if content["code"] != 0