Merge branch 'dev_aliyun' into develop

Gemfile.lock

@@ -378,6 +378,7 @@ DEPENDENCIES
   kaminari (~> 1.1, >= 1.1.1)
   listen (>= 3.0.5, < 3.2)
   mysql2 (>= 0.4.4, < 0.6.0)
+  newrelic_rpm
   oauth2
   pdfkit
   puma (~> 3.11)

app/controllers/application_controller.rb

@@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base
 	#before_action :check_account
 
 	DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
+	OPENKEY = "79e33abd4b6588941ab7622aed1e67e8"
 
 	helper_method :current_user
 
@@ -246,6 +247,16 @@ class ApplicationController < ActionController::Base
 		User.current = find_current_user
 		uid_logger("user_setup: " + (User.current.logged? ? "#{User.current.try(:login)} (id=#{User.current.try(:id)})" : "anonymous"))
 
+		# 开放课程通过链接访问的用户
+		if !User.current.logged? && !params[:chinaoocTimestamp].blank? && !params[:websiteName].blank? && !params[:chinaoocKey].blank?
+			content = "#{OPENKEY}#{params[:websiteName]}#{params[:chinaoocTimestamp]}"
+			if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
+				user = User.open_class_user
+				start_user_session(user) if user
+				User.current = user
+			end
+		end
+
 		if !User.current.logged? && Rails.env.development?
 			User.current = User.find 1
 		end

app/models/user.rb

@@ -610,6 +610,29 @@ class User < ApplicationRecord
     admin? || business?
   end
 
+  # 149课程的评审用户数据创建（包含创建课堂学生）
+  def open_class_user
+    user = User.find_by(login: "OpenClassUser")
+    unless user
+      ActiveRecord::Base.transaction do
+        user_params = {status: 1, login: "OpenClassUser", lastname: "开放课程",
+                       nickname: "开放课程", professional_certification: 1, certification: 1, grade: 0,
+                       password: "12345678", phone: "11122223333", profile_completed: 1}
+        user = User.create!(user_params)
+
+        UserExtension.create!(user_id: user.id, gender: 0, school_id: 117, :identity => 1, :student_id => "openclassuser")
+
+        subject = Subject.find_by(id: 149)
+        if subject
+          subject.courses.each do |course|
+            CourseMember.create!(course_id: course.id, role: 4, user_id: user.id) if !course.course_students.exists?(user_id: user.id)
+          end
+        end
+      end
+    end
+    user
+  end
+
   protected
   def validate_password_length
     # 管理员的初始密码是5位

public/react/src/common/educoder.js

@@ -63,7 +63,7 @@ export { default as Clappr } from './components/media/Clappr'
 export { default as AliyunUploader } from './components/media/AliyunUploader'
 
 
-export { default as ImageLayerHook } from './hooks/ImageLayerHook'
+export { default as ImageLayer2 } from './hooks/ImageLayer2'
 
 // 外部
 export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'

public/react/src/common/hooks/ImageLayer2.js

@@ -2,7 +2,7 @@ import React, { useState, useEffect, memo } from 'react';
 import ImageLayer from '../../modules/page/layers/ImageLayer';
 import { isImageExtension } from 'educoder';
 const $ = window.$;
-function ImageLayerHook(props) {
+function ImageLayer2(props) {
     const [showImage, setShowImage] = useState(false)
     const [imageSrc, setImageSrc] = useState('')
 
@@ -45,4 +45,4 @@ function ImageLayerHook(props) {
     )
 }
 
-export default memo(ImageLayerHook)
+export default memo(ImageLayer2)

public/react/src/common/util/ShareUtil.js

@@ -122,11 +122,11 @@ export function configShareForCourses () {
 export function configShareForCustom (title, desc, imgUrl, path) {
     requestForSignatrue(() => {
         console.log('configShareForCustom', host)
-        const _path = window.location.href.split('#')[0];
+        const _url = window.location.href.split('#')[0];
         var shareData = {
             title: title,
             desc: desc,
-            link: `${host}/${path || _path}`,
+            link: path ? `${host}/${path}` : _url,
             imgUrl: imgUrl || window.__testImageUrl 
                 || host + '/react/build/images/share_logo_icon.jpg'
         };

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, MarkdownToHtml, markdownToHTML } from 'educoder';
+import { WordsBtn, MarkdownToHtml, markdownToHTML, ImageLayer2 } from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import CoursesListType from '../coursesPublic/CoursesListType';
@@ -197,6 +197,7 @@ class CommonWorkAppraise extends Component{
               border-bottom: none !important; 
             }
           `}</style>
+          <ImageLayer2 parentSel=".workAppraise" childSel="a.imageTarget"></ImageLayer2>
           <div className={"workAppraise"}>
           {(description || (attachments && attachments.length != 0)) && <div className={"stud-class-set edu-back-white padding20-30"}>
             <div className={"color-grey-6 mb15 font-16"}>

public/react/src/modules/courses/busyWork/NewWorkForm.js

@@ -73,7 +73,6 @@ class NewWorkForm extends Component{
           setTimeout(() => {
             this.contentMdRef.current.setValue(data.description || '')
             this.answerMdRef.current.setValue(data.reference_answer || '')
-          
           }, 2000)
           
           this.props.form.setFieldsValue({
@@ -86,8 +85,13 @@ class NewWorkForm extends Component{
       } else { // new
 
       }
+    this._scrollToTop()
+  }
+  _scrollToTop = () => {
+    setTimeout(() => {
+      $("html").animate({ scrollTop: 0 })
+    }, 1500)
   }
-  
 
   // 输入title
   changeTitle=(e)=>{
@@ -289,6 +293,7 @@ class NewWorkForm extends Component{
   }
   componentDidMount() {
     window.$('.groupSetting .ant-form-item-label > label').addClass('ant-form-item-required')
+    this._scrollToTop()
   }
   
   render(){

public/react/src/modules/message/js/Leftdialogue.js

@@ -5,7 +5,7 @@ import {
 } from "antd";
 import axios from 'axios';
 import moment from 'moment';
-import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder';
+import {getImageUrl,markdownToHTML,ImageLayer2} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
 //私信页面
@@ -51,8 +51,8 @@ class Leftdialogue extends Component{
 			</a>
 			<div className="fl pr OtherSide-info">
 				<span className="trangle"></span>
-				<ImageLayerHook parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}>
-				</ImageLayerHook>
+				<ImageLayer2 parentSel={`#Leftdialogue${this.props.keys}`} parentSel={`#Leftdialogue${this.props.keys}`}>
+				</ImageLayer2>
 				<div className="sms break_word markdown-body" id={`Leftdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
 				<div className="edu-txt-right mt5">
 					<a  className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)} >删除</a>

public/react/src/modules/message/js/Rightdialogue.js

@@ -5,7 +5,7 @@ import {
 } from "antd";
 import axios from 'axios';
 import moment from 'moment';
-import {getImageUrl,markdownToHTML,ImageLayerHook} from 'educoder';
+import {getImageUrl,markdownToHTML,ImageLayer2} from 'educoder';
 import "../css/messagemy.css"
 import WriteaprivateletterModal from '../messagemodal/WriteaprivateletterModal';
 //私信页面
@@ -51,8 +51,8 @@ class Rightdialogue extends Component{
 			</a>
 			<div className="fr pr ThisSide-info">
 				<span className="trangle"></span>
-				<ImageLayerHook parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}>
-				</ImageLayerHook>
+				<ImageLayer2 parentSel={`#Rightdialogue${this.props.keys}`} parentSel={`#Rightdialogue${this.props.keys}`}>
+				</ImageLayer2>
 				<div className="sms break_word markdown-body" id={`Rightdialogue${this.props.keys}`} dangerouslySetInnerHTML={{__html: markdownToHTML(this.props.objeysl.content).replace(/▁/g, "▁▁▁")}}></div>
 				<div className="edu-txt-left mt5">
 					<a className="color-grey-c" onClick={()=>this.mydelete(this.props.objeysl.sender.id,this.props.objeysl.id)}

public/react/src/modules/paths/PathDetail/PathDetailIndex.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {getImageUrl,markdownToHTML} from 'educoder';
+import {getImageUrl,markdownToHTML, configShareForCustom} from 'educoder';
 import DetailTop from './DetailTop.js';
 import DetailCards from './DetailCards.js'
 import AddCollaborators from "./addCollaborators.js";
@@ -164,6 +164,7 @@ class PathDetailIndex extends Component{
 				// window.location.href = "/403";
 				return;
 			}
+			configShareForCustom(result.data.name, result.data.description)
 
 			if(result.data.allow_visit===true){
 				this.setState({

public/react/src/modules/paths/SchoolStatistics/FirstTab.js

@@ -6,6 +6,11 @@ import axios from 'axios';
 const $ = window.$;
 const echarts = require('echarts');
 function InitChapterUsageSituation(_data){
+	var myChart = echarts.init(document.getElementById('chapterUsageSituation'));
+	myChart.showLoading({
+		text: "数据获取中",
+		effect: 'whirling'
+	})
   var Color = ['#49A9EE', '#FFD86E', '#98D87D', '#8996E6','#F3857B', '#B97BF3','#4DE8B4','#f76d0c','#510cf7','#def70c','#3bf70c','#0cf7e1'];
 
   var option = {
@@ -84,8 +89,12 @@ function InitChapterUsageSituation(_data){
       }]
   };
   
-  var myChart = echarts.init(document.getElementById('chapterUsageSituation'));
+
+
+	setTimeout(() => {
 		myChart.setOption(option);
+		myChart.hideLoading();
+	}, 1000)
 }
 class FirstTab extends Component{
   constructor(props){

public/react/src/modules/paths/SchoolStatistics/SecondTab.js

@@ -166,15 +166,14 @@ class SecondTab extends Component{
   constructor(props){
     super(props);
     this.state = {
-
     }
   }
 
   componentDidMount(){
     var pathId = this.props.match.params.pathId;
 
-    var myChart = echarts.init(document.getElementById('shixunStudyStatistics'));
-    myChart.showLoading({
+		var myCharts = echarts.init(document.getElementById('showloding'));
+		myCharts.showLoading({
 			text: "数据获取中",
 			effect: 'whirling'
 		})
@@ -211,11 +210,20 @@ class SecondTab extends Component{
                 mapByNumber[item.number] = item
             })
         })
-        this.setState({ shixunList }, () => {
-            InitShixunStudyStatistics(yAxisMonth, barData, mapByNumber, myChart);
-            myChart.hideLoading()
-        })
 
+			  this.setState({
+					shixunList
+			  })
+					var myChart = echarts.init(document.getElementById('shixunStudyStatistics'));
+					myChart.showLoading({
+						text: "数据获取中",
+						effect: 'whirling'
+					})
+				setTimeout(() => {
+					InitShixunStudyStatistics(yAxisMonth, barData, mapByNumber, myChart);
+					myCharts.hideLoading();
+					myChart.hideLoading();
+				}, 1000)
         
     })
     .catch(function (error) {
@@ -261,8 +269,10 @@ class SecondTab extends Component{
         </div>
         <div className="with40 fl static_shadow edu-back-white">
           <p className="font-24 padding30-20">实训学习统计</p>
-          <div id="shixunStudyStatistics" 
-            style={{"width":"480px","height": shixunList ? `${shixunList.length * 35 + 100}px` : "440px"}}></div>
+					{shixunList===undefined?<div id="showloding"
+							 style={{"width":"480px","height":"440px"}}></div>:""}
+					{shixunList===undefined?"":<div id="shixunStudyStatistics"
+            style={{"width":"480px","minHeight":`${shixunList&&shixunList.length *50}px`}}></div>}
         </div>
       </div>
     )

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import { message, Icon, Input, Form, Upload} from "antd";
 import axios from 'axios'
 import ModalWrapper from "../../courses/common/ModalWrapper"
-import { City, getUploadActionUrl, getImageUrl, ImageLayerHook, getUploadActionUrlOfAuth } from 'educoder'
+import { City, getUploadActionUrl, getImageUrl, ImageLayer2, getUploadActionUrlOfAuth } from 'educoder'
 import '../account/common.css'
 
 import authImg from '../../../images/account/auth.png'
@@ -308,8 +308,8 @@ class RealNameCertificationModal extends Component{
             <div className="df mt10 color-grey-9" style={{ justifyContent: 'center' }} >
               <span className="fl mr20 edu-txt-center" style={{width:"160px"}}>示例图片</span>
               <span className="fl edu-txt-center mr20" style={{width:"160px"}}>
-                <ImageLayerHook parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'}
-                ></ImageLayerHook>
+                <ImageLayer2 parentSel={'#imageLayerBtn'} parentSel={'#imageLayerBtn'}
+                ></ImageLayer2>
                 <a href="javascript:void(0)" id="imageLayerBtn" src={imageUrl || imageUrl2} className="color-orange" style={{borderBottom:"1px solid #ff6800"}}>查看大图</a>
                 </span>
             </div>

public/react/src/modules/user/usersInfo/InfosTopics.js

@@ -370,17 +370,17 @@ class InfosTopics extends Component{
 
 					{
 						`
-						  ::-webkit-scrollbar-thumb {
-									background-color: #cde5fe;
-
-									box-shadow: 0px 0px black;
-							}
-
-
-							::-webkit-scrollbar-track {
-									-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
-									background-color: #fff;
-							}
+						  // ::-webkit-scrollbar-thumb {
+							// 		background-color: #cde5fe;
+							//
+							// 		box-shadow: 0px 0px black;
+							// }
+							//
+							//
+							// ::-webkit-scrollbar-track {
+							// 		-webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+							// 		background-color: #fff;
+							// }
 
 							.shaiContent li.shaiItem {
 					    padding: 0px 9px;

public/react/src/modules/user/usersInfo/usersInfo.css

@@ -430,3 +430,7 @@
 .topsicinline{
     display: inline-block;
 }
+/* 防抖 */
+.educontent .square-list {
+  min-height: 400px;
+}

public/react/src/modules/user/usersInfo/video/InfosVideo.css

@@ -1,3 +1,7 @@
+/* 撑开滚动条，防抖 */
+.educontent > .itemWrap {
+    min-height: 400px;
+}
 .itemWrap {
     display: flex;
     flex-wrap: wrap;