Merge branch 'whyour:develop' into develop

back/services/user.ts

@@ -351,7 +351,7 @@ export default class UserService {
 
   public async getNotificationMode(): Promise<NotificationInfo> {
     const doc = await this.getDb({ type: AuthDataType.notification });
-    return doc.info as NotificationInfo;
+    return (doc.info || {}) as NotificationInfo;
   }
 
   private async updateAuthDb(payload: SystemInfo): Promise<any> {

sample/notify.js

@@ -97,7 +97,6 @@ const push_config = {
   WEBHOOK_CONTENT_TYPE: '', // 自定义通知 content-type
 };
 
-// 首先读取 面板变量 或者 github action 运行变量
 for (const key in push_config) {
   const v = process.env[key];
   if (v) {
@@ -1290,7 +1289,7 @@ async function sendNotify(text, desp, params = {}) {
     }
   }
 
-  if (push_config.HITOKOTO) {
+  if (push_config.HITOKOTO !== 'false') {
     desp += '\n\n' + (await one());
   }
 

sample/notify.py

@@ -120,7 +120,6 @@ push_config = {
 }
 # fmt: on
 
-# 首先读取 面板变量 或者 github action 运行变量
 for k in push_config:
     if os.getenv(k):
         v = os.getenv(k)
@@ -962,7 +961,7 @@ def send(title: str, content: str, ignore_default_config: bool = False, **kwargs
             return
 
     hitokoto = push_config.get("HITOKOTO")
-    content += "\n\n" + one() if hitokoto else ""
+    content += "\n\n" + one() if hitokoto != "false" else ""
 
     notify_function = add_notify_function()
     ts = [

src/pages/crontab/index.tsx

@@ -57,6 +57,7 @@ import { useVT } from 'virtualizedtableforantd4';
 import { ICrontab, OperationName, OperationPath, CrontabStatus } from './type';
 import Name from '@/components/name';
 import dayjs from 'dayjs';
+import { noop } from 'lodash';
 
 const { Text, Paragraph, Link } = Typography;
 const { Search } = Input;
@@ -76,7 +77,7 @@ const Crontab = () => {
             wordBreak: 'break-all',
             marginBottom: 0,
             color: '#1890ff',
-            cursor: 'pointer'
+            cursor: 'pointer',
           }}
           ellipsis={{ tooltip: text, rows: 2 }}
           onClick={() => {
@@ -270,9 +271,14 @@ const Crontab = () => {
         record.sub_id ? (
           <Name
             service={() =>
-              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`)
+              request.get(`${config.apiPrefix}subscriptions/${record.sub_id}`, {
+                onError: noop,
+              })
             }
-            options={{ ready: record?.sub_id, cacheKey: record.sub_id }}
+            options={{
+              ready: record?.sub_id,
+              cacheKey: record.sub_id,
+            }}
           />
         ) : (
           '-'

src/utils/http.ts

@@ -1,29 +1,44 @@
-import intl from 'react-intl-universal'
+import intl from 'react-intl-universal';
 import { message } from 'antd';
 import config from './config';
 import { history } from '@umijs/max';
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios';
+import axios, {
+  AxiosError,
+  AxiosInstance,
+  AxiosRequestConfig,
+  AxiosResponse,
+  InternalAxiosRequestConfig,
+} from 'axios';
 
-interface IResponseData {
+export interface IResponseData {
   code?: number;
   data?: any;
   message?: string;
   error?: any;
 }
 
-type Override<
+export type Override<
   T,
   K extends Partial<{ [P in keyof T]: any }> | string,
 > = K extends string
   ? Omit<T, K> & { [P in keyof T]: T[P] | unknown }
   : Omit<T, keyof K> & K;
 
+export interface ICustomConfig {
+  onError?: (res: AxiosResponse<unknown, any>) => void;
+}
+
 message.config({
   duration: 2,
 });
 
 const time = Date.now();
-const errorHandler = function (error: AxiosError) {
+const errorHandler = function (
+  error: Override<
+    AxiosError<IResponseData>,
+    { config: InternalAxiosRequestConfig & ICustomConfig }
+  >,
+) {
   if (error.response) {
     const msg = error.response.data
       ? error.response.data.message || error.message || error.response.data
@@ -38,6 +53,10 @@ const errorHandler = function (error: AxiosError) {
         history.push('/login');
       }
     } else {
+      if (typeof error.config?.onError === 'function') {
+        return error.config?.onError(error.response);
+      }
+
       message.error({
         content: msg,
         style: { maxWidth: 500, margin: '0 auto' },
@@ -105,21 +124,21 @@ export const request = _request as Override<
   {
     get<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     delete<T = IResponseData, D = any>(
       url: string,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     post<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
     put<T = IResponseData, D = any>(
       url: string,
       data?: D,
-      config?: AxiosRequestConfig<D>,
+      config?: AxiosRequestConfig<D> & ICustomConfig,
     ): Promise<T>;
   }
 >;