app/domain/solution.py

@@ -21,11 +21,14 @@ class Solution:
         self.toolkitType = None
         self.starCount = None
         self.viewCount = None
+        self.commentCount = None
         self.createdDate = None
         self.modifiedDate = None
-        self.hasWeb =None
+        self.hasWeb = None
+        self.usePythonFrontend = None
         self.deployStatus = None
         self.deployer = None
         self.deployDate = None
         self.k8sPort = None
         self.callCount = None
+        self.description = ''

app/service/deploy_service.py

@@ -338,10 +338,16 @@ def create_service(task, namespace):
             },
             'ports': [{
                 'port': 80,
-                'targetPort': 80
+                'targetPort': 80,
+                'name': 'serviceboot'
+            }, {
+                'port': 7860,
+                'targetPort': 7860,
+                'name': 'gradio'
             }],
         }
     }
+
     try:
         g.k8s_client.core_api.create_namespaced_service(namespace=namespace, body=body)
     except:
@@ -368,7 +374,11 @@ def save_deployment(task, namespace, use_edge):
     solution = Solution()
     solution.__dict__ = res['value']['results'][0]
     solution.deployer = task.userLogin
-    solution.k8sPort = k8s_status.spec.ports[0].node_port if not use_edge else 1
+
+    k8s_port = f'{k8s_status.spec.ports[0].node_port}'
+    if solution.usePythonFrontend:
+        k8s_port = f'{k8s_port},{k8s_status.spec.ports[1].node_port}'
+    solution.k8sPort = k8s_port if not use_edge else 'edge'
     solution.deployStatus = '运行'
 
     res = umm_client.deploy_solution(solution, jwt=g.oauth_client.get_jwt())

app/service/lcm_service.py

@@ -1,3 +1,4 @@
+import redis
 from serviceboot import token_service
 from app.utils.file_tools import replace_special_char
 from app.service import umm_client
@@ -170,6 +171,9 @@ def stop_deployment(**args):
         g.k8s_client.apps_api.delete_namespaced_deployment(name, namespace)
         g.k8s_client.core_api.delete_namespaced_service(name, namespace)
 
+        redis_conn = redis.Redis(connection_pool=g.redis_pool)
+        redis_conn.delete('k8sport_' + solution.uuid)
+
         umm_client.update_solution_deploy_status(solution.id, '停止', g.oauth_client.get_jwt())
     except:
         raise Exception('停止k8s实体失败')