Merge branch 'dev' into dev_terminal_split

WeBankPartners · Jan 7, 2025 · 725e508 · 725e508
2 parents 95a81ae + 14f3066
commit 725e508
Show file tree

Hide file tree

Showing 8 changed files with 19,776 additions and 42 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,4 +16,5 @@ api/terminal/build/*
 # ui
 ui/node_modules
 ui/dist
+ui/.env
 ui/vue.config.js
diff --git a/api/terminal/etc/gunicorn.py b/api/terminal/etc/gunicorn.py
@@ -18,7 +18,7 @@
 bind = '%s:%d' % (CONF.server.bind, CONF.server.port)
 backlog = CONF.server.backlog
 # 超时
-timeout = 30
+timeout = 30*60
 # 进程数
 workers = max(multiprocessing.cpu_count() * 2, 8)
 # 指定每个进程开启的线程数

diff --git a/api/terminal/terminal/common/s3.py b/api/terminal/terminal/common/s3.py
@@ -41,7 +41,7 @@ def parse_url(url):
 
     def upload_file(self, bucket, object_key, filepath):
         endpoint_info = self.parse_url(self.endpoint)
-        client = minio.Minio(self.endpoint, self.access_key, self.secret_key, secure=endpoint_info['secure'])
+        client = minio.Minio(endpoint_info['host'], self.access_key, self.secret_key, secure=endpoint_info['secure'])
         return client.fput_object(bucket, object_key, filepath)
 
     def download_file(self, url, filepath):

diff --git a/api/terminal/terminal/server/uploader.py b/api/terminal/terminal/server/uploader.py
@@ -28,7 +28,10 @@ def upload(session_id, filepath, endpoint, ak, sk, bucket, object_key):
     if not os.path.exists(filepath):
         return
     client = s3.S3Client(endpoint, ak, sk)
-    fullurl = '/'.join(['http://' + endpoint.rstrip('/'), bucket, object_key])
+    urlprefix = endpoint.rstrip('/')
+    if not urlprefix.startswith('http'):
+        urlprefix = 'http://' + urlprefix
+    fullurl = '/'.join([urlprefix, bucket, object_key])
     try:
         client.upload_file(bucket, object_key, filepath)
         resource.SessionRecord().update(session_id, {'filepath': fullurl})

diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/package.json b/ui/package.json
@@ -72,8 +72,8 @@
     "rimraf": "^2.6.0",
     "sass": "^1.77.5",
     "sass-loader": "^7.1.0",
-    "semver": "^5.3.0",
-    "shelljs": "^0.7.6",
+    "semver": "^5.7.2",
+    "shelljs": "^0.8.5",
     "style-resources-loader": "^1.3.2",
     "uglifyjs-webpack-plugin": "^1.1.1",
     "url-loader": "^1.1.2",

diff --git a/ui/src/pages/components/table-page/table.vue b/ui/src/pages/components/table-page/table.vue
@@ -990,7 +990,7 @@ export default {
   margin: 2px 4px;
   line-height: 18px;
 }
-.multiFilter ::deep.ivu-checkbox-group-item {
+.multiFilter ::v-deep .ivu-checkbox-group-item {
   display: block;
   padding: 0 16px;
   margin: 0;
@@ -1114,9 +1114,11 @@ export default {
   .cell {
     overflow: hidden;
   }
-  ::deep .ivu-tooltip-rel {
+
+  /deep/ .ivu-tooltip-rel {
     display: block;
   }
+
   .poplableSty {
     // max-width: 150px;
     overflow: hidden;

diff --git a/ui/vue.config.js b/ui/vue.config.js
@@ -1,6 +1,6 @@
 const CompressionPlugin = require('compression-webpack-plugin')
 const path = require('path')
-const baseUrl = ''
+const baseUrl = process.env.TARGET
 module.exports = {
   devServer: {
     // hot: true,
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,4 +16,5 @@ api/terminal/build/* @@
     # ui
     ui/node_modules
     ui/dist
+    ui/.env
     ui/vue.config.js