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

Gemfile

@@ -103,3 +103,6 @@ gem 'diffy'
 # oauth2
 gem 'omniauth', '~> 1.9.0'
 gem 'omniauth-oauth2', '~> 1.6.0'
+
+# global var
+gem 'request_store'

app/controllers/application_controller.rb

@@ -303,7 +303,7 @@ class ApplicationController < ActionController::Base
 		current_domain_session = session[:"#{default_yun_session}"]
 		if current_domain_session
 			# existing session
-			(User.active.find(current_domain_session) rescue nil)
+			User.current = (User.active.find(current_domain_session) rescue nil)
 		elsif autologin_user = try_to_autologin
 			autologin_user
 		elsif params[:format] == 'atom' && params[:key] && request.get? && accept_rss_auth?

app/controllers/jupyters_controller.rb

@@ -30,5 +30,17 @@ class JupytersController < ApplicationController
         render json: {status: 0, url: url, port: port}
     end
 
+    def reset_with_tpi
+        myshixun = Myshixun.find_by(identifier: params[:identifier])
+        info = jupyter_tpi_reset(myshixun)
+        render json: {status: 0, url: info[:url], port: info[:port]}
+    end
+
+    def reset_with_tpm
+        shixun = Shixun.find_by(identifier: params[:identifier])
+        info = jupyter_tpm_reset(shixun)
+        render json: {status: 0, url: info[:url], port: info[:port]}
+    end
+
 
 end

app/models/laboratory.rb

@@ -38,12 +38,20 @@ class Laboratory < ApplicationRecord
     find_by_identifier(subdomain)
   end
 
-  def self.current=(laboratory)
-    Thread.current[:current_laboratory] = laboratory
+  # def self.current=(laboratory)
+  #   Thread.current[:current_laboratory] = laboratory
+  # end
+  #
+  # def self.current
+  #   Thread.current[:current_laboratory] ||= Laboratory.find(1)
+  # end
+
+  def self.current=(user)
+    RequestStore.store[:current_laboratory] = user
   end
 
   def self.current
-    Thread.current[:current_laboratory] ||= Laboratory.find(1)
+    RequestStore.store[:current_laboratory] ||= User.anonymous
   end
 
   def shixuns

app/models/user.rb

@@ -540,12 +540,20 @@ class User < ApplicationRecord
     mail.present?
   end
 
+  # def self.current=(user)
+  #   Thread.current[:current_user] = user
+  # end
+  #
+  # def self.current
+  #   Thread.current[:current_user] ||= User.anonymous
+  # end
+
   def self.current=(user)
-    Thread.current[:current_user] = user
+    RequestStore.store[:current_user] = user
   end
 
   def self.current
-    Thread.current[:current_user] ||= User.anonymous
+    RequestStore.store[:current_user] ||= User.anonymous
   end
 
   def self.anonymous

app/services/jupyter_service.rb

@@ -7,7 +7,7 @@ module JupyterService
             shixun_tomcat = edu_setting('cloud_bridge')
             uri = "#{shixun_tomcat}/bridge/jupyter/get"
             tpiID = "tpm#{shixun.id}"
-            params = {tpiID: tpiID, :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
+            params = {tpiID: tpiID, identifier: shixun.identifier, :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
     
             logger.info "test_juypter: uri->#{uri}, params->#{params}"
             res = uri_post uri, params
@@ -45,7 +45,7 @@ module JupyterService
             uri = "#{shixun_tomcat}/bridge/jupyter/get"
 
             tpiID = myshixun.id
-            params = {tpiID: tpiID, :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
+            params = {tpiID: tpiID, identifier: shixun.identifier,  :containers => "#{Base64.urlsafe_encode64(shixun_container_limit(shixun))}"}
             res = uri_post uri, params
 
             logger.info "test_juypter: #{res}"
@@ -130,4 +130,59 @@ module JupyterService
     end
 
 
+    ##重置jupyter环境
+    def jupyter_tpi_reset(myshixun)
+        jupyter_delete_tpi(myshixun)
+        url = jupyter_url_with_game(myshixun)
+        port = jupyter_port_with_game(myshixun)
+        {url: url, port: port}
+    end
+
+    ## 重置tpm环境
+    def jupyter_tpm_reset(shixun)
+        jupyter_delete_tpm(shixun)
+
+        url = jupyter_url_with_shixun(shixun)
+        port = jupyter_port_with_shixun(shixun)
+
+        {url: url, port: port}
+    end
+
+
+
+    # 删除pod
+    def jupyter_delete_tpi(myshixun) 
+        myshixun_id = myshixun.id
+        digest = myshixun.identifier + edu_setting('bridge_secret_key')
+        digest_key = Digest::SHA1.hexdigest("#{digest}")
+        begin
+            shixun_tomcat = edu_setting('cloud_bridge')
+            uri = "#{shixun_tomcat}/bridge/jupyter/delete"
+            Rails.logger.info("#{current_user} => cloese_jupyter digest is #{digest}")
+            params = {:tpiID => myshixun_id, :digestKey => digest_key, :identifier => myshixun.identifier}
+            res = uri_post uri, params
+            if res && res['code'].to_i != 0
+                raise("实训云平台繁忙（繁忙等级：110）")
+            end
+        end
+    end
+
+
+    def jupyter_delete_tpm(shixun) 
+        tpiID = "tpm#{shixun.id}"
+        digest = shixun.identifier + edu_setting('bridge_secret_key')
+        digest_key = Digest::SHA1.hexdigest("#{digest}")
+        begin
+            shixun_tomcat = edu_setting('cloud_bridge')
+            uri = "#{shixun_tomcat}/bridge/jupyter/delete"
+            Rails.logger.info("#{current_user} => cloese_jupyter digest is #{digest}")
+            params = {:tpiID => tpiID, :digestKey => digest_key, :identifier => shixun.identifier}
+            res = uri_post uri, params
+            if res && res['code'].to_i != 0
+                raise("实训云平台繁忙（繁忙等级：110）")
+            end
+        end
+    end
+
+
 end

config/routes.rb

@@ -31,6 +31,8 @@ Rails.application.routes.draw do
         get :save_with_tpm
         get :get_info_with_tpi
         get :get_info_with_tpm
+        get :reset_with_tpi
+        get :reset_with_tpm
       end
     end
     

public/react/src/modules/tpm/TPMsettings/Configuration.js

@@ -69,16 +69,16 @@ export default class Shixuninformation extends Component {
   }
 
   componentDidMount() {
-    if (this.props.data&&this.props.data.shixun) {
-
-      this.setState({
-        can_copy:this.props.data.shixun && this.props.data.shixun.can_copy === undefined ? false : this.props.data.shixun&&this.props.data.shixun.can_copy,
-        use_scope: this.props.data.shixun && this.props.data.shixun.use_scope,
-        opening_time: this.props.data.shixun && this.props.data.shixun.opening_time,
-        opentime: !this.props.data.shixun && this.props.data.shixun.opening_time ? false : true,
-        oldscope_partment:this.props.data.shixun && this.props.data.shixun.scope_partment,
-      })
-
+    if (this.props.data) {
+      if (this.props.data.shixun) {
+        this.setState({
+          can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
+          use_scope: this.props.data && this.props.data.shixun.use_scope,
+          opening_time: this.props.data && this.props.data.shixun.opening_time,
+          opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+          oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
+        })
+      }
     }
     let departmentsUrl = `/shixuns/departments.json`;
     axios.get(departmentsUrl).then((response) => {
@@ -98,15 +98,15 @@ export default class Shixuninformation extends Component {
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.data != this.props.data) {
       if (this.props.data) {
-
-        this.setState({
-          can_copy: this.props.data.shixun && this.props.data.shixun.can_copy === undefined ? false : this.props.data.shixun&&this.props.data.shixun.can_copy,
-          use_scope: this.props.data.shixun&& this.props.data.shixun.use_scope,
-          opening_time: this.props.data.shixun && this.props.data.shixun.opening_time,
-          opentime: !this.props.data.shixun && this.props.data.shixun.opening_time ? false : true,
-          oldscope_partment: this.props.data.shixun && this.props.data.shixun.scope_partment,
-        })
-
+        if (this.props.data.shixun) {
+          this.setState({
+            can_copy: this.props.data && this.props.data.shixun.can_copy === undefined ? false : this.props.data && this.props.data.shixun.can_copy,
+            use_scope: this.props.data && this.props.data.shixun.use_scope,
+            opening_time: this.props.data && this.props.data.shixun.opening_time,
+            opentime: !this.props.data && this.props.data.shixun.opening_time ? false : true,
+            oldscope_partment: this.props.data && this.props.data.shixun.scope_partment,
+          })
+        }
       }
     }
   }
@@ -262,7 +262,7 @@ export default class Shixuninformation extends Component {
           </div>
 
           <div className="edu-back-white mb10 ml30 mt20">
-            {this.props.data.shixun && this.props.data.shixun.use_scope === 0 && this.props.data.shixun && this.props.data.shixun.status === 2 ? "" :
+            {this.props.data && this.props.data.shixun.use_scope === 0 && this.props.data && this.props.data.shixun.status === 2 ? "" :
               <div>
                 <span className="color-grey-6 mt5 fl font-16" style={{minWidth: '45px'}}>公开程度:</span>
                 <span className="fl mt8 ml20">

public/react/src/modules/tpm/TPMsettings/LearningSettings.js

@@ -34,35 +34,8 @@ export default class Shixuninformation extends Component {
 
 
   componentDidMount() {
-    if (this.props.data&&this.props.data.shixun) {
-
-      this.setState({
-        vnc: this.props.data && this.props.data.shixun.vnc,
-        code_hidden: this.props.data && this.props.data.shixun.code_hidden,
-        forbid_copy: this.props.data && this.props.data.shixun.forbid_copy,
-        hide_code: this.props.data && this.props.data.shixun.hide_code,
-        task_pass: this.props.data && this.props.data.shixun.task_pass,
-        test_set_permission: this.props.data && this.props.data.shixun.test_set_permission,
-        is_secret_repository: this.props.data && this.props.data.shixun.is_secret_repository,
-        websshshow: this.props.data && this.props.data.shixun.webssh === 0 ? false : true,
-        multi_webssh: this.props.data && this.props.data.shixun.multi_webssh,
-        opensshRadio: this.props.data && this.props.data.shixun.webssh === 0 ? null : this.props.data && this.props.data.shixun.webssh,
-      })
-
-      // if(this.props.data && this.props.data.shixun.status===0){
-      //   this.setState({
-      //     task_pass:true
-      //   })
-      // }
-
-    }
-
-  }
-
-  componentDidUpdate(prevProps, prevState) {
-    if (prevProps.data != this.props.data) {
-      if (this.props.data) {
-
+    if (this.props.data ) {
+      if (this.props.data.shixun) {
         this.setState({
           vnc: this.props.data && this.props.data.shixun.vnc,
           code_hidden: this.props.data && this.props.data.shixun.code_hidden,
@@ -84,6 +57,35 @@ export default class Shixuninformation extends Component {
 
       }
     }
+
+  }
+
+  componentDidUpdate(prevProps, prevState) {
+    if (prevProps.data != this.props.data) {
+      if (this.props.data) {
+        if (this.props.data.shixun) {
+          this.setState({
+            vnc: this.props.data && this.props.data.shixun.vnc,
+            code_hidden: this.props.data && this.props.data.shixun.code_hidden,
+            forbid_copy: this.props.data && this.props.data.shixun.forbid_copy,
+            hide_code: this.props.data && this.props.data.shixun.hide_code,
+            task_pass: this.props.data && this.props.data.shixun.task_pass,
+            test_set_permission: this.props.data && this.props.data.shixun.test_set_permission,
+            is_secret_repository: this.props.data && this.props.data.shixun.is_secret_repository,
+            websshshow: this.props.data && this.props.data.shixun.webssh === 0 ? false : true,
+            multi_webssh: this.props.data && this.props.data.shixun.multi_webssh,
+            opensshRadio: this.props.data && this.props.data.shixun.webssh === 0 ? null : this.props.data && this.props.data.shixun.webssh,
+          })
+
+          // if(this.props.data && this.props.data.shixun.status===0){
+          //   this.setState({
+          //     task_pass:true
+          //   })
+          // }
+
+        }
+      }
+    }
   }
 
 

public/react/src/modules/tpm/TPMsettings/Shixuninformation.js

@@ -55,39 +55,41 @@ class Shixuninformation extends Component {
 
   componentDidUpdate(prevProps, prevState) {
     if (prevProps.data != this.props.data) {
-      if (this.props.data&&this.props.data.shixun) {
-        this.setState({
-          shixunName: this.props.data.shixun&&this.props.data.shixun.name,
-          trainee:this.props.data.shixun&&this.props.data.shixun.trainee,
-          choice_main_type: this.props.data.shixun&&this.props.data.shixun.choice_main_type,
-          choice_small_type: this.props.data.shixun&&this.props.data.shixun.choice_small_type,
-          choice_standard_scripts:this.props.data.shixun&&this.props.data.shixun.choice_standard_scripts,
-          shixunmemoMDvalue: this.props.data.shixun&&this.props.data.shixun.evaluate_script,
-          simichecked: this.props.data.shixun&&this.props.data.shixun.is_secret_repository,
-          shixun_service_configs: this.props.data.shixun&&this.props.data.shixun.shixun_service_configs,
-          standard_scripts:this.props.data.shixun&&this.props.data.shixun.standard_scripts,
-          shixun_service_configlist:this.props.data.shixun&&this.props.data.shixun.shixun_service_configs,
+
+      if (this.props.data ) {
+        if (this.props.data.shixun){
+          this.setState({
+          shixunName: this.props.data && this.props.data.shixun.name,
+          trainee: this.props.data && this.props.data.shixun.trainee,
+          choice_main_type: this.props.data && this.props.data.shixun.choice_main_type,
+          choice_small_type: this.props.data && this.props.data.shixun.choice_small_type,
+          choice_standard_scripts: this.props.data && this.props.data.shixun.choice_standard_scripts,
+          shixunmemoMDvalue: this.props.data && this.props.data.shixun.evaluate_script,
+          simichecked: this.props.data && this.props.data.shixun.is_secret_repository,
+          shixun_service_configs: this.props.data && this.props.data.shixun.shixun_service_configs,
+          standard_scripts: this.props.data && this.props.data.shixun.standard_scripts,
+          shixun_service_configlist: this.props.data && this.props.data.shixun.shixun_service_configs,
         })
 
-        if(this.props.data.shixun&&this.props.data.shixun.choice_standard_scripts===null){
+        if (this.props.data && this.props.data.shixun.choice_standard_scripts === null) {
           this.setState({
-            choice_standard_scripts:{id: this.props.data.shixun&&this.props.data.shixun.standard_scripts[0].id, value: ""},
-            choice_standard_scriptssum:this.props.data.shixun&&this.props.data.shixun.standard_scripts[0].id
+            choice_standard_scripts: {id: this.props.data && this.props.data.shixun.standard_scripts[0].id, value: ""},
+            choice_standard_scriptssum: this.props.data && this.props.data.shixun.standard_scripts[0].id
           })
           this.props.form.setFieldsValue({
-            selectscripts:this.props.data.shixun&&this.props.data.shixun.standard_scripts[0].id
+            selectscripts: this.props.data && this.props.data.shixun.standard_scripts[0].id
           })
-          this.get_mirror_script(this.props.data.shixun&&this.props.data.shixun.standard_scripts[0].id)
-        }else{
+          this.get_mirror_script(this.props.data && this.props.data.shixun.standard_scripts[0].id)
+        } else {
           this.props.form.setFieldsValue({
-            selectscripts:this.props.data.shixun&&this.props.data.shixun.choice_standard_scripts
+            selectscripts: this.props.data && this.props.data.shixun.choice_standard_scripts
           })
         }
 
         let newlist = ""
-        this.props.data.shixun&&this.props.data.shixun.choice_small_type.map((item, key) => {
-          this.props.data.shixun.small_type.map((i,k)=>{
-            if (item===i.id) {
+        this.props.data && this.props.data.shixun.choice_small_type.map((item, key) => {
+          this.props.data && this.props.data.shixun.small_type.map((i, k) => {
+            if (item === i.id) {
               newlist = newlist + `${i.description}`
             }
           })
@@ -96,23 +98,24 @@ class Shixuninformation extends Component {
           subvalues: newlist
         })
 
-        this.props.data.shixun&&this.props.data.shixun.main_type.map((item,key)=>{
-          if(item.id===this.props.data.shixun&&this.props.data.shixun.choice_main_type){
+        this.props.data && this.props.data.shixun.main_type.map((item, key) => {
+          if (item.id === this.props.data && this.props.data.shixun.choice_main_type) {
             this.setState({
-              mainvalues:item.description,
+              mainvalues: item.description,
             })
           }
         })
 
         this.props.form.setFieldsValue({
-          name:this.props.data.shixun&&this.props.data.shixun.name,
-          trainee: this.props.data.shixun&&this.props.data.shixun.trainee,
-          selectleft: this.props.data.shixun&&this.props.data.shixun.choice_main_type,
-          selectright:this.props.data.shixun&&this.props.data.shixun.choice_small_type,
+          name: this.props.data && this.props.data.shixun.name,
+          trainee: this.props.data && this.props.data.shixun.trainee,
+          selectleft: this.props.data && this.props.data.shixun.choice_main_type,
+          selectright: this.props.data && this.props.data.shixun.choice_small_type,
         })
-        this.contentMdRef.current.setValue(this.props.data.shixun&&this.props.data.shixun.description);
+        this.contentMdRef.current.setValue(this.props.data && this.props.data.shixun.description);
       }
     }
+    }
   }
 
   getshixunmemoMDvalue = (value, e) => {
@@ -754,7 +757,7 @@ class Shixuninformation extends Component {
         return isLt150M;
       },
     }
-    let operateauthority = this.props.identity === 1 ? true : this.props.identity < 5 && this.props.data.shixun&&this.props.data.shixun.status == 0 ? true : false;
+    let operateauthority = this.props.identity === 1 ? true : this.props.identity < 5 && this.props.data&&this.props.data.shixun.status == 0 ? true : false;
     return (
       <div>
         <div className="educontent mb50 edu-back-white padding10-20">

public/react/src/modules/tpm/TPMsettings/TPMsettings.js

@@ -6,6 +6,8 @@ import {
   Modal
 } from 'antd';
 
+import './css/TPMsettings.css';
+
 import TopShixuninformation from './Shixuninformation';
 
 import Configuration from './Configuration';
@@ -14,8 +16,6 @@ import LearningSettings from './LearningSettings';
 
 import axios from 'axios';
 
-import './css/TPMsettings.css';
-
 const {TabPane} = Tabs;
 
 // 处理整点 半点