调整

.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
 

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

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)

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

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)
 

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
 

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
 

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
     )
     # 将申请消息置为已处理

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

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

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

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
 

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

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
 

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

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

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 ""

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;
+							}
 						 	`
 					}
 				</style>
@@ -404,7 +421,7 @@ class InfosTopics extends Component{
 					<div className="clearfix topicsbox">
 						{types==="publicly"?<div className={"topcschild"}>
 							<a className={types==="personal"?"topicstopfont fr ":"topicstopfont fr topcsactive"}
-								 href={`/users/${username}/topics/personal`}>我的题库</a>
+								 href={`/users/${this.props.current_user&&this.props.current_user.login}/topics/personal`}>我的题库</a>
 							<div className={types==="publicly"?"topicstopfont fl ":"topicstopfont fl topcsactive"}
 							>公共题库</div>
 						</div>:<div className={"topcschild"}>
@@ -455,7 +472,7 @@ class InfosTopics extends Component{
 
 					</div>
 
-					{isshowprofes===false?<div className="clearfix font-12 mt20">
+					{isshowprofes===false?data&&data.count===undefined?"":data&&data.count===0?"":<div className="clearfix font-12 mt20">
 						<p className="font-12 ml5 fl">
 								<span className="fl color-grey-9 mr20">共   <span className={"color-orange"}>{data&&data.count===undefined?0:data&&data.count}</span>   个</span>
 								<span className="fr color-grey-9">已选择   <span  className={"color-orange"}>{checkBoxValues.length}</span>  个   (不支持跨页勾选)</span>
@@ -513,7 +530,7 @@ class InfosTopics extends Component{
 											{item.name}
 									  </a>
 
-										{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle mt3">公开</span>:""}
+										{item.is_public===true?types==="publicly"?"":<span className="edu-filter-btn edu-filter-btn-4CACFF ml15 fl gongkais mt3">公开</span>:""}