yystopf
/
forgeplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'educoder_server' into dev_educoder

This commit is contained in:
jasder 2021-07-05 15:21:23 +08:00
parent 85a37fdbcc ecdb79ee48
commit eba2df5a2d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/concerns/register_helper.rb
View File

@ -23,7 +23,7 @@ module RegisterHelper
forge_user.gitea_uid = gitea_user[:body]['id'] forge_user.gitea_uid = gitea_user[:body]['id']
forge_user.mail = email forge_user.mail = email
if forge_user.save if forge_user.save
UserExtension.create!(user_id: forge_user.id) unless forge_user.user_extension.blank? UserExtension.create!(user_id: forge_user.id) if forge_user.user_extension.blank?
result[:user] = {id: forge_user.id, token: forge_user.gitea_token} result[:user] = {id: forge_user.id, token: forge_user.gitea_token}
end end
else else

8
app/controllers/main_controller.rb
View File

@ -21,6 +21,14 @@ class MainController < ApplicationController
uid_logger("main start is #{cookies[:_educoder_session]}") uid_logger("main start is #{cookies[:_educoder_session]}")
end end
if params[:path] && params[:path].start_with?('projects/')
project_id = params[:path].split("/")[1]
project = Project.find_by_id(project_id)
if project.present?
return redirect_to("/projects/#{project.owner.login}/#{project.identifier}", status: 301)
end
end
# TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发 # TODO: 这块之后需要整合，者架构重新变化，统一跳转到index后再路由分发
if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild" if params[:path] && params[:path]&.include?("h5educoderbuild") && params[:path].split("/").first == "h5educoderbuild"
render file: 'public/h5educoderbuild/index.html', :layout => false render file: 'public/h5educoderbuild/index.html', :layout => false