Merge branch 'educoder' into dev_shixuns

app/controllers/application_controller.rb

@@ -68,7 +68,8 @@ class ApplicationController < ActionController::Base
   def ecloud_auth ucloud_user_id
     euser = EcloudUser.where("id =? and opttype not in(3, 5)", ucloud_user_id).first
     if euser.present?  # 开通过业务
-      #
+      # ni
+
     else
       false
     end

app/controllers/ecloud_controller.rb

@@ -33,10 +33,18 @@ class EcloudController < ApplicationController
   def trustie_login
   end
 
-  CLIENT_ID = '1022'
-  CLIENT_SECRET = '2112037a-6d7a-432b-9081-feb1153d8668'
-  ROOT_URl = 'http://localhost:3000'
-  SERVER_URL = "https://221.176.54.92:9081/restful/services/"
+  # 测试环境
+  # CLIENT_ID = '1022'
+  # CLIENT_SECRET = '2112037a-6d7a-432b-9081-feb1153d8668'
+  # SERVER_URL = "https://221.176.54.92:9081/restful/services/"
+  #
+
+  # 正式环境
+  CLIENT_ID = '1056'
+  CLIENT_SECRET = '2e84256a-3de4-4713-9e02-10ee88a14592'
+  SERVER_URL = "https://221.176.53.130:44390/services/"
+
+
 
   ## 签名
   def sign(timestamp)
@@ -55,12 +63,12 @@ class EcloudController < ApplicationController
       begin
         if params['opttype'] == 0 # 开通企业/个人业务
           ecloud = Ecloud.create!(eloud_params)
-          create_service(params['services'], ecloud.try(:id))
+          create_service(params['services'], ecloud.try(:id)) if params['services'].present?
           create_product_params(params['productparas'],  ecloud.try(:id)) if params['productparas'].present?
           # 为管理员添加一条记录
           # 开通的时候都是用户的opttype也是0
           # 如果管理员已经存在，则不用重复开通
-          euser = EcloudUser.where(id: params['userid'], custid: params['custid']).first
+          euser = EcloudUser.where(userid: params['userid'], custid: params['custid']).first
           unless euser
             EcloudUser.create!(custid: params['custid'], opttype: params['opttype'], userid: params['userid'],
                                username: params['username'], useralias: params['useralias'],
@@ -88,7 +96,8 @@ class EcloudController < ApplicationController
         elsif params['opttype'] == 1 # 业务变更
           ecloud = Ecloud.where(custid: params['custid'], custcode: params['custcode'], productcode: params['productcode']).first
           # 套餐变更
-          # 新增业务
+          # 操作代码 0：新增业务，1：注销业务2：修改业务
+          # # 新增服务
           add_service = params['services'].select{|s| s['opttype'] == 0}
           create_service(add_service, ecloud.try(:id)) if add_service.present?
 
@@ -106,8 +115,8 @@ class EcloudController < ApplicationController
           if edt_services.present?
             edt_services.each do |es|
               ese = EcloudService.where(ecloud_id: ecloud.try(:id), code: es['code']).first
-              ese.update_attributes!(opttype: es['opttype'], begintime: es['begintime'], endtime: es['endtime'])
-              create_serviceparas es['serviceparas'].first, ese.id
+              ese.update_attributes!(opttype: es['opttype'], begintime: es['begintime'], endtime: es['endtime']) if ese.present?
+              create_serviceparas(es['serviceparas'].first, ese.id) if ese.present?
             end
           end
 
@@ -120,6 +129,7 @@ class EcloudController < ApplicationController
           # ecloud_id = ecloud.try(:id)
 
         elsif params['opttype'] == 4 # 再次重复开通
+          # 再次申请开通，这种情况就是累加时间
           ecloud = Ecloud.where(custid: params['custid'], custcode: params['custcode'], productcode: params['productcode']).first
           create_service(params['services'], ecloud.try(:id))
           create_product_params(params['productparas'],  ecloud.try(:id)) if params['productparas'].present?

app/controllers/student_work_controller.rb

@@ -508,7 +508,7 @@ class StudentWorkController < ApplicationController
     end
 
     @tab = params[:tab].nil? ? 1 : params[:tab].to_i
-    if User.current.member_of_course?(@homework.course) && params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:page].nil?
+    if (User.current.member_of_course?(@homework.course) || User.current.admin?) && params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:page].nil?
       if !@course.is_end && @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.end_time > Time.now || (@homework.end_time <= Time.now && @homework.allow_late))
         update_shixun_work_status @homework
       end

app/helpers/application_helper.rb

@@ -4340,7 +4340,7 @@ module ApplicationHelper
         candown = (attachment.is_public == 1 || attachment.is_public == true)
       end
     else
-      if attachment.container_type == "MarkDown" || attachment.container_type == "Shixun" || attachment.container_type == "Memo" || attachment.container_type == "Career" || attachment.container_type == "Exercise" || attachment.container_type == "ExerciseBank"
+      if attachment.container_type == "MarkDown" || attachment.container_type.nil? || attachment.container_type == 'Subject' || attachment.container_type == "Shixun" || attachment.container_type == "Memo" || attachment.container_type == "Career" || attachment.container_type == "Exercise" || attachment.container_type == "ExerciseBank"
         candown = true
       end
     end

app/models/ecloud_service.rb

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

app/views/subjects/_new_or_edit.html.erb

@@ -78,7 +78,7 @@
         placeholder: "请在此输入实训课程的简介",
         imageUpload : true,
         imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => @subject.class) %>" //url
+        imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => 'MarkDown') %>" //url
     });
     md_elocalStorage(shixun_editormd, "subject_desc_<%= User.current.id %>", "desc");
     /* --------------------------------- 学习须知 -------------------------------------- */
@@ -106,7 +106,7 @@
         placeholder: "请在此输入实训课程的学习须知",
         imageUpload : true,
         imageFormats : ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
-        imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => @subject.class) %>" //url
+        imageUploadURL : "<%= upload_with_markdown_path(:container_id => @subject.id, :container_type => 'MarkDown') %>" //url
     });
     md_elocalStorage(shixun_propaedeutics, "subject_notes_<%= User.current.id %>", "notes");
 

db/migrate/20190314080805_create_shixun_student_works.rb

@@ -25,6 +25,8 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
       begin
         ActiveRecord::Base.transaction do
           if shixun.present? && user.present?
+            myshixun = Myshixun.where(:user_id => user.id, :shixun_id => shixun.id).first
+            if myshixun.blank?
               # 创建新的myshixun和games
               # fork版本库，如果用户没有同步，则先同步用户
               g = Gitlab.client
@@ -69,6 +71,7 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
                   Game.create!(:challenge_id => challenge.id, :myshixun_id => myshixun.id, :status => status, :user_id => myshixun.user_id,
                                :open_time => Time.now, :identifier => code, :modify_time => challenge.modify_time)
                 end
+              end
               work_score = work.final_score
               work.homework_common.homework_challenge_settings.each do |setting|
                 if work_score > 1
@@ -78,6 +81,8 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
                 end
               end
               work.update_column("myshixun_id", myshixun.id)
+            else
+              work.update_attributes(:myshixun_id => 0, :work_status => 0)
             end
           end
         end