合并

app/libs/util/redis.rb

@@ -0,0 +1,9 @@
+module Util::Redis
+  class << self
+    def online_user_count
+      if Rails.cache.is_a?(ActiveSupport::Cache::RedisStore)
+        Rails.cache.data.scan(0, match: 'cache:_session_id:*', count: 100000).last.uniq.size
+      end
+    end
+  end
+end

public/react/src/modules/courses/Index.js

@@ -270,7 +270,6 @@ const Ordering=Loadable({
 	loader: () => import('../../modules/courses/ordering/Ordering'),
 	loading: Loading,
 });
-
 class CoursesIndex extends Component{
     constructor(props) {
         super(props)

public/react/src/modules/courses/completetaskdetails/Completetaskdetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
@@ -78,7 +79,6 @@ class Groupjobbandetails extends Component {
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&datas.description).replace(/▁/g, "▁▁▁")}}/>*/}
-
 					{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
 					{/*	return (*/}
 					{/*		<GroupPackage key={key} attachments={item}></GroupPackage>*/}

public/react/src/modules/courses/completetaskdetails/Completetaskpage.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn,MarkdownToHtml} from 'educoder';
@@ -228,4 +229,3 @@ class Completetaskpage extends Component {
 }
 
 export default Completetaskpage;
-

public/react/src/modules/courses/completetaskdetails/completetaskdetails.css

@@ -1,3 +1,4 @@
+
 .yslquestionbank1{
     padding-top: 30px !important;
     padding-right: 30px !important;
@@ -11,7 +12,6 @@
 .yslquesmarkdowntext{
     font-size: 16px;
     color: #707070;
-
 }
 .yslquesmat26{
     margin-top: 26px;

public/react/src/modules/courses/groupjobbank/GroupPackage.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
 import {
@@ -36,7 +37,6 @@ class GroupPackage extends Component {
 
 
 
-
 	}
 	// 获取数据地方
 	getTrainingjobsetting = () => {

public/react/src/modules/courses/groupjobbank/GroupPackage2.js

@@ -59,28 +59,28 @@ class GroupPackage extends Component {
 		return (
 			bool===true?
 
-			<div className="ml47text">
+				<div className="ml47text">
-				{
-					datas===undefined?"":datas.min_num===undefined||datas.max_num===undefined?"":datas.min_num===null||datas.max_num===null?"":
-						<p>
-							<span className="ysltextcolor66">分组要求：</span>
-							<span className="ysltextcolor05">{datas&&datas.min_num}~ {datas&&datas.max_num}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
-						</p>
-				}
-				<p>
-					<span className="ysltextcolor66">基于项目实施</span>
-					<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
-				</p>
-			</div>
-			:<div className="ml47text">
 					{
-						datas===undefined?"":datas.group_info===undefined?"":datas.group_info.min_number===undefined||datas.group_info.max_number===undefined?"":
+						datas===undefined?"":datas.min_num===undefined||datas.max_num===undefined?"":datas.min_num===null||datas.max_num===null?"":
-							datas.group_info.min_number===null||datas.group_info.max_number===null?"":
 							<p>
 								<span className="ysltextcolor66">分组要求：</span>
-								<span className="ysltextcolor05">{datas&&datas.group_info&&datas.group_info.min_number}~ {datas&&datas.group_info&&datas.group_info.max_number}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
+								<span className="ysltextcolor05">{datas&&datas.min_num}~ {datas&&datas.max_num}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
 							</p>
 					}
+					<p>
+						<span className="ysltextcolor66">基于项目实施</span>
+						<span className="ysltextcolor05">（学生必须在本平台创建项目，项目管理员可以提交作品）</span>
+					</p>
+				</div>
+				:<div className="ml47text">
+					{
+						datas===undefined?"":datas.group_info===undefined?"":datas.group_info.min_number===undefined||datas.group_info.max_number===undefined?"":
+							datas.group_info.min_number===null||datas.group_info.max_number===null?"":
+								<p>
+									<span className="ysltextcolor66">分组要求：</span>
+									<span className="ysltextcolor05">{datas&&datas.group_info&&datas.group_info.min_number}~ {datas&&datas.group_info&&datas.group_info.max_number}（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
+								</p>
+					}
 					{
 						datas&&datas.group_info&&datas.group_info.base_on_project?
 							<p>

public/react/src/modules/courses/groupjobbank/Groupjobbandetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {
@@ -79,7 +80,6 @@ class Groupjobbandetails extends Component {
 						)
 					}
 					{/*<div id="MakedownHTML"className="markdown-body   yslquesHeigth yslquesmarkdowntext"  dangerouslySetInnerHTML={{__html: markdownToHTML(datas&&(datas.description===null?"无":datas.description==="null"?"无":datas.description)).replace(/▁/g, "▁▁▁")}}/>*/}
-
 					{/*{datas.attachments === undefined ? "" : datas.attachments.map((item, key) => {*/}
 					{/*	return (*/}
 					{/*		<GroupPackage key={key} attachments={item}></GroupPackage>*/}

public/react/src/modules/courses/groupjobbank/GroupjobbankPage.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn} from 'educoder';
@@ -264,4 +265,3 @@ class GroupjobbankPage extends Component {
 }
 
 export default GroupjobbankPage;
-

public/react/src/modules/courses/groupjobbank/Groupjobquesanswer.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,MarkdownToHtml,getImageUrl} from 'educoder';
 import {

public/react/src/modules/courses/questionbank/Generaljobbankdetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import {Link, NavLink} from 'react-router-dom';
 import {WordsBtn, ActionBtn,getImageUrl} from 'educoder';
@@ -259,4 +260,3 @@ class Generaljobbankdetails extends Component {
 }
 
 export default Generaljobbankdetails;
-

public/react/src/modules/courses/questionbank/Generaljobdetails.js

@@ -1,3 +1,4 @@
+
 import React, {Component} from "react";
 import { WordsBtn,on, off, trigger,markdownToHTML, MarkdownToHtml ,getImageUrl} from 'educoder';
 import {