From f38e01edaf1760727b6fb1c8def68e7cf8896c3f Mon Sep 17 00:00:00 2001 From: jasder Date: Tue, 11 May 2021 18:17:17 +0800 Subject: [PATCH 01/12] =?UTF-8?q?FIX=20*=E4=B8=80=E7=BA=A7=E6=9D=BF?= =?UTF-8?q?=E5=9D=97=E5=8F=AF=E4=BB=A5=E6=9F=A5=E7=9C=8B=E5=B8=96=E5=AD=90?= =?UTF-8?q?=20*=20=E6=9D=BF=E5=9D=97=E7=AE=A1=E7=90=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=B8=96=E5=AD=90=E6=B7=BB=E5=8A=A0=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/forum_sections_service.rb | 12 ++++++------ app/services/memos_service.rb | 10 +++++++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/services/forum_sections_service.rb b/app/services/forum_sections_service.rb index fdfb14ac..3317a37b 100644 --- a/app/services/forum_sections_service.rb +++ b/app/services/forum_sections_service.rb @@ -364,7 +364,7 @@ class ForumSectionsService return {status: -1, message: "请登录"} unless check_user_permission(current_user, params[:id]) select_section_ids = [params[:id]] unless @forum_section.parent_id.present? - children_forums = @forum_section.children_forum.pluck(:id) + children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums end select_section_ids.uniq @@ -389,7 +389,7 @@ class ForumSectionsService else memo_min_sections = memo.memo_forums.first end - memo_last_section = memo_min_sections.forum_section + memo_last_section = memo_min_sections&.forum_section memo_list = { memo_id: memo.id, @@ -416,7 +416,7 @@ class ForumSectionsService select_section_ids = [params[:id]] unless @forum_section.parent_id.present? - children_forums = @forum_section.children_forum.pluck(:id) + children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums end select_section_ids.uniq @@ -462,7 +462,7 @@ class ForumSectionsService select_section_ids = [params[:id]] unless @forum_section.parent_id.present? - children_forums = @forum_section.children_forum.pluck(:id) + children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums end select_section_ids.uniq @@ -473,7 +473,7 @@ class ForumSectionsService offset = page * LIMIT #全部的父帖子 memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq - memos_all = Memo.where(hidden: false,parent_id: nil, id: memo_forum_section_ids).order("created_at desc") + memos_all = Memo.where(hidden: false,parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") # memos_all = Memo.where(hidden: false, parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})") if params[:type].present? if params[:type] == "sticky" @@ -499,7 +499,7 @@ class ForumSectionsService else memo_min_sections = memo.memo_forums.first end - memo_last_section = memo_min_sections.forum_section + memo_last_section = memo_min_sections&.forum_section memo_list = { memo_id: memo.id, diff --git a/app/services/memos_service.rb b/app/services/memos_service.rb index 28e2b236..11742cdf 100644 --- a/app/services/memos_service.rb +++ b/app/services/memos_service.rb @@ -596,7 +596,14 @@ class MemosService page = params[:page].to_i > 0 ? (params[:page].to_i - 1) : 0 offset = page * LIMIT - all_memos = forum_section.memos.posts + all_memos = + if forum_section.is_root? + forum_section_ids = forum_section.child_ids << forum_section.id + Rails.logger.info "######### forum_section_ids: #{forum_section_ids}" + Memo.where(forum_section_id: forum_section_ids) + else + forum_section.memos.posts + end select_type = params[:select_type] case select_type.to_s when "is_fine" @@ -729,6 +736,7 @@ class MemosService def check_banned_permission current_user, memo_id + return true if current_user&.admin? forum_id = MemoForum&.where(is_children: false, memo_id: memo_id)&.first.try(:forum_id).to_s user_banned_permission current_user, forum_id end From 529e8e5fe6f1a00d3c5b9c3c744c222c31093d0b Mon Sep 17 00:00:00 2001 From: jasder Date: Tue, 11 May 2021 18:20:59 +0800 Subject: [PATCH 02/12] =?UTF-8?q?FIX=20=E4=B8=80=E7=BA=A7=E6=9D=BF?= =?UTF-8?q?=E5=9D=97=E5=8A=A0=E8=BD=BD=E5=B8=96=E5=AD=90=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/forum_sections_service.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/services/forum_sections_service.rb b/app/services/forum_sections_service.rb index 3317a37b..951e181d 100644 --- a/app/services/forum_sections_service.rb +++ b/app/services/forum_sections_service.rb @@ -366,7 +366,7 @@ class ForumSectionsService unless @forum_section.parent_id.present? children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums - end + #end select_section_ids.uniq # page = params[:page].to_i @@ -418,7 +418,7 @@ class ForumSectionsService unless @forum_section.parent_id.present? children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums - end + # end select_section_ids.uniq # page = params[:page].to_i @@ -461,10 +461,10 @@ class ForumSectionsService return {status: -1, message: "请登录"} unless check_user_permission(current_user, params[:id]) select_section_ids = [params[:id]] - unless @forum_section.parent_id.present? + # unless @forum_section.parent_id.present? children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums - end + # end select_section_ids.uniq # page = params[:page].to_i From 9f8a55fe1250d2a6c1af346c46e8d41bc9ca4300 Mon Sep 17 00:00:00 2001 From: jasder Date: Tue, 11 May 2021 18:23:20 +0800 Subject: [PATCH 03/12] FIX code bug --- app/services/forum_sections_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/forum_sections_service.rb b/app/services/forum_sections_service.rb index 951e181d..ffc548cd 100644 --- a/app/services/forum_sections_service.rb +++ b/app/services/forum_sections_service.rb @@ -363,7 +363,7 @@ class ForumSectionsService set_forum_section(params[:id]) return {status: -1, message: "请登录"} unless check_user_permission(current_user, params[:id]) select_section_ids = [params[:id]] - unless @forum_section.parent_id.present? + # unless @forum_section.parent_id.present? children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums #end @@ -374,7 +374,7 @@ class ForumSectionsService offset = page * LIMIT memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq - memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, id: memo_forum_section_ids).order("created_at desc") + memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") # memos_all = Memo.where(hidden: true, parent_id: nil, id: memo_forum_section_ids).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").order("created_at desc") memos_count = memos_all.size From 273a17861b476d095cb1509a3c5bd550fede1c2b Mon Sep 17 00:00:00 2001 From: jasder Date: Tue, 11 May 2021 18:29:09 +0800 Subject: [PATCH 04/12] FIX bug --- app/services/forum_sections_service.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/services/forum_sections_service.rb b/app/services/forum_sections_service.rb index ffc548cd..d8534012 100644 --- a/app/services/forum_sections_service.rb +++ b/app/services/forum_sections_service.rb @@ -373,7 +373,7 @@ class ForumSectionsService page = params[:page].to_i > 0 ? (params[:page].to_i - 1) : 0 offset = page * LIMIT - memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq + # memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") # memos_all = Memo.where(hidden: true, parent_id: nil, id: memo_forum_section_ids).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").order("created_at desc") @@ -415,7 +415,7 @@ class ForumSectionsService return {status: -1, message: "请登录"} unless check_user_permission(current_user, params[:id]) select_section_ids = [params[:id]] - unless @forum_section.parent_id.present? + # unless @forum_section.parent_id.present? children_forums = @forum_section.child_ids select_section_ids = select_section_ids + children_forums # end @@ -427,7 +427,8 @@ class ForumSectionsService offset = page * LIMIT #全部的父帖子 parent_memos_ids = Memo.where(parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})").pluck(:id).uniq - memos_all = Memo.where(hidden:true,published_at: nil, parent_id: parent_memos_ids).order("created_at ASC") + # memos_all = Memo.where(hidden:true,published_at: nil, parent_id: parent_memos_ids).order("created_at ASC") + memos_all = Memo.where(hidden:true, published_at: nil, parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") memos_count = memos_all.size memos = memos_all.limit(LIMIT).offset(offset) @@ -472,7 +473,7 @@ class ForumSectionsService offset = page * LIMIT #全部的父帖子 - memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq + # memo_forum_section_ids = MemoForum.where(forum_id: select_section_ids).pluck(:memo_id).uniq memos_all = Memo.where(hidden: false,parent_id: nil, forum_section_id: select_section_ids).order("created_at desc") # memos_all = Memo.where(hidden: false, parent_id: nil).joins(:memo_forums).where("memo_forums.forum_id in (#{select_section_ids.join(",")})") if params[:type].present? From 21b55eba83b3f07784790e8b02f0bc126ebcfa1d Mon Sep 17 00:00:00 2001 From: jasder Date: Wed, 12 May 2021 14:25:46 +0800 Subject: [PATCH 05/12] =?UTF-8?q?ADD=20=E7=89=88=E5=9D=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=88=E4=BA=88=E5=B9=B3=E5=8F=B0=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E8=BA=AB=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/api_index_helper.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/helpers/api_index_helper.rb b/app/helpers/api_index_helper.rb index 5138b303..f368f155 100644 --- a/app/helpers/api_index_helper.rb +++ b/app/helpers/api_index_helper.rb @@ -186,6 +186,7 @@ module ApiIndexHelper end def user_banned_permission current_user, forum_id + return true if current_user&.admin? if current_user.present? if forum_id.present? user_forum_moder = ForumModerator.where(forum_section_id: forum_id,user_id: current_user.id).exists? From f941976a78e07cd01dfb65ed6cb07eab8cec24b0 Mon Sep 17 00:00:00 2001 From: yystopf Date: Thu, 11 Nov 2021 17:44:02 +0800 Subject: [PATCH 06/12] fix: add memos read data not increment view count --- app/services/memos_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/memos_service.rb b/app/services/memos_service.rb index 11742cdf..1d9ac5f7 100644 --- a/app/services/memos_service.rb +++ b/app/services/memos_service.rb @@ -130,7 +130,7 @@ class MemosService :filesize => memo_image.filesize} if memo_image user_praise = PraiseTread.is_user_praise(memo.id, "Memo", current_user.try(:id)).exists? - memo.update_column(:viewed_count, memo.viewed_count + 1) + memo.update_column(:viewed_count, memo.viewed_count + 1) if params[:only_data].blank? # 帖子的回复 memos = memo.reply_for_memo unless current_user.try(:admin?) # 只有管理员和发布人能看到隐藏的回复 From b5f161f5535ab8524fbe4c2fd49547ef2e9e8c5e Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Wed, 24 Nov 2021 10:39:18 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fix=20=E9=A6=96=E9=A1=B5=E5=9F=9F?= =?UTF-8?q?=E5=90=8D=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/laboratory_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb index 426d1a33..3f7bdf07 100644 --- a/app/controllers/concerns/laboratory_helper.rb +++ b/app/controllers/concerns/laboratory_helper.rb @@ -41,7 +41,7 @@ module LaboratoryHelper my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist", my_projects: "https://forgeplus.trustie.net/users/#{current_user.try(:login)}/projects", my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations", - default_url: "https://www.trustie.net/", + default_url: Rails.application.config_for(:configuration)['platform_url'], tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages", register_url: "https://www.trustie.net/login?login=false" } From 53c65e9ee959521dcf4c43af3cc1a9bce02307e4 Mon Sep 17 00:00:00 2001 From: xiaoxiaoqiong Date: Wed, 24 Nov 2021 11:38:52 +0800 Subject: [PATCH 08/12] =?UTF-8?q?fix=20=E5=9F=9F=E5=90=8D=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/laboratory_helper.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb index 3f7bdf07..0c0c79fa 100644 --- a/app/controllers/concerns/laboratory_helper.rb +++ b/app/controllers/concerns/laboratory_helper.rb @@ -35,15 +35,15 @@ module LaboratoryHelper # my_projects: "/users/#{current_user.try(:login)}/projects", # my_projects: "https://www.trustie.net/users/#{current_user.try(:login)}/user_projectlist", { - new_syllabuses: "https://www.trustie.net/syllabuses/new", - new_course: "https://www.trustie.net/courses/new", - edit_account: "https://www.trustie.net/my/account", - my_courses: "https://www.trustie.net/users/#{current_user.try(:login)}/user_courselist", - my_projects: "https://forgeplus.trustie.net/users/#{current_user.try(:login)}/projects", - my_organ: "https://www.trustie.net/users/#{current_user.try(:login)}/user_organizations", + new_syllabuses: "#{Rails.application.config_for(:configuration)['platform_url']}/syllabuses/new", + new_course: "#{Rails.application.config_for(:configuration)['platform_url']}/courses/new", + edit_account: "#{Rails.application.config_for(:configuration)['platform_url']}/my/account", + my_courses: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/user_courselist", + my_projects: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/projects", + my_organ: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/user_organizations", default_url: Rails.application.config_for(:configuration)['platform_url'], - tiding_url: "https://www.trustie.net/users/#{current_user.try(:login)}/user_messages", - register_url: "https://www.trustie.net/login?login=false" + tiding_url: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/user_messages", + register_url: "#{Rails.application.config_for(:configuration)['platform_url']}/login?login=false" } end end From e28ac9c319e76615e53bdb129d0293ff6b7f822a Mon Sep 17 00:00:00 2001 From: viletyy Date: Wed, 24 Nov 2021 14:43:25 +0800 Subject: [PATCH 09/12] add: settings personal add common --- app/controllers/settings_controller.rb | 51 +++++++++++++++++ app/models/site.rb | 79 ++++++++++++++++++++++++++ app/views/settings/show.json.jbuilder | 9 +++ 3 files changed, 139 insertions(+) create mode 100644 app/models/site.rb diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index bb031c7b..37fc47a6 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -2,5 +2,56 @@ class SettingsController < ApplicationController def show @old_projects_url = nil @old_projects_url = "https://www.trustie.net/users/#{current_user.try(:login)}/projects" if User.current.logged? + get_add_menu + get_common_menu + get_personal_menu + end + + private + def get_add_menu + @add = [] + Site.add.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site| + hash = {} + site.each {|k, v| + hash.merge!("#{k}": get_site_url(k, v)) + } + @add << hash + end + end + + def get_common_menu + @common = {} + Site.common.select(:url, :key).each do |site| + next if site["url"].to_s.include?("current_user") && !User.current.logged? + @common.merge!("#{site["key"]}": append_http(reset_site_url(site["url"]))) + end + end + + def get_personal_menu + @personal = [] + if User.current.logged? + Site.personal.select(:id, :name, :url, :key).to_a.map(&:serializable_hash).each do |site| + hash = {} + site.each {|k, v| + hash.merge!("#{k}": get_site_url(k, v)) + } + @personal << hash + end + end + end + + def get_site_url(key, value) + key.to_s === "url" ? append_http(reset_site_url(value)) : reset_site_url(value) + end + + def reset_site_url(url) + return url unless url.to_s.include?("current_user") + + split_arr = url.split('current_user') + split_arr.length > 1 ? split_arr.join(current_user&.login) : (split_arr << current_user&.login).join('') + end + + def append_http(url) + url.to_s.start_with?("http") ? url : [request.protocol, request.host_with_port, url].join('') end end diff --git a/app/models/site.rb b/app/models/site.rb new file mode 100644 index 00000000..af5e7816 --- /dev/null +++ b/app/models/site.rb @@ -0,0 +1,79 @@ +# == Schema Information +# +# Table name: sites +# +# id :integer not null, primary key +# name :string(255) +# url :string(255) +# key :string(255) +# site_type :integer +# created_at :datetime not null +# updated_at :datetime not null +# + +class Site < ApplicationRecord + # add: 添加类链接 + # personal: 个人名下类链接, + # common: 普通链接 + enum site_type: { add: 0, personal: 1, common: 2 } + + scope :by_search, -> (keyword){ where("name LIKE :keyword OR url LIKE :keyword", keyword: "%#{strip_param(keyword)}%") unless strip_param(keyword).blank? } + scope :by_site_type, -> (site_type){ where(site_type: strip_param(site_type)) unless strip_param(site_type).blank? } + + def self.set_default_menu + set_add_menu! + set_personal_menu! + set_common_menu! + end + + def self.has_notice_menu? + self.common.where(key: 'notice').present? + end + + private + def self.set_add_menu! + adds= [ + {name: '新建项目', key: 'add_mirror_project', url: '/projects/mirror/new'}, + {name: '导入项目', key: 'add_common', url: '/projects/deposit/new'}, + {name: '新建组织', key: 'add_r', url: '/organize/new'}] + + adds.each { |ele| + Site.find_or_create_by(key: ele[:key]) do |site| + site.name = ele[:name] + site.url = ele[:url] + site.site_type = Site.site_types[:add] + end + } + end + + def self.set_personal_menu! + personals = [ + {name: '个人中心', key: 'my_page', url: '/users/current_user'}, + {name: '我的组织', key: 'my_organizes', url: '/users/current_user/organizes'} + ] + + personals.each { |ele| + Site.find_or_create_by(key: ele[:key]) do |site| + site.name = ele[:name] + site.url = ele[:url] + site.site_type = Site.site_types[:personal] + end + } + end + + def self.set_common_menu! + commons = [ + {name: '通知', key: 'notice', url: '/users/current_user/user_messages'}, + {name: '找回密码', key: 'lost_password', url: '/account/lost_password'}, + {name: '注册', key: 'register', url: '/login?login=false'} + ] + + commons.each { |ele| + Site.find_or_create_by(key: ele[:key]) do |site| + site.name = ele[:name] + site.url = ele[:url] + site.site_type = Site.site_types[:common] + end + } + end +end diff --git a/app/views/settings/show.json.jbuilder b/app/views/settings/show.json.jbuilder index 8f818b47..58af296d 100644 --- a/app/views/settings/show.json.jbuilder +++ b/app/views/settings/show.json.jbuilder @@ -48,4 +48,13 @@ json.setting do json.old_projects_url @old_projects_url + json.add do + json.array! @add + end + + json.personal do + json.array! @personal + end + + json.common @common end \ No newline at end of file From f60ba8ec0765a808527921d91fba515de6534f29 Mon Sep 17 00:00:00 2001 From: viletyy Date: Wed, 24 Nov 2021 15:44:53 +0800 Subject: [PATCH 10/12] fix: change website ico --- public/favicon.ico | Bin 10415 -> 9662 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/favicon.ico b/public/favicon.ico index 75a4c3dfd46656c981907ac9d82ddce23c622d7f..ad428fa2500982875766a813ca09f3a571751a72 100644 GIT binary patch literal 9662 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 QuE#+m4#k~$Lh|i@10BLS{{R30 literal 10415 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 Date: Wed, 24 Nov 2021 18:33:31 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E9=93=83=E9=93=9BURL?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/concerns/laboratory_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb index 0c0c79fa..11659fc3 100644 --- a/app/controllers/concerns/laboratory_helper.rb +++ b/app/controllers/concerns/laboratory_helper.rb @@ -42,7 +42,7 @@ module LaboratoryHelper my_projects: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/projects", my_organ: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/user_organizations", default_url: Rails.application.config_for(:configuration)['platform_url'], - tiding_url: "#{Rails.application.config_for(:configuration)['platform_url']}/users/#{current_user.try(:login)}/user_messages", + tiding_url: "#{Rails.application.config_for(:configuration)['platform_url']}/settings/notice", register_url: "#{Rails.application.config_for(:configuration)['platform_url']}/login?login=false" } end From d4e59e87739c3cd64af4f031a920b850bbbe07c9 Mon Sep 17 00:00:00 2001 From: viletyy Date: Thu, 25 Nov 2021 16:59:17 +0800 Subject: [PATCH 12/12] fix: change attachment code --- app/controllers/attachments_controller.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 3c5c73b8..ecbedc3a 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -97,29 +97,37 @@ class AttachmentsController < ApplicationController upload_file = params["file"] || params["#{params[:file_param_name]}"]# 这里的file_param_name是为了方便其他插件名称 raise "未上传文件" unless upload_file - folder = edu_setting('attachment_folder') + folder = file_storage_directory raise "存储目录未定义" unless folder.present? month_folder = current_month_folder save_path = File.join(folder, month_folder) - ext = SecureRandom.urlsafe_base64 + ext = file_ext(upload_file.original_filename) local_path, digest = file_save_to_local(save_path, upload_file.tempfile, ext) content_type = upload_file.content_type.presence || 'application/octet-stream' + remote_path = nil # TODO 暂时本地上传，待域名配置后方可上传至云端 + + logger.info "local_path: #{local_path}" + logger.info "remote_path: #{remote_path}" disk_filename = local_path[save_path.size + 1, local_path.size] - @attachment = Attachment.where(disk_filename: disk_filename,author_id: current_user.id).first + @attachment = Attachment.where(disk_filename: disk_filename, + author_id: current_user.id, + cloud_url: remote_path).first + if @attachment.blank? @attachment = Attachment.new @attachment.filename = upload_file.original_filename - @attachment.disk_filename = disk_filename + @attachment.disk_filename = local_path[save_path.size + 1, local_path.size] @attachment.filesize = upload_file.tempfile.size @attachment.content_type = content_type @attachment.digest = digest @attachment.author_id = current_user.id @attachment.disk_directory = month_folder + @attachment.cloud_url = remote_path @attachment.save! @status = 1 else