Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/ecloud_controller.rb

@@ -16,8 +16,8 @@ require 'digest'
 
 class EcloudController < ApplicationController
 
-  before_filter :save_para
-  before_filter :check_sign_key, only: [:ps_new, :ps_update, :bs_new, :bs_update]
+  before_action :save_para
+  before_action :check_sign_key, only: [:ps_new, :ps_update, :bs_new, :bs_update]
 
 
   def index

app/controllers/homework_commons_controller.rb

@@ -1433,7 +1433,7 @@ class HomeworkCommonsController < ApplicationController
 
   def require_id_params
     tip_exception("请至少选择一个作业") if params[:homework_ids].blank?
-    tip_exception("批量设置不能超过15个") if params[:homework_ids].length > 15
+    tip_exception("批量设置不能超过15个") if params[:homework_ids].length > 15 && params[:type].blank?
   end
 
   def validate_min_max_num

app/models/ecloud.rb

@@ -1,8 +1,8 @@
 #encoding=utf-8
 class Ecloud < ActiveRecord::Base
-  attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime,
-                  :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email,
-                  :effecttime, :operatime
+  # attr_accessible :applyno, :begintime, :bossorderid, :custcode, :custid, :custname, :custtype, :ecordercode, :endtime,
+  #                 :mobile, :opttype, :productcode, :registersource, :string, :trial, :useralias, :userid, :username, :email,
+  #                 :effecttime, :operatime
 
   has_many :ecloud_services, :dependent => :destroy # 业务列表
   has_many :ecloud_productparas, :dependent => :destroy # 开通参数列表

app/models/ecloud_productpara.rb

@@ -1,4 +1,4 @@
 class EcloudProductpara < ActiveRecord::Base
-  attr_accessible :key, :value, :ecloud_id
+  # attr_accessible :key, :value, :ecloud_id
   belongs_to :ecloud
 end

app/models/ecloud_service.rb

@@ -1,6 +1,6 @@
 # 操作代码 0：新增业务，1：注销业务2：修改业务
 class EcloudService < ActiveRecord::Base
-  attr_accessible :begintime, :code, :endtime, :opttype, :ecloud_id, :packagecode, :bossorderid
+  # attr_accessible :begintime, :code, :endtime, :opttype, :ecloud_id, :packagecode, :bossorderid
   belongs_to :ecloud
   has_many :ecloud_serviece_serviceparas
 end

app/models/ecloud_serviece_servicepara.rb

@@ -1,5 +1,5 @@
 # ket值，license表示人数，对应企业版；duration表示月数，对应个人版；
 class EcloudServieceServicepara < ActiveRecord::Base
-  attr_accessible :key, :value, :ecloud_service_id
+  # attr_accessible :key, :value, :ecloud_service_id
   belongs_to :ecloud_service
 end

app/models/ecloud_users.rb

@@ -1,4 +1,4 @@
 class EcloudUser < ActiveRecord::Base
   # opttype:  # user['opttype']: 操作类型0：开通；1：变更；3: 取消授权；4：暂停；5：恢复；
-  attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
+  # attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
 end

public/react/src/AppConfig.js

@@ -42,7 +42,7 @@ if (isDev) {
       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
-// debugType="admin";
+debugType="admin";
 // 老师
 //debugType="teacher";
 // 学生
@@ -136,7 +136,7 @@ export function initAxiosInterceptors(props) {
       // proxy="https://test-jupyterweb.educoder.net"
       // proxy="https://test-newweb.educoder.net"
       // proxy="https://test-jupyterweb.educoder.net"
-	     //proxy="http://192.168.2.63:3001"
+	     //proxy="https://test-jupyterweb.educoder.net/"
 
 
     // 在这里使用requestMap控制，避免用户通过双击等操作发出重复的请求；

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -432,7 +432,9 @@ class Newshixuns extends Component {
       },
     }
 
-    return (
+
+
+		return (
       <div className="newMain clearfix">
         <style>
           {
@@ -621,9 +623,10 @@ class Newshixuns extends Component {
                                 {this.state.mainvalues === undefined && this.state.subvalues === undefined || this.state.mainvalues === "" && this.state.subvalues === "" ? "" :
                                   <div className={"font-12"} style={{'max-width': '600px'}}>
                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" : this.state.mainvalues}`}
-                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
-                                    {`${this.state.mainvalues === undefined || this.state.mainvalues === "" ? "" :  ""}${this.state.subvalues === undefined || this.state.subvalues === "" ? "" :
-                                      this.state.mainvalues === undefined || this.state.mainvalues === "" ?  this.state.subvalues : this.state.subvalues}`}
+                                    {`${this.state.subvalues === undefined || this.state.subvalues === "" ? "" : this.state.subvalues}`}
+
+
+
                                   </div>}
 
                               </div>