Merge branches 'dev_aliyun', 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder

app/controllers/ecloud_controller.rb

@@ -18,7 +18,7 @@ class EcloudController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
   before_filter :save_para
-  before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
+  # before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
 
   before_filter :user_setup
   # before_filter :require_login, only: [:authorize]

db/migrate/20190803022733_add_exec_time_to_evaluate_records.rb

@@ -1,5 +0,0 @@
-class AddExecTimeToEvaluateRecords < ActiveRecord::Migration
-  def change
-    add_column :evaluate_records, :exec_time, :integer
-  end
-end

lib/tasks/users.rake

@@ -86,10 +86,11 @@ task :add_test_users => :environment do
 
 
 
-  (1..1000).each do |i|
+  (1..2000).each do |i|
+    puts i
 
     no = sprintf("%04d", i)
-    phone = "5160731#{no}"
+    phone = "6160731#{no}"
 
     us = UsersService.new
     user = us.register phone: phone, password: 'edu12345678'
@@ -100,7 +101,7 @@ task :add_test_users => :environment do
         平夏,凌旋,孤丝,怜寒,向萍,凡松,青丝,翠安,如天,凌雪,绮菱,代云,南莲,寻南,春文,香薇,冬灵,凌珍,采绿,天春,沛文,
         紫槐,幻柏,采文,春梅,雪旋,盼海,映梦,安雁,映容,凝阳,访风,天亦,平绿,盼香,觅风,小霜,雪萍,半雪,山柳,谷雪,靖易,
         白薇,梦菡,飞绿,如波,又晴,友易,香菱,冬亦,问雁,妙春,海冬,半安,平春,幼柏,秋灵,凝芙,念烟,白山,从灵,尔芙,迎蓉,
-        念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧。妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇,
+        念寒,翠绿,翠芙,靖儿,妙柏,千凝,小珍,天巧,妙旋,雪枫,夏菡,元绿,痴灵,绮琴,雨双,听枫,觅荷,凡之,晓凡,雅彤,香薇,
         孤风,从安,绮彤,之玉,雨珍,幻丝,代梅,香波,青亦,元菱,海瑶,飞槐,听露,梦岚,幻竹,新冬,盼翠,谷云".split(",")
 
     lastname = l[rand(l.length)] + f[rand(f.length)]
@@ -109,7 +110,7 @@ task :add_test_users => :environment do
         lastname: lastname,
         nickname: '',
         sex: 0,
-        mail: "00educoder#{no}@qq.com",
+        mail: "stueducoder#{no}@qq.com",
         identity: 1,
         te_technical_title: 0,
         pro_technical_title: 0,

public/react/src/modules/ShCommunity/CommunityHome.js

@@ -66,7 +66,12 @@ class CommunityHome extends Component {
         }
         let xhslist=["路由交换","H3CNA","H3CNE","H3CSE-Routing&Switching","H3CTE","","","H3CNE-SDN","","H3CIE-Routing&SWitching"]
 	    return (
-            <div className="edu-con-bg01" style={{paddingTop: '50px',paddingBottom: '231px'}}>
+            <div className="edu-con-bg01 communityHome" style={{paddingTop: '60px',paddingBottom: '231px'}}>
+                <style>{`
+                    .communityHome .ant-carousel .slick-slide {
+                        height: 500px;
+                    }
+                `}</style>
                 <div className="Community_Home_Top" style={{width:BrowserType===true?'100%':'100.9%'}}>
 
                        { BannersUrl===""?"":

public/react/src/modules/ec/css/ecCourseEvaluations.css

@@ -558,4 +558,8 @@ a.TrainingLecturer:hover{
 
 .mt60{
   margin-top:60px;
+}
+
+.SystemParameters{
+    height:auto;
 }

public/react/src/modules/ec/ecCourseSupportSetting/style.css

@@ -28,7 +28,7 @@
 }
 
 .SystemParameters {
-    height: 60px;
+    min-height: 60px;
 }
 
 p {

public/react/src/modules/ec/ecCourseSupports/ecCourseSupports.js

@@ -470,7 +470,7 @@ class ecCourseSupports extends Component {
                 </Modal>
 
 
-                <div className="educontent mb290 mt60">
+                <div className="educontent mb290">
 
                     <EcTitleCourseEvaluations
                         {...this.props}