From 71d7956e6510aaa7173971fbece6198e6c47f37c Mon Sep 17 00:00:00 2001
From: 30404 <3040471803@qq.com>
Date: Thu, 4 Jul 2024 19:38:50 +0800
Subject: [PATCH] 123

---
 .../TeacherPages/Trainmanage/TrainPods.css    |  10 ++
 .../TeacherPages/Trainmanage/TrainPods.jsx    |  11 ++
 .../TeacherPages/Trainmanage/Trainmanage.jsx  |   3 +-
 .../pages/ListPages/Training/Operation1.jsx   |   2 +-
 app-dm/src/pages/SignIn/SignInPage.jsx        |   2 +-
 app-dm/src/router/index.jsx                   |   2 +
 python/assets/type0-pod.yaml                  |   8 +-
 python/assets/type1-pod.yaml                  |   4 +-
 python/del.py                                 |   2 +-
 python/k8s_func.py                            | 134 +++++++++---------
 10 files changed, 102 insertions(+), 76 deletions(-)
 create mode 100644 app-dm/src/TeacherPages/Trainmanage/TrainPods.css
 create mode 100644 app-dm/src/TeacherPages/Trainmanage/TrainPods.jsx

diff --git a/app-dm/src/TeacherPages/Trainmanage/TrainPods.css b/app-dm/src/TeacherPages/Trainmanage/TrainPods.css
new file mode 100644
index 0000000..ab82ec6
--- /dev/null
+++ b/app-dm/src/TeacherPages/Trainmanage/TrainPods.css
@@ -0,0 +1,10 @@
+.body-right-Pods{
+    width: 1420px;
+    height: 830px;
+    position: absolute;
+    top: 72px;
+    left: 220px;
+    border-radius: 10px;
+    float: right;
+    background-color: #f7f8fa;
+}
\ No newline at end of file
diff --git a/app-dm/src/TeacherPages/Trainmanage/TrainPods.jsx b/app-dm/src/TeacherPages/Trainmanage/TrainPods.jsx
new file mode 100644
index 0000000..6ac5723
--- /dev/null
+++ b/app-dm/src/TeacherPages/Trainmanage/TrainPods.jsx
@@ -0,0 +1,11 @@
+import React, { useEffect, useState } from 'react';
+import axios from 'axios';
+import './TrainPods.css'
+
+function TrainPods(){
+    return(
+        <div className='body-right-Pods'>asdas</div>
+    )
+}
+
+export default TrainPods
\ No newline at end of file
diff --git a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
index 7a62671..0b83b8a 100644
--- a/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
+++ b/app-dm/src/TeacherPages/Trainmanage/Trainmanage.jsx
@@ -28,7 +28,7 @@ function TrainManage(){
             <p>已批改的试卷</p>
             <div className='line'></div>
             {Data&&<div className='train-list-trainmanage'>
-                <ul className='ul1-trainmanage'>    
+                <ul className='ul1-trainmanage'>
                     <li>
                         <span>111</span>
                         <p>关闭时间：2024-11-5</p>
@@ -48,6 +48,7 @@ function TrainManage(){
                         <p>关闭时间：2024-11-5</p>
                     </li>
                 </ul>
+                <Link to='/teacher/trainmanage/TrainPods' >管理实训</Link>
                 <Link to='/teacher/SendTrain' className='sendtestpage'>前往发布实训</Link>
             </div>}
             <button onClick={()=>{
diff --git a/app-dm/src/pages/ListPages/Training/Operation1.jsx b/app-dm/src/pages/ListPages/Training/Operation1.jsx
index d88685b..541424f 100644
--- a/app-dm/src/pages/ListPages/Training/Operation1.jsx
+++ b/app-dm/src/pages/ListPages/Training/Operation1.jsx
@@ -254,7 +254,7 @@ function Operation1() {
                             </ul>
                         )}
                     </li>
-                    <Link to={`/operation2/1`} style={{color:'#000',textDecoration:'none'}}>
+                    <Link to={`/operation2/${operateID}`} style={{color:'#000',textDecoration:'none'}}>
                         <li style={{ marginTop: isSubjectDropdownOpen ? '186px' : '0' }}>实训题</li>
                     </Link>
                 </ul>
diff --git a/app-dm/src/pages/SignIn/SignInPage.jsx b/app-dm/src/pages/SignIn/SignInPage.jsx
index ed8855b..62df8c2 100644
--- a/app-dm/src/pages/SignIn/SignInPage.jsx
+++ b/app-dm/src/pages/SignIn/SignInPage.jsx
@@ -21,7 +21,7 @@ function SignInPage(){
                 if (data.result === '登录成功' && data.user==='user'){
                     localStorage.setItem('islogin',ID)
                     alert('用户登录成功')
-                    window.location.href=''//后期改成学生页面
+                    window.location.href='/'//后期改成学生页面
                 }else if(data.result==='登录成功'&&data.user==='teacher'){
                     localStorage.setItem('islogin',ID)
                     alert('教师登录成功')
diff --git a/app-dm/src/router/index.jsx b/app-dm/src/router/index.jsx
index c887576..0c531dd 100644
--- a/app-dm/src/router/index.jsx
+++ b/app-dm/src/router/index.jsx
@@ -27,6 +27,7 @@ import SendTrain from '../TeacherPages/Trainmanage/SendTrain'
 import TrainManage from '../TeacherPages/Trainmanage/Trainmanage'
 import StudentLink from '../TeacherPages/MarkingPages/StudentLink';
 import Test from '../TeacherPages/TestManage/Test'
+import TrainPods from '../TeacherPages/Trainmanage/TrainPods'
 
 
 // 定义一个组件来包裹除了特定页面(exam)外的所有页面使其有导航
@@ -64,6 +65,7 @@ function App() {
             <Route path='managetest' element={<ManageTest />}/> {/* 考试管理 */}
             <Route path="classID/:key" element={<ClassID />} /> {/* 班级管理1 */}
             <Route path='mark/studentlink/Mark/:key' element={<StudentLink/>}/> {/* 批改1 */}
+            <Route path='trainmanage/TrainPods' element={<TrainPods/> }/>
             {/* 其他需要HeaderNavTeacher的页面 */}
           </Route>
 
diff --git a/python/assets/type0-pod.yaml b/python/assets/type0-pod.yaml
index 025d8fa..f9f71e1 100644
--- a/python/assets/type0-pod.yaml
+++ b/python/assets/type0-pod.yaml
@@ -17,8 +17,8 @@ spec:
         runAsGroup: 0
       resources:
         limits:
-          cpu: '0.5'
-          memory: 0.5Gi
+          cpu: '1'
+          memory: 1.2Gi
         requests:
-          cpu: '0.3'
-          memory: 0.3Gi
\ No newline at end of file
+          cpu: '0.2'
+          memory: 0.2Gi
\ No newline at end of file
diff --git a/python/assets/type1-pod.yaml b/python/assets/type1-pod.yaml
index 268be01..837e33e 100644
--- a/python/assets/type1-pod.yaml
+++ b/python/assets/type1-pod.yaml
@@ -15,8 +15,8 @@ spec:
         runAsGroup: 0
       resources:
         limits:
-          cpu: '0.5'
-          memory: 0.5Gi
+          cpu: '1.3'
+          memory: 1.3Gi
         requests:
           cpu: '0.3'
           memory: 0.3Gi
\ No newline at end of file
diff --git a/python/del.py b/python/del.py
index 2dd7ca8..0eb97a3 100644
--- a/python/del.py
+++ b/python/del.py
@@ -1,5 +1,5 @@
 import k8s_func
-studentList=['n20240101-55']
+studentList=['n20240101-56','n20240102-56','s20240101-52','s20240102-52']
 
 for i in studentList:
     k8s_func.delete_pod(i)
diff --git a/python/k8s_func.py b/python/k8s_func.py
index 0c7a30b..c9f76e7 100644
--- a/python/k8s_func.py
+++ b/python/k8s_func.py
@@ -5,6 +5,7 @@ import yaml
 from kubernetes import client, config
 from flask import jsonify
 import dmPython
+
 # Load in-cluster config
 
 config.load_incluster_config()
@@ -12,81 +13,82 @@ v1 = client.CoreV1Api()
 namespace = open("/var/run/secrets/kubernetes.io/serviceaccount/namespace").read()
 IP = "36.138.114.105"
 
+
 def list_pods():
-	ret = v1.list_namespaced_pod(namespace, watch=False)
-	return ({
-		"list": [{
-			"name": item.metadata.name,
-			"ip": item.status.pod_ip
-		} for item in ret.items]
-	})
+    ret = v1.list_namespaced_pod(namespace, watch=False)
+    return ({
+        "list": [{
+            "name": item.metadata.name,
+            "ip": item.status.pod_ip
+        } for item in ret.items]
+    })
+
 
 def list_services():
-	ret = v1.list_namespaced_service(namespace)
-	return {
-		"list": [{
-			"ip": item.spec.cluster_ip,
-			"name": item.metadata.name,
-			"ports": [port.to_dict() for port in item.spec.ports]
-		} for item in ret.items]
-	}
+    ret = v1.list_namespaced_service(namespace)
+    return {
+        "list": [{
+            "ip": item.spec.cluster_ip,
+            "name": item.metadata.name,
+            "ports": [port.to_dict() for port in item.spec.ports]
+        } for item in ret.items]
+    }
+
 
 def create_pod(type, name):
-	# 读取 pod yaml 文件
-	with open(f"assets/type{type}-pod.yaml") as f:
-		pod_manifest = yaml.safe_load(f)
-	pod_manifest["metadata"]["name"] = name
-	pod_manifest["metadata"]["labels"]["app"] = name
-	# 创建 Pod
-	resp = v1.create_namespaced_pod(
-		body=pod_manifest,
-		namespace=namespace
-	)
-	# print(f"pod '{resp.metadata.name}' 创建成功")
-	# 创建 Service
-	with open(f"assets/type{type}-service.yaml") as f:
-		service_pod = yaml.safe_load(f)
-	service_pod["metadata"]["name"] = name + "-service"
-	service_pod["spec"]["selector"]["app"] = name
+    # 读取 pod yaml 文件
+    with open(f"assets/type{type}-pod.yaml") as f:
+        pod_manifest = yaml.safe_load(f)
+    pod_manifest["metadata"]["name"] = name
+    pod_manifest["metadata"]["labels"]["app"] = name
+    # 创建 Pod
+    resp = v1.create_namespaced_pod(
+        body=pod_manifest,
+        namespace=namespace
+    )
+    # print(f"pod '{resp.metadata.name}' 创建成功")
+    # 创建 Service
+    with open(f"assets/type{type}-service.yaml") as f:
+        service_pod = yaml.safe_load(f)
+    service_pod["metadata"]["name"] = name + "-service"
+    service_pod["spec"]["selector"]["app"] = name
+
+    resp = v1.create_namespaced_service(
+        body=service_pod,
+        namespace=namespace
+    )
+    # print(f"服务 '{resp.metadata.name}' 创建成功")
+    if type == 1:
+        # 创建成功，再次查询，拿到端口
+        service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
+    # print(service)
+    # print("访问地址:" + IP + ":" + str(service.spec.ports[0].node_port))
+    else:
+        service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
+    # print(service)
+    # print("访问地址:" + IP + ":" + str(service.spec.ports[0].node_port))
+    return "cjcg"
 
-	resp = v1.create_namespaced_service(
-		body=service_pod,
-		namespace=namespace
-	)
-	# print(f"服务 '{resp.metadata.name}' 创建成功")
-	if type == 1:
-		# 创建成功，再次查询，拿到端口
-		service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
-		# print(service)
-		# print("访问地址:" + IP + ":" + str(service.spec.ports[0].node_port))
-	else:
-		service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
-		# print(service)
-		# print("访问地址:" + IP + ":" + str(service.spec.ports[0].node_port))
-	return "cjcg"
 
 # create_pod(0,'20240101-zt-9-0')
 
 def delete_pod(name):
-	v1.delete_namespaced_pod(name=name, namespace=namespace)
-	print('deleting pod ' + name)
-	v1.delete_namespaced_service(name=name + "-service", namespace=namespace)
-	return "删除成功"
+    v1.delete_namespaced_pod(name=name, namespace=namespace)
+    print('deleting pod ' + name)
+    v1.delete_namespaced_service(name=name + "-service", namespace=namespace)
+    return "删除成功"
+
 
 def check_dm(name):
-	try:
-		service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
-		print(service.spec.cluster_ip)
-		db = dmPython.connect(user='SYSDBA', password='SYSDBA', host=service.spec.cluster_ip)
-		cursor = db.cursor()
-		records = cursor.execute("SELECT * FROM V$VERSION").fetchall()
-		for record in records:
-			print(record)
-		return "OK"
-	except:
-		traceback.print_exc()
-		return "NO"
-
-
-
-
+    try:
+        service = v1.read_namespaced_service(name=name + "-service", namespace=namespace)
+        print(service.spec.cluster_ip)
+        db = dmPython.connect(user='SYSDBA', password='SYSDBA', host=service.spec.cluster_ip)
+        cursor = db.cursor()
+        records = cursor.execute("SELECT * FROM V$VERSION").fetchall()
+        for record in records:
+            print(record)
+        return "OK"
+    except:
+        traceback.print_exc()
+        return "NO"