diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 79752b30..4be06957 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,5 +1,8 @@ name: Publish Docker Image -on: [push] +on: + push: + tags: + - v* jobs: build: diff --git a/src/layouts/index.less b/src/layouts/index.less index 9fb45c32..aabc4d70 100644 --- a/src/layouts/index.less +++ b/src/layouts/index.less @@ -5,7 +5,6 @@ body { } @import '~codemirror/lib/codemirror.css'; -@import '~codemirror/theme/icecoder.css'; .code-mirror-wrapper .CodeMirror { position: absolute; diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx index d83e3004..3252f929 100644 --- a/src/layouts/index.tsx +++ b/src/layouts/index.tsx @@ -67,6 +67,7 @@ export default function (props: any) { { icon: , name: '退出登录', + path: 'logout', onTitleClick: () => logout(), }, ]; diff --git a/src/pages/code/index.tsx b/src/pages/code/index.tsx index 93a71195..f7818c39 100644 --- a/src/pages/code/index.tsx +++ b/src/pages/code/index.tsx @@ -63,7 +63,6 @@ const Crontab = () => { styleActiveLine: true, matchBrackets: true, mode: 'shell', - theme: 'icecoder', readOnly: true, }} onBeforeChange={(editor, data, value) => { diff --git a/src/pages/config/index.tsx b/src/pages/config/index.tsx index 6e258712..9618188f 100644 --- a/src/pages/config/index.tsx +++ b/src/pages/config/index.tsx @@ -81,7 +81,6 @@ const Config = () => { styleActiveLine: true, matchBrackets: true, mode: 'shell', - theme: 'icecoder', }} onBeforeChange={(editor, data, value) => { setValue(value); diff --git a/src/pages/cookie/modal.tsx b/src/pages/cookie/modal.tsx index a04ccc2a..ad07ffae 100644 --- a/src/pages/cookie/modal.tsx +++ b/src/pages/cookie/modal.tsx @@ -15,10 +15,24 @@ const CookieModal = ({ const [form] = Form.useForm(); const handleOk = async (values: any) => { + const cookies = values.cookie + .split('\n') + .map((x: any) => x.trim().replace(/\s/g, '')); + let flag = false; + for (const coo of cookies) { + if (!/pt_key=\S*;\s*pt_pin=\S*;\s*/.test(coo)) { + notification.error({ message: `${coo}格式有误` }); + flag = true; + break; + } + } + if (flag) { + return; + } const method = cookie ? 'put' : 'post'; const payload = cookie - ? { cookie: values.cookie, oldCookie: cookie } - : { cookies: values.cookie.split('\n') }; + ? { cookie: cookies[0], oldCookie: cookie } + : { cookies }; const { code, data } = await request[method](`${config.apiPrefix}cookie`, { data: payload, }); @@ -62,13 +76,14 @@ const CookieModal = ({ rules={[ { required: true, message: '请输入Cookie' }, { - pattern: /[pt_pin=|pt_key=](.+?);[pt_pin=|pt_key=](.+?);/, + pattern: /pt_key=\S*;\s*pt_pin=\S*;\s*/, message: 'Cookie格式错误,注意分号(pt_key=***;pt_pin=***;)', }, ]} > diff --git a/src/pages/crontab/index.tsx b/src/pages/crontab/index.tsx index 8777b993..3ff81419 100644 --- a/src/pages/crontab/index.tsx +++ b/src/pages/crontab/index.tsx @@ -80,7 +80,6 @@ const Crontab = () => { styleActiveLine: true, matchBrackets: true, mode: 'shell', - theme: 'icecoder', }} onBeforeChange={(editor, data, value) => { setValue(value); diff --git a/src/pages/diy/index.tsx b/src/pages/diy/index.tsx index 0a2d786e..348071c4 100644 --- a/src/pages/diy/index.tsx +++ b/src/pages/diy/index.tsx @@ -80,7 +80,6 @@ const Crontab = () => { styleActiveLine: true, matchBrackets: true, mode: 'shell', - theme: 'icecoder', }} onBeforeChange={(editor, data, value) => { setValue(value); diff --git a/src/pages/log/index.tsx b/src/pages/log/index.tsx index 278836bc..2cd67963 100644 --- a/src/pages/log/index.tsx +++ b/src/pages/log/index.tsx @@ -108,7 +108,6 @@ const Log = () => { styleActiveLine: true, matchBrackets: true, mode: 'shell', - theme: 'icecoder', readOnly: true, }} onBeforeChange={(editor, data, value) => {