diff --git a/cmd/server/docs/docs.go b/cmd/server/docs/docs.go index ffbdad852..5c276bf90 100644 --- a/cmd/server/docs/docs.go +++ b/cmd/server/docs/docs.go @@ -24555,7 +24555,7 @@ const docTemplate = `{ }, "securityDefinitions": { "ApiKeyAuth": { - "description": "Custom Token Format, Format: md5('1panel' + 1Panel-Token + 1Panel-Timestamp).\n` + "`" + `` + "`" + `` + "`" + `\neg:\ncurl -X GET \"http://localhost:4004/api/v1/resource\" \\\n-H \"1Panel-Token: \u003c1panel_token\u003e\" \\\n-H \"1Panel-Timestamp: \u003ccurrent_unix_timestamp\u003e\"\n` + "`" + `` + "`" + `` + "`" + `\n- ` + "`" + `1Panel-Token` + "`" + ` is the key for the panel API interface.", + "description": "Custom Token Format, Format: md5('1panel' + API-Key + UnixTimestamp).\n` + "`" + `` + "`" + `` + "`" + `\neg:\ncurl -X GET \"http://localhost:4004/api/v1/resource\" \\\n-H \"1Panel-Token: \u003c1panel_token\u003e\" \\\n-H \"1Panel-Timestamp: \u003ccurrent_unix_timestamp\u003e\"\n` + "`" + `` + "`" + `` + "`" + `\n- ` + "`" + `1Panel-Token` + "`" + ` is the key for the panel API Key.", "type": "apiKey", "name": "1Panel-Token", "in": "Header" diff --git a/cmd/server/docs/swagger.json b/cmd/server/docs/swagger.json index 974eb3ae8..5a841ba89 100644 --- a/cmd/server/docs/swagger.json +++ b/cmd/server/docs/swagger.json @@ -24552,7 +24552,7 @@ }, "securityDefinitions": { "ApiKeyAuth": { - "description": "Custom Token Format, Format: md5('1panel' + 1Panel-Token + 1Panel-Timestamp).\n```\neg:\ncurl -X GET \"http://localhost:4004/api/v1/resource\" \\\n-H \"1Panel-Token: \u003c1panel_token\u003e\" \\\n-H \"1Panel-Timestamp: \u003ccurrent_unix_timestamp\u003e\"\n```\n- `1Panel-Token` is the key for the panel API interface.", + "description": "Custom Token Format, Format: md5('1panel' + API-Key + UnixTimestamp).\n```\neg:\ncurl -X GET \"http://localhost:4004/api/v1/resource\" \\\n-H \"1Panel-Token: \u003c1panel_token\u003e\" \\\n-H \"1Panel-Timestamp: \u003ccurrent_unix_timestamp\u003e\"\n```\n- `1Panel-Token` is the key for the panel API Key.", "type": "apiKey", "name": "1Panel-Token", "in": "Header" diff --git a/cmd/server/docs/swagger.yaml b/cmd/server/docs/swagger.yaml index 4dc37ade2..1f7c90411 100644 --- a/cmd/server/docs/swagger.yaml +++ b/cmd/server/docs/swagger.yaml @@ -15377,14 +15377,14 @@ schemes: securityDefinitions: ApiKeyAuth: description: |- - Custom Token Format, Format: md5('1panel' + 1Panel-Token + 1Panel-Timestamp). + Custom Token Format, Format: md5('1panel' + API-Key + UnixTimestamp). ``` eg: curl -X GET "http://localhost:4004/api/v1/resource" \ -H "1Panel-Token: <1panel_token>" \ -H "1Panel-Timestamp: " ``` - - `1Panel-Token` is the key for the panel API interface. + - `1Panel-Token` is the key for the panel API Key. in: Header name: 1Panel-Token type: apiKey diff --git a/cmd/server/main.go b/cmd/server/main.go index aa35dff9c..112c733cb 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -19,14 +19,14 @@ import ( // @schemes http https // @securityDefinitions.apikey ApiKeyAuth -// @description Custom Token Format, Format: md5('1panel' + 1Panel-Token + 1Panel-Timestamp). +// @description Custom Token Format, Format: md5('1panel' + API-Key + UnixTimestamp). // @description ``` // @description eg: // @description curl -X GET "http://localhost:4004/api/v1/resource" \ // @description -H "1Panel-Token: <1panel_token>" \ // @description -H "1Panel-Timestamp: " // @description ``` -// @description - `1Panel-Token` is the key for the panel API interface. +// @description - `1Panel-Token` is the key for the panel API Key. // @type apiKey // @in Header // @name 1Panel-Token diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index a0f22bd20..06e332265 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1425,7 +1425,7 @@ const message = { apiInterfaceAlert2: `Don't use third-party applications to call the API to prevent potential security threats.`, apiInterfaceAlert3: 'API Docs', apiInterfaceAlert4: 'Usage Docs', - apiKey: 'Interface key', + apiKey: 'API key', apiKeyHelper: 'API key is used for third-party applications to access the API.', ipWhiteList: 'IP allowlist', ipWhiteListEgs: 'One per line. For example,\n172.161.10.111\n172.161.10.0/24', diff --git a/frontend/src/styles/element-dark.scss b/frontend/src/styles/element-dark.scss index ece367fb7..34a4e742e 100644 --- a/frontend/src/styles/element-dark.scss +++ b/frontend/src/styles/element-dark.scss @@ -157,9 +157,14 @@ html.dark { border-bottom-color: var(--panel-color-primary); --el-text-color-regular: var(--panel-color-primary); } + .main-container { + .el-loading-mask { + background-color: #24263375; + } + } .el-loading-mask { - background-color: #24263375; + background-color: #5b5e6a75; } .el-input {