From 1744ab6cb4a5b709a689c0a56ccba716ada1f66a Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 6 Sep 2019 15:58:02 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=88=86=E7=BB=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=92=8C=E6=99=AE=E9=80=9A=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_commons_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) From 54c70fb03c59c0bae26d071ed77b0df7b0fc7beb Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 6 Sep 2019 16:12:55 +0800 Subject: [PATCH 02/10] fix tiding system user --- .gitignore | 1 + app/controllers/courses_controller.rb | 2 +- app/controllers/project_packages_controller.rb | 2 +- app/models/course.rb | 2 +- app/models/course_message.rb | 2 +- app/services/libraries/agree_apply_service.rb | 2 +- app/services/libraries/refuse_apply_service.rb | 2 +- app/services/project_packages/agree_apply_service.rb | 2 +- app/services/project_packages/end_bidding_service.rb | 2 +- app/services/project_packages/refuse_apply_service.rb | 2 +- app/services/project_packages/save_service.rb | 2 +- app/services/videos/agree_apply_service.rb | 2 +- app/services/videos/refuse_apply_service.rb | 2 +- app/views/tidings/_tiding.json.jbuilder | 2 +- 14 files changed, 14 insertions(+), 13 deletions(-) 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/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/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 "" From c053cefe77797f5154b6db70f98e679f2ba13a38 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 6 Sep 2019 16:54:26 +0800 Subject: [PATCH 03/10] fix js sdk signature api --- app/controllers/wechats/js_sdk_signatures_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 968f19e24cedcc4cbefa0d456e267feb4e143c7f Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 6 Sep 2019 17:02:18 +0800 Subject: [PATCH 04/10] fix js sdk signature api --- app/libs/util/wechat.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 From 049afe1139b9a054aa8fcb53fc582772d84b5adf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 17:08:10 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/groupjobbank/Groupjobbandetails.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js index 418d0ded6..5539b7fa2 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js @@ -67,7 +67,7 @@ class Groupjobbandetails extends Component {
{ - ddatas.description===null? + datas.description===null? :datas.description==="null"? From 0bb9e39e94f5a06b125645b41d31664dcc12a3f5 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 6 Sep 2019 17:08:37 +0800 Subject: [PATCH 06/10] window.encodeURIComponent --- public/react/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 3013eca7b..193b53e03 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -287,7 +287,7 @@ class App extends Component { const url = '/wechats/js_sdk_signature.json' const currentUrl = window.location.href.split('#')[0] axios.post(url, { - url: currentUrl, + url: window.encodeURIComponent(currentUrl), }).then((response) => { console.log('got res') const data = response.data; From 9c98f7f74bf0fcd5b875d56993e3e3744c439533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 6 Sep 2019 17:11:00 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Completetaskdetails.js | 3 +- .../comtopicdetails/Completetopicdetails.js | 9 ++-- .../groupjobbank/Groupjobbandetails.js | 43 ++++++++++++++---- .../courses/questionbank/Generaljobdetails.js | 45 +++++++++++++++---- 4 files changed, 76 insertions(+), 24 deletions(-) diff --git a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js index 873212569..8c365022e 100644 --- a/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js +++ b/public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js @@ -67,11 +67,10 @@ class Groupjobbandetails extends Component {
{ - datas&&(datas.description===null||datas.description==="null"||datas.description===""? + datas.description===null||datas.description==="null"||datas.description===""? "" : - ) }
{datas.attachments === undefined || datas.attachments === null || datas.attachments === ""? "" : diff --git a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js index f9345a4ac..856c0d630 100644 --- a/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js +++ b/public/react/src/modules/courses/comtopicdetails/Completetopicdetails.js @@ -64,7 +64,7 @@ class Completetopicdetails extends Component {
{ - datas&&(datas.description===null? + datas.description===null? "" :datas.description==="null"? "" @@ -73,25 +73,24 @@ class Completetopicdetails extends Component { "" : - ) } {datas.attachment_list === undefined ? - (datas.description===undefined || datas.description===null? + (datas.description===undefined || datas.description===null||datas.description===""? : "" ) : datas.attachment_list === null ? - (datas.description===undefined || datas.description===null? + (datas.description===undefined || datas.description===null||datas.description===""? : "" ) : datas.attachment_list.length === 0 ? - (datas.description===undefined || datas.description===null? + (datas.description===undefined || datas.description===null||datas.description===""? : "" diff --git a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js index 418d0ded6..3e4edadfa 100644 --- a/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js +++ b/public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js @@ -68,12 +68,12 @@ class Groupjobbandetails extends Component {
{ ddatas.description===null? - - :datas.description==="null"? - + "" + :datas.description==="null"? + "" : datas.description===""? - + "" : //
@@ -84,13 +84,38 @@ class Groupjobbandetails extends Component { {/* */} {/* )*/} {/*})}*/} + {datas.attachments === undefined ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + : + datas.attachments=== "" ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + : + datas.attachments=== null ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + : + datas.attachments.length === 0 ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + :
- {datas.attachments === undefined ? "" : - } - +
- - + }
diff --git a/public/react/src/modules/courses/questionbank/Generaljobdetails.js b/public/react/src/modules/courses/questionbank/Generaljobdetails.js index 152eebf15..4b916c446 100644 --- a/public/react/src/modules/courses/questionbank/Generaljobdetails.js +++ b/public/react/src/modules/courses/questionbank/Generaljobdetails.js @@ -62,20 +62,49 @@ class Generaljobdetails extends Component {
{ - datas&&(datas.description===null? - + datas.description===null? + "" :datas.description==="null"? - + "" :datas&&datas.description===""? - : + "" + : //
+ } + {datas.attachments === undefined ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + : + datas.attachments=== "" ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" ) + : + datas.attachments=== null ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + : + datas.attachments.length === 0 ? + (datas.description === undefined || datas.description === undefined || datas.description === "" ? + + : + "" + ) + : +
+ +
} -
- {datas.attachments === undefined ? "" : - } -
From 80a21594009c116b34f7721784cecb2182c9fd8d Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 6 Sep 2019 17:11:15 +0800 Subject: [PATCH 08/10] window.__testUrl --- public/react/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index 193b53e03..e8184b7f2 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -287,7 +287,7 @@ class App extends Component { const url = '/wechats/js_sdk_signature.json' const currentUrl = window.location.href.split('#')[0] axios.post(url, { - url: window.encodeURIComponent(currentUrl), + url: window.__testUrl || window.encodeURIComponent(currentUrl), }).then((response) => { console.log('got res') const data = response.data; From 5cc91d8a690051387ff0cac6ac0fbf834bc8e432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 17:18:27 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/usersInfo/InfosTopics.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index 382abdd47..e3e739c3f 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -428,7 +428,7 @@ class InfosTopics extends Component{
我的题库
公共题库
} From dd80d2ae4f35a009c110057d73b0c4ad12428bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 6 Sep 2019 17:21:24 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=A2=98=E5=BA=93=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/user/usersInfo/InfosTopics.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/user/usersInfo/InfosTopics.js b/public/react/src/modules/user/usersInfo/InfosTopics.js index e3e739c3f..c27fb27e8 100644 --- a/public/react/src/modules/user/usersInfo/InfosTopics.js +++ b/public/react/src/modules/user/usersInfo/InfosTopics.js @@ -408,10 +408,11 @@ class InfosTopics extends Component{ } .gongkais{ - min-width: 50px; + min-width: 50px; height: 22px !important; line-height: 22px !important; color: #fff !important; + margin-top: 4px; } ` } @@ -530,7 +531,7 @@ class InfosTopics extends Component{ {item.name} - {item.is_public===true?types==="publicly"?"":公开:""} + {item.is_public===true?types==="publicly"?"":公开:""}