From 677f9c2f4ee5740f0aac4dc176f420b5b08fc480 Mon Sep 17 00:00:00 2001 From: xxqfamous Date: Thu, 1 Jun 2023 18:33:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?user=20list=E8=BF=94=E5=9B=9E=E8=84=B1?= =?UTF-8?q?=E6=95=8F=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_small.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/users/_user_small.json.jbuilder b/app/views/users/_user_small.json.jbuilder index f5929ef6b..f495680e1 100644 --- a/app/views/users/_user_small.json.jbuilder +++ b/app/views/users/_user_small.json.jbuilder @@ -4,6 +4,7 @@ json.array! users do |user| json.login user.login json.user_id user.id json.mail user.mail + json.phone user.phone.present? ? "#{user.phone[0..2]}****#{user.phone[-4..-1]}" : "" json.custom_department user.custom_department json.image_url url_to_avatar(user) json.profile_completed user.profile_completed From 6d8956e80380d7c5ed21815c4ba0d4dadc08587f Mon Sep 17 00:00:00 2001 From: xxqfamous Date: Mon, 5 Jun 2023 14:29:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=8D=E6=9D=82=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/repositories_controller.rb | 6 +++--- app/services/gitea/client_service.rb | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 6b2d2437a..f981c37b5 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -74,7 +74,7 @@ class RepositoriesController < ApplicationController end def sub_entries - file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip)) + file_path_uri = URI.escape(URI.encode(params[:filepath].to_s.strip)) if @project.educoder? if params[:type] === 'file' @@ -127,7 +127,7 @@ class RepositoriesController < ApplicationController @commits = Educoder::Repository::Commits::ListService.call(@project&.project_educoder&.repo_name) else if params[:filepath].present? - file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip)) + file_path_uri = URI.escape(URI.encode(params[:filepath].to_s.strip)) @hash_commit = Gitea::Repository::Commits::FileListService.new(@owner.login, @project.identifier, file_path_uri, sha: params[:sha], page: params[:page], limit: params[:limit], token: @owner&.gitea_token).call else @@ -323,7 +323,7 @@ class RepositoriesController < ApplicationController # TODO 获取最新commit信息 def project_commits if params[:filepath].present? - file_path_uri = URI.parse(URI.encode(params[:filepath].to_s.strip)) + file_path_uri = URI.escape(URI.encode(params[:filepath].to_s.strip)) Gitea::Repository::Commits::FileListService.new(@project.owner.login, @project.identifier, file_path_uri, sha: get_ref, page: 1, limit: 1, token: @project&.owner&.gitea_token).call else diff --git a/app/services/gitea/client_service.rb b/app/services/gitea/client_service.rb index 62e040d82..5418be159 100644 --- a/app/services/gitea/client_service.rb +++ b/app/services/gitea/client_service.rb @@ -115,6 +115,9 @@ class Gitea::ClientService < ApplicationService url = [api_url(is_hat), api_rest].join('').freeze url = action === 'get' ? url : URI.escape(url) url = URI.escape(url) unless url.ascii_only? + url = url.gsub(")", "%29") if url.to_s.include?(")") + url = url.gsub("]", "%5D") if url.to_s.include?("]") + url = url.gsub("[", "%5B") if url.to_s.include?("[") puts "[gitea] request url: #{url}" return url end From f7162abe0d9cce38db0cb6258511dbcee6af2092 Mon Sep 17 00:00:00 2001 From: xxqfamous Date: Mon, 5 Jun 2023 14:47:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fixed=20=E6=B3=A8=E5=86=8Cerror=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/gitea/user/register_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/gitea/user/register_service.rb b/app/services/gitea/user/register_service.rb index f9e42e9e5..afea81080 100644 --- a/app/services/gitea/user/register_service.rb +++ b/app/services/gitea/user/register_service.rb @@ -31,7 +31,7 @@ class Gitea::User::RegisterService < Gitea::ClientService case status when 201 then success(body) else - error(message, status) + error(message || body["message"], status) end end From da299195a0ef52f58c64e7dd731a6f54d801d583 Mon Sep 17 00:00:00 2001 From: xxqfamous Date: Mon, 5 Jun 2023 14:59:59 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fixed=20=E6=B3=A8=E5=86=8Cerror=20message?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/accounts_controller.rb | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 8e395b833..59823861f 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -162,7 +162,7 @@ class AccountsController < ApplicationController render_ok end else - tip_exception(-1, interactor.error) + tip_exception(-1, interactor.result[:message]) end rescue Register::BaseForm::EmailError => e render_result(-2, e.message) @@ -177,10 +177,13 @@ class AccountsController < ApplicationController rescue Register::BaseForm::VerifiCodeError => e render_result(-6, e.message) rescue Exception => e - Gitea::User::DeleteService.call(user.login) unless user.nil? - Rails.logger.error("##:register error--#{user.try(:id)}") + if user.present? && !e.message.to_s.include?("user already exists") + # Gitea::User::DeleteService.call(user.login) + # user.destroy + end + Rails.logger.error("##:register error--#{user.try(:id)}，message:#{e.message}") logger_error(e) - tip_exception(-1, e.message) + tip_exception(-1, "注册失败") end end