diff --git a/.gitignore b/.gitignore index cb2789f9b..acaef9bd0 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ /public/react/node_modules/ /public/react/config/stats.json /public/react/stats.json +/public/react/.idea/* /public/npm-debug.log diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 10d733a94..2039dbc6f 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -303,7 +303,7 @@ class CoursesController < ApplicationController def destroy if @course.is_delete == 0 @course.delete! - Tiding.create!(user_id: @course.tea_id, trigger_user_id: 1, container_id: @course.id, + Tiding.create!(user_id: @course.tea_id, trigger_user_id: 0, container_id: @course.id, container_type: 'Course', tiding_type: 'Delete', extra: @course.name) normal_status(0, "成功") else diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb index b62840200..c0da42aa8 100644 --- a/app/controllers/homework_commons_controller.rb +++ b/app/controllers/homework_commons_controller.rb @@ -82,7 +82,9 @@ class HomeworkCommonsController < ApplicationController end @task_count = @homework_commons.size - @homework_commons = @homework_commons.order("position DESC").page(page).per(15) + order_str = @homework_type == 4 ? "position DESC" : "IF(ISNULL(homework_commons.publish_time),0,1), homework_commons.publish_time DESC, + homework_commons.created_at DESC" + @homework_commons = @homework_commons.order(order_str).page(page).per(15) if @homework_type == 4 @homework_commons = @homework_commons.includes(:homework_detail_manual, :published_settings, :shixuns) diff --git a/app/controllers/project_packages_controller.rb b/app/controllers/project_packages_controller.rb index 3cc7e79cb..c8b010b32 100644 --- a/app/controllers/project_packages_controller.rb +++ b/app/controllers/project_packages_controller.rb @@ -55,7 +55,7 @@ class ProjectPackagesController < ApplicationController package.destroy! - Tiding.create!(user_id: package.creator_id, trigger_user_id: 1, container_id: package.id, + Tiding.create!(user_id: package.creator_id, trigger_user_id: 0, container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'Destroyed', extra: package.title) render_ok diff --git a/app/controllers/wechats/js_sdk_signatures_controller.rb b/app/controllers/wechats/js_sdk_signatures_controller.rb index 6d7b3d87d..0b66cc263 100644 --- a/app/controllers/wechats/js_sdk_signatures_controller.rb +++ b/app/controllers/wechats/js_sdk_signatures_controller.rb @@ -1,6 +1,6 @@ class Wechats::JsSdkSignaturesController < ApplicationController def create - timestamp = (Time.now.to_f * 1000).to_i + timestamp = Time.now.to_i noncestr = ('A'..'z').to_a.sample(8).join signature = Util::Wechat.js_sdk_signature(params[:url], noncestr, timestamp) diff --git a/app/libs/util/wechat.rb b/app/libs/util/wechat.rb index 069322f18..1b064ba94 100644 --- a/app/libs/util/wechat.rb +++ b/app/libs/util/wechat.rb @@ -7,7 +7,8 @@ module Util::Wechat attr_accessor :appid, :secret def js_sdk_signature(url, noncestr, timestamp) - str = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url }.to_query + data = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url } + str = data.map { |k, v| "#{k}=#{v}" }.join('&') Digest::SHA1.hexdigest(str) end diff --git a/app/models/course.rb b/app/models/course.rb index 5a2a065ba..54d897b07 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -337,7 +337,7 @@ class Course < ApplicationRecord #创建课程后，给该用户发送消息 def send_tiding - self.tidings << Tiding.new(user_id: tea_id, trigger_user_id: 1, belong_container_id: id, + self.tidings << Tiding.new(user_id: tea_id, trigger_user_id: 0, belong_container_id: id, belong_container_type: 'Course', tiding_type: 'System') end diff --git a/app/models/course_message.rb b/app/models/course_message.rb index 674e92169..7774dbf0c 100644 --- a/app/models/course_message.rb +++ b/app/models/course_message.rb @@ -28,7 +28,7 @@ class CourseMessage < ApplicationRecord def send_deal_tiding deal_status # 发送申请处理结果消息 Tiding.create!( - user_id: course_message_id, trigger_user_id: 1, container_id: course_id, container_type: 'DealCourse', + user_id: course_message_id, trigger_user_id: 0, container_id: course_id, container_type: 'DealCourse', belong_container: course, extra: content.to_i == 2 ? '9' : '7', tiding_type: 'System', status: deal_status ) # 将申请消息置为已处理 diff --git a/app/services/libraries/agree_apply_service.rb b/app/services/libraries/agree_apply_service.rb index d452083b3..3367e4585 100644 --- a/app/services/libraries/agree_apply_service.rb +++ b/app/services/libraries/agree_apply_service.rb @@ -25,7 +25,7 @@ class Libraries::AgreeApplyService < ApplicationService private def notify_library_author! - Tiding.create!(user_id: library.user_id, trigger_user_id: 1, + Tiding.create!(user_id: library.user_id, trigger_user_id: 0, container_id: library.id, container_type: 'Library', tiding_type: 'System', status: 1) end diff --git a/app/services/libraries/refuse_apply_service.rb b/app/services/libraries/refuse_apply_service.rb index 9b249b6fa..9868c5989 100644 --- a/app/services/libraries/refuse_apply_service.rb +++ b/app/services/libraries/refuse_apply_service.rb @@ -32,7 +32,7 @@ class Libraries::RefuseApplyService < ApplicationService private def notify_library_author! - Tiding.create!(user_id: library.user_id, trigger_user_id: 1, + Tiding.create!(user_id: library.user_id, trigger_user_id: 0, container_id: library.id, container_type: 'Library', tiding_type: 'System', status: 2, extra: library_apply.reason) end diff --git a/app/services/project_packages/agree_apply_service.rb b/app/services/project_packages/agree_apply_service.rb index 7cef7f70c..3361babad 100644 --- a/app/services/project_packages/agree_apply_service.rb +++ b/app/services/project_packages/agree_apply_service.rb @@ -29,7 +29,7 @@ class ProjectPackages::AgreeApplyService < ApplicationService Tiding.where(container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'Apply', status: 0).update_all(status: 1) - Tiding.create!(user_id: package.creator_id, trigger_user_id: 1, + Tiding.create!(user_id: package.creator_id, trigger_user_id: 0, container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'System', status: 1) end diff --git a/app/services/project_packages/end_bidding_service.rb b/app/services/project_packages/end_bidding_service.rb index 6d43db949..c0d5b76da 100644 --- a/app/services/project_packages/end_bidding_service.rb +++ b/app/services/project_packages/end_bidding_service.rb @@ -16,7 +16,7 @@ class ProjectPackages::EndBiddingService < ApplicationService private def send_bidding_end_notify! - Tiding.create!(user_id: package.creator_id, trigger_user_id: 1, + Tiding.create!(user_id: package.creator_id, trigger_user_id: 0, container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'BiddingEnd') end diff --git a/app/services/project_packages/refuse_apply_service.rb b/app/services/project_packages/refuse_apply_service.rb index 142efe1e0..972a7004f 100644 --- a/app/services/project_packages/refuse_apply_service.rb +++ b/app/services/project_packages/refuse_apply_service.rb @@ -31,7 +31,7 @@ class ProjectPackages::RefuseApplyService < ApplicationService Tiding.where(container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'Apply', status: 0).update_all(status: 1) - Tiding.create!(user_id: package.creator_id, trigger_user_id: 1, + Tiding.create!(user_id: package.creator_id, trigger_user_id: 0, container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'System', status: 2, extra: apply.reason) end diff --git a/app/services/project_packages/save_service.rb b/app/services/project_packages/save_service.rb index 8385ac5dd..40d33c453 100644 --- a/app/services/project_packages/save_service.rb +++ b/app/services/project_packages/save_service.rb @@ -71,7 +71,7 @@ class ProjectPackages::SaveService < ApplicationService end def send_create_notify! - Tiding.create!(user_id: package.creator_id, trigger_user_id: 1, + Tiding.create!(user_id: package.creator_id, trigger_user_id: 0, container_id: package.id, container_type: 'ProjectPackage', tiding_type: 'Created') end diff --git a/app/services/videos/agree_apply_service.rb b/app/services/videos/agree_apply_service.rb index 50791935a..0a95961ab 100644 --- a/app/services/videos/agree_apply_service.rb +++ b/app/services/videos/agree_apply_service.rb @@ -28,7 +28,7 @@ class Videos::AgreeApplyService < ApplicationService private def notify_video_author! - Tiding.create!(user_id: video.user_id, trigger_user_id: 1, + Tiding.create!(user_id: video.user_id, trigger_user_id: 0, container_id: video.id, container_type: 'Video', tiding_type: 'System', status: 1) end diff --git a/app/services/videos/refuse_apply_service.rb b/app/services/videos/refuse_apply_service.rb index 5d796db79..5a2cc4ef9 100644 --- a/app/services/videos/refuse_apply_service.rb +++ b/app/services/videos/refuse_apply_service.rb @@ -31,7 +31,7 @@ class Videos::RefuseApplyService < ApplicationService private def notify_video_author! - Tiding.create!(user_id: video.user_id, trigger_user_id: 1, + Tiding.create!(user_id: video.user_id, trigger_user_id: 0, container_id: video.id, container_type: 'Video', tiding_type: 'System', status: 2, extra: video_apply.reason) end diff --git a/app/views/tidings/_tiding.json.jbuilder b/app/views/tidings/_tiding.json.jbuilder index 3b70f66f1..959a96ebd 100644 --- a/app/views/tidings/_tiding.json.jbuilder +++ b/app/views/tidings/_tiding.json.jbuilder @@ -18,7 +18,7 @@ json.time tiding.how_long_time json.new_tiding tiding.unread?(@onclick_time) json.trigger_user do - if tiding.trigger_user_id.zero? + if tiding.trigger_user_id.zero? || (tiding.trigger_user_id == 1 && tiding.tiding_type == 'System') json.id 0 json.name "系统" json.login "" diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index dd1bf0378..382abdd47 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -73,11 +73,21 @@ class InfosTopics extends Component{ this.setState({ isSpin:true }) - let user_id=this.props.match.params&&this.props.match.params.username; + let types=this.props.match.params.topicstype; + let user_id=""; + + if(types==="publicly"){ + user_id=this.props.current_user&&this.props.current_user.login; + }else{ + user_id=this.props.match.params&&this.props.match.params.username; + } + if(user_id!=undefined){ + console.log(user_id) let {per_page}=this.state; let url=`/users/${user_id}/question_banks.json`; - axios.get(url,{params:{ + + axios.get(encodeURI(url),{params:{ type, object_type:category, course_list_id, @@ -396,6 +406,13 @@ class InfosTopics extends Component{ .marright0{ margin-right: 0px !important; } + + .gongkais{ + min-width: 50px; + height: 22px !important; + line-height: 22px !important; + color: #fff !important; + } ` } @@ -404,7 +421,7 @@ class InfosTopics extends Component{
{types==="publicly"?
我的题库 + href={`/users/${this.props.current_user&&this.props.current_user.login}/topics/personal`}>我的题库
公共题库
:
@@ -455,7 +472,7 @@ class InfosTopics extends Component{
- {isshowprofes===false?
+ {isshowprofes===false?data&&data.count===undefined?"":data&&data.count===0?"":

共 {data&&data.count===undefined?0:data&&data.count} 个 已选择 {checkBoxValues.length} 个 (不支持跨页勾选) @@ -513,7 +530,7 @@ class InfosTopics extends Component{ {item.name} - {item.is_public===true?types==="publicly"?"":公开:""} + {item.is_public===true?types==="publicly"?"":公开:""}