Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/models/course_message.rb

@@ -28,7 +28,7 @@ class CourseMessage < ApplicationRecord
   def send_deal_tiding
     # 发送申请处理结果消息
     Tiding.create!(
-      user_id: user_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse',
+      user_id: course_message_id, trigger_user: User.current, container_id: course_id, container_type: 'DealCourse',
       belong_container: course, extra: content.to_i == 2 ? '7' : '9', tiding_type: 'System', status: status == :PASSED ? 1 : 2
     )
     # 将申请消息置为已处理

config/locales/tidings/zh-CN.yml

@@ -21,6 +21,9 @@
       "7_2_end": "你提交的加入课堂申请：%s（助教）, 审核未通过"
     StudentJoinCourse_end: "加入了课堂：%s（学生）"
     TeacherJoinCourse:
+      "2_end": "%s将你加入课堂：%s（教师）"
+      "3_end": "%s将你加入课堂：%s（助教）"
+      "4_end": "%s将你加入课堂：%s（学生）"
       "9_end": "%s将你加入课堂：%s（教师）"
       "7_end": "%s将你加入课堂：%s（助教）"
       "10_end": "%s将你加入课堂：%s（学生）"

public/react/src/modules/user/account/AccountCertification.js

@@ -83,7 +83,7 @@ class AccountCertification extends Component {
             <div className="flexTable">
               <div className="flexRow lineh-20 mb20">
                 <div className="name">实名认证</div>
-                <div className="description">有些课程需要实名认证才能加入哟，还能获得500金币的奖励~ </div>
+                <div className="description">实名认证可以增强你在平台的江湖地位，还可以获得500金币的奖励~ </div>
                 <div className="status">
                   {
                     basicInfo && basicInfo.authentication =="uncertified" ?
@@ -96,7 +96,10 @@ class AccountCertification extends Component {
 
               <div className="flexRow lineh-20">
                 <div className="name">职业认证</div>
-                <div className="description">教师认证完毕之后，可创建课堂、发布实训、免金币查看所有实训答案..  </div>
+                
+                {basicInfo && (basicInfo.identity == "teacher" 
+                  ? <div className="description">教师通过认证，可以克隆实训、免金币查看实训答案和隐藏测试集...  </div>
+                  : <div className="description">通过认证，可以获得500金币的奖励~  </div>)}
                 <div className="status">
                   {
                     basicInfo && basicInfo.professional_certification =="uncertified" ?