Merge branches 'dev_aliyun' and 'dev_jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/jupyters_controller.rb

@@ -80,4 +80,17 @@ class JupytersController < ApplicationController
         render json: {status: 0}
     end
 
+    def timeinfo_with_tpm
+        shixun = Shixun.find_by(identifier: params[:identifier])
+        info = jupyter_timeinfo_tpm(shixun)
+        render json: {status: 0}.merge(info)
+    end
+
+    def timeinfo_with_tpi
+        myshixun = Myshixun.find_by(identifier: params[:identifier])
+        info = jupyter_timeinfo_tpi(shixun)
+        render json: {status: 0}.merge(info)
+    end
+    
+
 end

app/controllers/myshixuns_controller.rb

@@ -376,7 +376,7 @@ class MyshixunsController < ApplicationController
       # todo: identifier 是以前的密码,用来验证的,新版如果不需要,和中间层协调更改.
       params = {tpiID: "#{@myshixun.try(:id)}", tpiGitURL: "#{git_myshixun_url}", tpmGitURL: "#{git_shixun_url}",
                 identifier: "xinhu1ji2qu3"}
-      uri = "#{shixun_tomcat}/bridge/game/resetTpmRepository"
+      uri = "#{shixun_tomcat}/bridge/game/resetJupyterTpm"
       res = uri_post uri, params
       if (res && res['code'] != 0)
         tip_exception("实训云平台繁忙（繁忙等级：95）")

app/services/jupyter_service.rb

@@ -213,4 +213,27 @@ module JupyterService
         _jupyter_active(tpiID)
     end
 
+    def _jupyter_timeinfo(tpiID)
+        shixun_tomcat = edu_setting('cloud_bridge')
+        uri = "#{shixun_tomcat}/bridge/jupyter/getTimeInfo"
+        params = {:tpiID => tpiID}
+        res = uri_post uri, params
+        if res && res['code'].to_i != 0
+            raise("实训云平台繁忙（繁忙等级：130）")
+        end
+
+        res['data']
+    end
+
+    # 获取时间参数
+    def jupyter_timeinfo_tpm(shixun)
+      tpiID = "tpm#{shixun.id}"
+      _jupyter_timeinfo(tpiID)
+    end
+
+    # 获取时间参数
+    def jupyter_timeinfo_tpi(myshixun)
+      tpiID = myshixun.id 
+      _jupyter_timeinfo(tpiID)
+    end
 end

config/routes.rb

@@ -35,6 +35,8 @@ Rails.application.routes.draw do
         get :reset_with_tpm
         get :active_with_tpm
         get :active_with_tpi
+        get :timeinfo_with_tpm
+        get :timeinfo_with_tpi
 
         post :import_with_tpm
       end