Merge pull request #1106 from kl7sn/main

clickvisual · Nov 21, 2023 · 32af262 · 32af262
2 parents 3a30496 + df9fe53
commit 32af262
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/apis.yml b/.github/workflows/apis.yml
@@ -20,7 +20,7 @@ jobs:
         run: |
           export PATH=$(go env GOPATH)/bin:$PATH
           go version 
-          go install github.com/gotomicro/eapi/cmd/eapi@main
+          go install github.com/gotomicro/eapi/cmd/eapi@v0.4.6
           eapi --config eapi.yaml
       - name: install redoc
         run: npm i -g redoc-cli

diff --git a/api/internal/router/router.go b/api/internal/router/router.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"time"
 
 	"github.com/gotomicro/ego/core/econf"
 	"github.com/gotomicro/ego/server/egin"
@@ -38,9 +39,10 @@ func GetServerRouter() *egin.Component {
 		}
 		maxAge := econf.GetInt("server.http.maxAge")
 		if maxAge == 0 {
-			maxAge = 86400
+			maxAge = 31536000
 		}
-		c.Header("Cache-Control", fmt.Sprintf("public, max-age=%d", maxAge))
+		c.Header("Cache-Control", fmt.Sprintf("public, max-age=%d, public", maxAge))
+		c.Header("Expires", time.Now().AddDate(1, 0, 0).Format("Mon, 01 Jan 2006 00:00:00 GMT"))
 		path := strings.Replace(c.Request.URL.Path, appSubUrl, "", 1)
 		c.FileFromFS(path, invoker.Gin.HTTPEmbedFs())
 	}))

diff --git a/ui/src/components/JsonView/JsonStringValue/index.tsx b/ui/src/components/JsonView/JsonStringValue/index.tsx
@@ -1,6 +1,6 @@
 import jsonViewStyles from "@/components/JsonView/index.less";
 import classNames from "classnames";
-import { LOGMAXTEXTLENGTH } from "@/config/config";
+import {LOGMAXTEXTLENGTH, LOGMAXTEXTLENGTHUnParse} from "@/config/config";
 import { Button, message } from "antd";
 import { useState } from "react";
 import { useIntl } from "umi";
@@ -205,6 +205,9 @@ const JsonStringValue = ({
 };
 
 const splitRawLogString = (str: string): string[] => {
+  if(str.length>LOGMAXTEXTLENGTHUnParse){
+    return [str]
+  }
   const result: string[] = [];
   const strLen = str.length;
 

diff --git a/ui/src/config/config.ts b/ui/src/config/config.ts
@@ -69,6 +69,7 @@ export const LANG_CN = "zh-CN";
 
 // 不展开日志最大长度
 export const LOGMAXTEXTLENGTH = 500;
+export const LOGMAXTEXTLENGTHUnParse = 5120;
 
 // // 默认链路日志查询条数
 export const LINKLOGS_PAGESIZE = 50;

diff --git a/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/DatabaseItem/index.tsx b/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/DatabaseItem/index.tsx
@@ -130,7 +130,11 @@ const DatabaseItem = (props: { databasesItem: any; onGetList: any }) => {
       </div>
     </div>
   );
-
+    let nameDesc = databasesItem.databaseName;
+    if (databasesItem.desc) {
+        // 只取desc前7个字符
+        nameDesc += " (" + databasesItem.desc.substring(0, 7) + ")";
+    }
   return (
     <Dropdown menu={{ items: items }} trigger={["contextMenu"]}>
       <Tooltip
@@ -148,7 +152,7 @@ const DatabaseItem = (props: { databasesItem: any; onGetList: any }) => {
           }}
         >
           <IconFont type="icon-database" style={{ marginRight: "4px" }} />
-          {databasesItem.databaseName}
+          {nameDesc}
         </div>
       </Tooltip>
     </Dropdown>

diff --git a/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/InstanceItem/index.tsx b/ui/src/pages/DataLogs/components/DataSourceMenu/LogLibraryList/InstanceItem/index.tsx
@@ -59,6 +59,11 @@ const InstanceItem = (props: { instanceItem: any }) => {
     },
   ];
 
+  let nameDesc = instanceItem.instanceName;
+  if (instanceItem.desc) {
+    // 只取desc前7个字符
+    nameDesc += " (" + instanceItem.desc.substring(0, 7) + ")";
+  }
   return (
     <Dropdown menu={{ items: menuList }} trigger={["contextMenu"]}>
       <Tooltip
@@ -76,7 +81,7 @@ const InstanceItem = (props: { instanceItem: any }) => {
           }}
         >
           <IconFont type="icon-instance" style={{ marginRight: "4px" }} />
-          {instanceItem.instanceName} {instanceItem.desc}
+          {nameDesc}
         </div>
       </Tooltip>
     </Dropdown>