Merge branch 'dev_aliyun' into dev_tj

merge aliyun

app/controllers/admins/users_controller.rb

@@ -61,7 +61,7 @@ class Admins::UsersController < Admins::BaseController
   private
 
   def update_params
-    params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id
+    params.require(:user).permit(%i[lastname nickname gender identity technical_title student_id is_shixun_marker
                                     mail phone location location_city school_id department_id admin business is_test
                                     password professional_certification authentication])
   end

app/controllers/application_controller.rb

@@ -42,6 +42,12 @@ class ApplicationController < ActionController::Base
 		EduSetting.get(name)
 	end
 
+	def shixun_marker
+		unless current_user.is_shixun_marker?
+			tip_exception(403, "..")
+		end
+	end
+
 	# 实训的访问权限
 	def shixun_access_allowed
 		if !current_user.shixun_permission(@shixun)

app/controllers/departments_controller.rb

@@ -1,4 +1,6 @@
 class DepartmentsController < ApplicationController
+  skip_before_action :check_sign
+
   def for_option
     render_ok(departments: current_school.departments.without_deleted.select(:id, :name).as_json)
   end

app/controllers/schools_controller.rb

@@ -1,4 +1,5 @@
 class SchoolsController < ApplicationController
+  skip_before_action :check_sign
   def school_list
     schools = School.all
 

app/controllers/shixuns_controller.rb

@@ -24,6 +24,7 @@ class ShixunsController < ApplicationController
 	before_action :portion_allowed, only: [:copy]
 
 	before_action :special_allowed, only: [:send_to_course, :search_user_courses]
+	before_action :shixun_marker, only: [:new, :create]
 
 	## 获取课程列表
   def index
@@ -1151,4 +1152,5 @@ private
 		end
 		md5.hexdigest
 	end
+
 end

app/controllers/subjects_controller.rb

@@ -7,6 +7,8 @@ class SubjectsController < ApplicationController
                         :search_members, :add_subject_members, :statistics, :shixun_report, :school_report,
                                  :up_member_position, :down_member_position, :update_team_title]
   before_action :require_admin, only: [:copy_subject]
+  before_action :shixun_marker, only: [:new, :create]
+
 
   include ApplicationHelper
   include SubjectsHelper

app/services/admins/identity_auths/agree_apply_service.rb

@@ -10,7 +10,7 @@ class Admins::IdentityAuths::AgreeApplyService < ApplicationService
     ActiveRecord::Base.transaction do
       apply.update!(status: 1)
       user.update!(authentication: true)
-
+      user.update!(is_shixun_marker: true) if user.is_teacher?
       RewardGradeService.call(user, container_id: user.id, container_type: 'Authentication', score: 500)
 
       deal_tiding!

app/services/admins/update_user_service.rb

@@ -25,6 +25,7 @@ class Admins::UpdateUserService < ApplicationService
     ActiveRecord::Base.transaction do
       user.save!
       user.user_extension.save!
+      user.update!(is_shixun_marker: true) if user.is_certification_teacher
 
       update_gitlab_password if params[:password].present?
     end
@@ -36,7 +37,7 @@ class Admins::UpdateUserService < ApplicationService
 
   def user_attributes
     params.slice(*%i[lastname nickname mail phone admin business is_test
-                     professional_certification authentication])
+                     professional_certification authentication is_shixun_marker])
   end
 
   def user_extension_attributes

app/views/admins/users/edit.html.erb

@@ -120,6 +120,7 @@
         <div class="d-flex">
           <%= f.input :professional_certification, as: :boolean, label: '职业认证', checked_value: 1, unchecked_value: 0 %>
           <%= f.input :authentication, as: :boolean, label: '实名认证', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
+          <%= f.input :is_shixun_marker, as: :boolean, label: '实训制作', wrapper_html: { class: 'ml-3' }, checked_value: 1, unchecked_value: 0 %>
         </div>
       </div>
 

app/views/users/get_user_info.json.jbuilder

@@ -14,6 +14,7 @@ json.email @user.mail
 json.profile_completed @user.profile_completed?
 json.professional_certification @user.professional_certification
 json.main_site current_laboratory.main_site?
+json.is_shixun_marker current_user.is_shixun_marker? || current_user.admin_or_business?
 if @course
   json.course_identity @course_identity
   json.course_name @course.name

db/migrate/20191230094544_add_is_shixun_marker_for_users.rb

@@ -0,0 +1,9 @@
+class AddIsShixunMarkerForUsers < ActiveRecord::Migration[5.2]
+  def change
+    add_column :users, :is_shixun_marker, :boolean, :default => false
+
+    User.joins(:user_extension)
+        .where(users: {professional_certification: 1}, user_extensions: {identity: 0})
+        .update_all(is_shixun_marker: 1)
+  end
+end

public/react/src/AppConfig.js

@@ -6,6 +6,7 @@ import { requestProxy } from "./indexEduplus2RequestProxy";
 import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString } from 'educoder';
 import {  notification } from 'antd';
 import './index.css';
+const $ = window.$;
 const opens ="79e33abd4b6588941ab7622aed1e67e8";
 broadcastChannelOnmessage('refreshPage', () => {
     window.location.reload()
@@ -61,6 +62,14 @@ export function initAxiosInterceptors(props) {
     // 如果需要支持重复的请求，考虑config里面自定义一个allowRepeat参考来控制
     const requestMap = {};
 
+    window.railsgettimes = function(proxy) {
+        $.ajax({url:`${proxy}/api/main/first_stamp.json`,async:false,success:function(data,status){
+           if(data.status===0){
+             return data.message;
+           }
+        }});
+    }
+
     window.setfalseInRequestMap = function(keyName) {
         requestMap[keyName] = false;
     }
@@ -92,22 +101,23 @@ export function initAxiosInterceptors(props) {
 								}
 							}
             if(`${config[0]}`!=`true`){
-              let timestamp = Date.parse(new Date())/1000;
-              let newopens=md5(opens+timestamp)
                 if (window.location.port === "3007") {
+                  let timestamp=railsgettimes(proxy);
+                  console.log(timestamp)
+                  let newopens=md5(opens+timestamp)
                     config.url = `${proxy}${url}`;
                     if (config.url.indexOf('?') == -1) {
-                        config.url = `${config.url}?debug=${debugType}&timestamp=${timestamp}&client_key=${newopens}`;
+                        config.url = `${config.url}?debug=${debugType}&randomcode=${timestamp}&client_key=${newopens}`;
                     } else {
-                        config.url = `${config.url}&debug=${debugType}&timestamp=${timestamp}&client_key=${newopens}`;
+                        config.url = `${config.url}&debug=${debugType}&randomcode=${timestamp}&client_key=${newopens}`;
                     }
                 } else {
                     // 加api前缀
                   config.url = url;
                   if (config.url.indexOf('?') == -1) {
-                    config.url = `${config.url}?&timestamp=${timestamp}&client_key=${newopens}`;
+                    config.url = `${config.url}?&randomcode=${timestamp}&client_key=${newopens}`;
                   } else {
-                    config.url = `${config.url}&timestamp=${timestamp}&client_key=${newopens}`;
+                    config.url = `${config.url}&randomcode=${timestamp}&client_key=${newopens}`;
                   }
                 }
             }