diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d7608ec3d..b976ee8fa 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -702,6 +702,15 @@ class UsersController < ApplicationController @user = User.find_by(mail: params[:email]) end + #根据login获取用户信息 + def get_user_info_by_login + private_token = "hriEn3UwXfJs3PmyXnSH" + sign = Digest::MD5.hexdigest("#{private_token}:#{params[:login]}") + tip_exception(401, '401 Unauthorized') unless params[:sign].to_s == sign + user = User.find_by_login params[:login] + render_ok(data: {username: user.real_name, school: user.custom_department, login: user.login, phone: user.phone, mail: user.mail}) + end + private def load_user @user = User.find_by_login(params[:id]) || User.find_by(id: params[:id]) @@ -731,7 +740,7 @@ class UsersController < ApplicationController end def sso_login - if params[:login].present? && !current_user.logged? && params[:websiteName].present? + if params[:login].present? && !current_user.logged? && params[:websiteName].present? && request.referer.to_s.include?("gitlink.org.cn") user = User.where("login = ?", "#{params[:login].presence}").first # 已同步注册,直接登录 if user.present? diff --git a/app/controllers/version_releases_controller.rb b/app/controllers/version_releases_controller.rb index d542fbb76..93aece8fc 100644 --- a/app/controllers/version_releases_controller.rb +++ b/app/controllers/version_releases_controller.rb @@ -3,7 +3,7 @@ class VersionReleasesController < ApplicationController before_action :load_repository before_action :set_user before_action :require_login, except: [:index, :show] - before_action :check_release_authorize, except: [:index, :show] + before_action :check_release_authorize, except: [:index, :show, :download] before_action :find_version , only: [:show, :edit, :update, :destroy] def index diff --git a/app/queries/admins/glcc_examine_material.rb b/app/queries/admins/glcc_examine_material.rb index 4e8f2bea7..6f9213ddc 100644 --- a/app/queries/admins/glcc_examine_material.rb +++ b/app/queries/admins/glcc_examine_material.rb @@ -13,11 +13,8 @@ class Admins::GlccExamineMaterial < ApplicationQuery materials = GlccMediumTermExamineMaterial.all # term - term = params[:term] || [1,2] - if term.present? - materials = materials.where(term: term) - end - #year + materials = materials.where(term: params[:term]) if params[:term].present? + #year year = if params[:date] params[:date][:year] end diff --git a/app/views/admins/glcc_pr_check/index.html.erb b/app/views/admins/glcc_pr_check/index.html.erb index a70a09f6e..56e27b9d2 100644 --- a/app/views/admins/glcc_pr_check/index.html.erb +++ b/app/views/admins/glcc_pr_check/index.html.erb @@ -2,7 +2,7 @@ <%= form_tag(admins_glcc_pr_check_index_path, method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['中期考核',1], ['结项考核', 2]] %> + <% status_options = [['全部',''],['中期考核',1], ['结项考核', 2]] %> <%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
@@ -22,7 +22,7 @@ <%= form_tag(send_mail_admins_glcc_pr_check_index_path, method: :post, class: 'form-inline search-form flex-1', remote: true) do %>
- <% status_options = [['中期考核',1], ['结项考核', 2]] %> + <% status_options = [['全部',''],['中期考核',1], ['结项考核', 2]] %> <%= select_tag(:term, options_for_select(status_options), class: 'form-control') %>
diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index c3e515fd2..db39d1dff 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -31,7 +31,7 @@ json.setting do json.name default_setting.name json.nav_logo_url default_setting.nav_logo_url&.[](1..-1) json.login_logo_url default_setting.login_logo_url&.[](1..-1) - json.tab_logo_url default_setting.tab_logo_url&.[](1..-1) + json.tab_logo_url default_setting.tab_logo_url.present? ? default_setting.tab_logo_url&.[](1..-1) : "favicon.ico" json.site_page_deploy_domain @deploy_domain json.subject_banner_url default_setting.subject_banner_url&.[](1..-1) diff --git a/config/routes.rb b/config/routes.rb index a25447641..75caa100d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -288,6 +288,7 @@ Rails.application.routes.draw do post :following post :unfollow get :get_user_info + get :get_user_info_by_login get :attachment_show get :html_show get :get_navigation_info