From e42ff57cb436969bff04acda51f427889ecd2b5a Mon Sep 17 00:00:00 2001 From: DIYgod Date: Thu, 7 Mar 2024 00:39:42 +0800 Subject: [PATCH] feat: replace require with import 5/n --- lib/routes/cs/router.ts | 11 ++--------- lib/routes/cs/zzkx.ts | 6 ++++++ lib/routes/dxy/profile/thread.ts | 2 +- lib/routes/gov/dianbai/dianbai.ts | 2 +- lib/routes/gov/gaozhou/gaozhou.ts | 2 +- lib/routes/gov/general/general.ts | 2 +- lib/routes/gov/huazhou/huazhou.ts | 2 +- lib/routes/gov/maoming/maoming.ts | 2 +- lib/routes/gov/mgs/mgs.ts | 2 +- lib/routes/gov/mmht/mmht.ts | 2 +- lib/routes/gov/sdb/sdb.ts | 2 +- lib/routes/gov/xinyi/xinyi.ts | 2 +- lib/routes/hunau/gfxy/index.ts | 2 +- lib/routes/hunau/xky/index.ts | 2 +- lib/routes/instagram/private-api/index.ts | 2 +- lib/routes/instagram/web-api/index.ts | 2 +- lib/routes/nuaa/college/cae.ts | 2 +- lib/routes/nuaa/college/cs.ts | 2 +- lib/routes/nuaa/jwc/jwc.ts | 2 +- lib/routes/nuaa/yjsy/yjsy.ts | 2 +- lib/routes/oeeee/app/channel.ts | 2 +- lib/routes/oeeee/app/reporter.ts | 2 +- lib/routes/pixiv/api/get-bookmarks.ts | 2 +- lib/routes/pixiv/api/get-illust-follows.ts | 2 +- lib/routes/pixiv/api/get-illusts.ts | 2 +- lib/routes/pixiv/api/get-ranking.ts | 2 +- lib/routes/pixiv/api/get-user-detail.ts | 2 +- lib/routes/pixiv/api/search-illust.ts | 2 +- lib/routes/pixiv/api/search-popular-illust.ts | 2 +- lib/routes/qoo-app/apps/card.ts | 2 +- lib/routes/qoo-app/apps/comment.ts | 2 +- lib/routes/qoo-app/apps/note.ts | 2 +- lib/routes/qoo-app/apps/post.ts | 2 +- lib/routes/qoo-app/notes/note.ts | 2 +- lib/routes/qoo-app/notes/topic.ts | 2 +- lib/routes/qoo-app/notes/user.ts | 2 +- lib/routes/qoo-app/user/app-comment.ts | 2 +- lib/routes/scnu/announcements-router.ts | 1 + lib/routes/scnu/news-router.ts | 1 + .../scnu/physics-school-announcements-and-news.ts | 6 +++--- lib/routes/scnu/research-news-router.ts | 1 + lib/routes/scnu/router.ts | 6 +++--- lib/routes/sdu/wh/jwc.ts | 2 +- lib/routes/sdu/wh/news.ts | 2 +- lib/routes/segmentfault/utils.ts | 2 +- lib/routes/sina/finance/china.ts | 2 +- lib/routes/sina/finance/stock/usstock.ts | 2 +- lib/routes/twitter/developer-api/search.ts | 2 +- lib/routes/twitter/developer-api/user.ts | 2 +- lib/routes/twitter/web-api/media.ts | 2 +- lib/routes/twitter/web-api/search.ts | 2 +- lib/routes/twitter/web-api/tweet.ts | 2 +- lib/routes/twitter/web-api/user.ts | 2 +- lib/routes/weibo/oasis/user.ts | 2 +- lib/routes/weibo/search/hot.ts | 2 +- lib/routes/zhihu/xhu/activities.ts | 2 +- lib/routes/zhihu/xhu/collection.ts | 2 +- lib/routes/zhihu/xhu/question.ts | 2 +- lib/routes/zhihu/xhu/topic.ts | 2 +- 59 files changed, 69 insertions(+), 67 deletions(-) create mode 100644 lib/routes/cs/zzkx.ts create mode 100644 lib/routes/scnu/announcements-router.ts create mode 100644 lib/routes/scnu/news-router.ts create mode 100644 lib/routes/scnu/research-news-router.ts diff --git a/lib/routes/cs/router.ts b/lib/routes/cs/router.ts index 18c50902b..135bdcc69 100644 --- a/lib/routes/cs/router.ts +++ b/lib/routes/cs/router.ts @@ -1,13 +1,6 @@ -const toZzkx = (ctx) => { - // https://www.cs.com.cn/sylm/jsbd/ - - const redirectTo = '/cs/sylm/jsbd'; - ctx.redirect(redirectTo); -}; - export default (router) => { - router.get('/news/zzkx', toZzkx); - router.get('/zzkx', toZzkx); + router.get('/news/zzkx', './zzkx'); + router.get('/zzkx', './zzkx'); router.get('/video/:category?', './video'); router.get('/:category{.+}?', './'); }; diff --git a/lib/routes/cs/zzkx.ts b/lib/routes/cs/zzkx.ts new file mode 100644 index 000000000..38532bde9 --- /dev/null +++ b/lib/routes/cs/zzkx.ts @@ -0,0 +1,6 @@ +export default (ctx) => { + // https://www.cs.com.cn/sylm/jsbd/ + + const redirectTo = '/cs/sylm/jsbd'; + ctx.redirect(redirectTo); +}; diff --git a/lib/routes/dxy/profile/thread.ts b/lib/routes/dxy/profile/thread.ts index 54182f20c..f4bde617c 100644 --- a/lib/routes/dxy/profile/thread.ts +++ b/lib/routes/dxy/profile/thread.ts @@ -1,7 +1,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { parseDate } from '@/utils/parse-date'; -const { webBaseUrl, generateNonce, sign, getPost } = require('../utils'); +import { webBaseUrl, generateNonce, sign, getPost } from '../utils'; import { config } from '@/config'; export default async (ctx) => { diff --git a/lib/routes/gov/dianbai/dianbai.ts b/lib/routes/gov/dianbai/dianbai.ts index cdfad9723..79637e328 100644 --- a/lib/routes/gov/dianbai/dianbai.ts +++ b/lib/routes/gov/dianbai/dianbai.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/gov/gaozhou/gaozhou.ts b/lib/routes/gov/gaozhou/gaozhou.ts index b30d21a42..bcdf4ccdf 100644 --- a/lib/routes/gov/gaozhou/gaozhou.ts +++ b/lib/routes/gov/gaozhou/gaozhou.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/gov/general/general.ts b/lib/routes/gov/general/general.ts index d134d378a..93ca7e796 100644 --- a/lib/routes/gov/general/general.ts +++ b/lib/routes/gov/general/general.ts @@ -15,7 +15,7 @@ import cache from '@/utils/cache'; // [] hdjlpt 互动交流 // 使用方法 -// const { gdgov } = require('../general/general'); +// import { gdgov } from '../general/general'; // // export default async (ctx) => { // const info = { diff --git a/lib/routes/gov/huazhou/huazhou.ts b/lib/routes/gov/huazhou/huazhou.ts index 84c95aa92..b4ac540c5 100644 --- a/lib/routes/gov/huazhou/huazhou.ts +++ b/lib/routes/gov/huazhou/huazhou.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/gov/maoming/maoming.ts b/lib/routes/gov/maoming/maoming.ts index 4f5c3d755..24870eb6c 100644 --- a/lib/routes/gov/maoming/maoming.ts +++ b/lib/routes/gov/maoming/maoming.ts @@ -1,5 +1,5 @@ import { getSubPath } from '@/utils/common-utils'; -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const path = getSubPath(ctx) diff --git a/lib/routes/gov/mgs/mgs.ts b/lib/routes/gov/mgs/mgs.ts index 9e34f3497..c15747664 100644 --- a/lib/routes/gov/mgs/mgs.ts +++ b/lib/routes/gov/mgs/mgs.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/gov/mmht/mmht.ts b/lib/routes/gov/mmht/mmht.ts index 7787f2954..f34cd17a8 100644 --- a/lib/routes/gov/mmht/mmht.ts +++ b/lib/routes/gov/mmht/mmht.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/gov/sdb/sdb.ts b/lib/routes/gov/sdb/sdb.ts index 9cbf65051..fe548a7a7 100644 --- a/lib/routes/gov/sdb/sdb.ts +++ b/lib/routes/gov/sdb/sdb.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/gov/xinyi/xinyi.ts b/lib/routes/gov/xinyi/xinyi.ts index 0a230aab4..680a04c63 100644 --- a/lib/routes/gov/xinyi/xinyi.ts +++ b/lib/routes/gov/xinyi/xinyi.ts @@ -1,4 +1,4 @@ -const { gdgov } = require('../general/general'); +import { gdgov } from '../general/general'; export default async (ctx) => { const info = { diff --git a/lib/routes/hunau/gfxy/index.ts b/lib/routes/hunau/gfxy/index.ts index 0933eb59d..2465b91c9 100644 --- a/lib/routes/hunau/gfxy/index.ts +++ b/lib/routes/hunau/gfxy/index.ts @@ -1,4 +1,4 @@ -const getContent = require('../utils/common'); +import getContent from '../utils/common'; export default async (ctx) => { await getContent(ctx, { diff --git a/lib/routes/hunau/xky/index.ts b/lib/routes/hunau/xky/index.ts index 27b14da15..6291dcdbb 100644 --- a/lib/routes/hunau/xky/index.ts +++ b/lib/routes/hunau/xky/index.ts @@ -1,4 +1,4 @@ -const getContent = require('../utils/common'); +import getContent from '../utils/common'; export default async (ctx) => { await getContent(ctx, { diff --git a/lib/routes/instagram/private-api/index.ts b/lib/routes/instagram/private-api/index.ts index 6a1bbf8c4..d789e6cee 100644 --- a/lib/routes/instagram/private-api/index.ts +++ b/lib/routes/instagram/private-api/index.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import { ig, login } from './utils'; import logger from '@/utils/logger'; import { config } from '@/config'; -const { renderItems } = require('../common-utils'); +import { renderItems } from '../common-utils'; // loadContent pulls the desired user/tag/etc async function loadContent(category, nameOrId, tryGet) { diff --git a/lib/routes/instagram/web-api/index.ts b/lib/routes/instagram/web-api/index.ts index df77513f8..b1d8fb992 100644 --- a/lib/routes/instagram/web-api/index.ts +++ b/lib/routes/instagram/web-api/index.ts @@ -1,7 +1,7 @@ import cache from '@/utils/cache'; const { CookieJar } = require('tough-cookie'); import { config } from '@/config'; -const { renderItems } = require('../common-utils'); +import { renderItems } from '../common-utils'; import { baseUrl, COOKIE_URL, checkLogin, getUserInfo, getUserFeedItems, getTagsFeedItems, getLoggedOutTagsFeedItems, renderGuestItems } from './utils'; export default async (ctx) => { diff --git a/lib/routes/nuaa/college/cae.ts b/lib/routes/nuaa/college/cae.ts index 7e0c6dc94..f0f5a51ea 100644 --- a/lib/routes/nuaa/college/cae.ts +++ b/lib/routes/nuaa/college/cae.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; -const getCookie = require('../utils/pypasswaf'); +import getCookie from '../utils/pypasswaf'; const host = 'https://cae.nuaa.edu.cn/'; const map = new Map([ diff --git a/lib/routes/nuaa/college/cs.ts b/lib/routes/nuaa/college/cs.ts index 48a0218cf..cfe4731b2 100644 --- a/lib/routes/nuaa/college/cs.ts +++ b/lib/routes/nuaa/college/cs.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; -const getCookie = require('../utils/pypasswaf'); +import getCookie from '../utils/pypasswaf'; const host = 'https://cs.nuaa.edu.cn/'; const map = new Map([ diff --git a/lib/routes/nuaa/jwc/jwc.ts b/lib/routes/nuaa/jwc/jwc.ts index e09c30bdb..7bd79335d 100644 --- a/lib/routes/nuaa/jwc/jwc.ts +++ b/lib/routes/nuaa/jwc/jwc.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; -const getCookie = require('../utils/pypasswaf'); +import getCookie from '../utils/pypasswaf'; const host = 'http://aao.nuaa.edu.cn/'; const map = new Map([ diff --git a/lib/routes/nuaa/yjsy/yjsy.ts b/lib/routes/nuaa/yjsy/yjsy.ts index 5a58f69ce..e2fa4b759 100644 --- a/lib/routes/nuaa/yjsy/yjsy.ts +++ b/lib/routes/nuaa/yjsy/yjsy.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; -const getCookie = require('../utils/pypasswaf'); +import getCookie from '../utils/pypasswaf'; const host = 'http://www.graduate.nuaa.edu.cn/'; const map = new Map([ diff --git a/lib/routes/oeeee/app/channel.ts b/lib/routes/oeeee/app/channel.ts index 10bc81bad..dd4428e59 100644 --- a/lib/routes/oeeee/app/channel.ts +++ b/lib/routes/oeeee/app/channel.ts @@ -5,7 +5,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import timezone from '@/utils/timezone'; import { parseDate } from '@/utils/parse-date'; -const { parseArticle } = require('../utils'); +import { parseArticle } from '../utils'; import { art } from '@/utils/render'; import * as path from 'node:path'; diff --git a/lib/routes/oeeee/app/reporter.ts b/lib/routes/oeeee/app/reporter.ts index c5437791f..8e73c16af 100644 --- a/lib/routes/oeeee/app/reporter.ts +++ b/lib/routes/oeeee/app/reporter.ts @@ -3,7 +3,7 @@ const __dirname = getCurrentPath(import.meta.url); import cache from '@/utils/cache'; import got from '@/utils/got'; -const { parseArticle } = require('../utils'); +import { parseArticle } from '../utils'; import { art } from '@/utils/render'; import * as path from 'node:path'; diff --git a/lib/routes/pixiv/api/get-bookmarks.ts b/lib/routes/pixiv/api/get-bookmarks.ts index d86c030d2..d5efb7ab9 100644 --- a/lib/routes/pixiv/api/get-bookmarks.ts +++ b/lib/routes/pixiv/api/get-bookmarks.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; import queryString from 'query-string'; diff --git a/lib/routes/pixiv/api/get-illust-follows.ts b/lib/routes/pixiv/api/get-illust-follows.ts index a85df3bfd..f1513a2ba 100644 --- a/lib/routes/pixiv/api/get-illust-follows.ts +++ b/lib/routes/pixiv/api/get-illust-follows.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; import queryString from 'query-string'; diff --git a/lib/routes/pixiv/api/get-illusts.ts b/lib/routes/pixiv/api/get-illusts.ts index f0eb858cc..70abfd315 100644 --- a/lib/routes/pixiv/api/get-illusts.ts +++ b/lib/routes/pixiv/api/get-illusts.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; import queryString from 'query-string'; diff --git a/lib/routes/pixiv/api/get-ranking.ts b/lib/routes/pixiv/api/get-ranking.ts index 518a75e3d..cfb441ec9 100644 --- a/lib/routes/pixiv/api/get-ranking.ts +++ b/lib/routes/pixiv/api/get-ranking.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; const assert = require('assert'); import queryString from 'query-string'; diff --git a/lib/routes/pixiv/api/get-user-detail.ts b/lib/routes/pixiv/api/get-user-detail.ts index 7422a3cc7..e5e1e17d8 100644 --- a/lib/routes/pixiv/api/get-user-detail.ts +++ b/lib/routes/pixiv/api/get-user-detail.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; import queryString from 'query-string'; diff --git a/lib/routes/pixiv/api/search-illust.ts b/lib/routes/pixiv/api/search-illust.ts index c361df9b0..5e7a3b65d 100644 --- a/lib/routes/pixiv/api/search-illust.ts +++ b/lib/routes/pixiv/api/search-illust.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; import queryString from 'query-string'; diff --git a/lib/routes/pixiv/api/search-popular-illust.ts b/lib/routes/pixiv/api/search-popular-illust.ts index 6984c4f58..3663b41e8 100644 --- a/lib/routes/pixiv/api/search-popular-illust.ts +++ b/lib/routes/pixiv/api/search-popular-illust.ts @@ -1,4 +1,4 @@ -const got = require('../pixiv-got'); +import got from '../pixiv-got'; const maskHeader = require('../constants').maskHeader; import queryString from 'query-string'; diff --git a/lib/routes/qoo-app/apps/card.ts b/lib/routes/qoo-app/apps/card.ts index f3e32c73c..9f624065b 100644 --- a/lib/routes/qoo-app/apps/card.ts +++ b/lib/routes/qoo-app/apps/card.ts @@ -2,7 +2,7 @@ import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; import timezone from '@/utils/timezone'; -const { appsUrl } = require('../utils'); +import { appsUrl } from '../utils'; export default async (ctx) => { const { id, lang = '' } = ctx.req.param(); diff --git a/lib/routes/qoo-app/apps/comment.ts b/lib/routes/qoo-app/apps/comment.ts index a20a9efa2..fc594bc76 100644 --- a/lib/routes/qoo-app/apps/comment.ts +++ b/lib/routes/qoo-app/apps/comment.ts @@ -5,7 +5,7 @@ import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; import timezone from '@/utils/timezone'; -const { appsUrl } = require('../utils'); +import { appsUrl } from '../utils'; import { art } from '@/utils/render'; import * as path from 'node:path'; diff --git a/lib/routes/qoo-app/apps/note.ts b/lib/routes/qoo-app/apps/note.ts index 14797cace..3a531f80c 100644 --- a/lib/routes/qoo-app/apps/note.ts +++ b/lib/routes/qoo-app/apps/note.ts @@ -3,7 +3,7 @@ import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; import timezone from '@/utils/timezone'; -const { appsUrl } = require('../utils'); +import { appsUrl } from '../utils'; export default async (ctx) => { const { id, lang = '' } = ctx.req.param(); diff --git a/lib/routes/qoo-app/apps/post.ts b/lib/routes/qoo-app/apps/post.ts index e863215c1..d7fd247be 100644 --- a/lib/routes/qoo-app/apps/post.ts +++ b/lib/routes/qoo-app/apps/post.ts @@ -3,7 +3,7 @@ import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; import timezone from '@/utils/timezone'; -const { appsUrl, newsUrl, fixImg } = require('../utils'); +import { appsUrl, newsUrl, fixImg } from '../utils'; export default async (ctx) => { const { id, lang = '' } = ctx.req.param(); diff --git a/lib/routes/qoo-app/notes/note.ts b/lib/routes/qoo-app/notes/note.ts index 5f646e22e..37b584d20 100644 --- a/lib/routes/qoo-app/notes/note.ts +++ b/lib/routes/qoo-app/notes/note.ts @@ -4,7 +4,7 @@ const __dirname = getCurrentPath(import.meta.url); import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; -const { ssoUrl, notesUrl } = require('../utils'); +import { ssoUrl, notesUrl } from '../utils'; import { art } from '@/utils/render'; import * as path from 'node:path'; diff --git a/lib/routes/qoo-app/notes/topic.ts b/lib/routes/qoo-app/notes/topic.ts index 919335c80..939fd389a 100644 --- a/lib/routes/qoo-app/notes/topic.ts +++ b/lib/routes/qoo-app/notes/topic.ts @@ -1,6 +1,6 @@ import got from '@/utils/got'; import { load } from 'cheerio'; -const { notesUrl, extractNotes } = require('../utils'); +import { notesUrl, extractNotes } from '../utils'; export default async (ctx) => { const { topic, lang } = ctx.req.param(); diff --git a/lib/routes/qoo-app/notes/user.ts b/lib/routes/qoo-app/notes/user.ts index 2df802162..386085d29 100644 --- a/lib/routes/qoo-app/notes/user.ts +++ b/lib/routes/qoo-app/notes/user.ts @@ -1,6 +1,6 @@ import got from '@/utils/got'; import { load } from 'cheerio'; -const { notesUrl, extractNotes } = require('../utils'); +import { notesUrl, extractNotes } from '../utils'; export default async (ctx) => { const { uid, lang } = ctx.req.param(); diff --git a/lib/routes/qoo-app/user/app-comment.ts b/lib/routes/qoo-app/user/app-comment.ts index 152ecffe2..bb582e72a 100644 --- a/lib/routes/qoo-app/user/app-comment.ts +++ b/lib/routes/qoo-app/user/app-comment.ts @@ -5,7 +5,7 @@ import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; import timezone from '@/utils/timezone'; -const { userUrl, appsUrl } = require('../utils'); +import { userUrl, appsUrl } from '../utils'; import { art } from '@/utils/render'; import * as path from 'node:path'; diff --git a/lib/routes/scnu/announcements-router.ts b/lib/routes/scnu/announcements-router.ts new file mode 100644 index 000000000..60d45e3ef --- /dev/null +++ b/lib/routes/scnu/announcements-router.ts @@ -0,0 +1 @@ +export { announcementsRouter as default } from './physics-school-announcements-and-news'; diff --git a/lib/routes/scnu/news-router.ts b/lib/routes/scnu/news-router.ts new file mode 100644 index 000000000..43d403e9e --- /dev/null +++ b/lib/routes/scnu/news-router.ts @@ -0,0 +1 @@ +export { newsRouter as default } from './physics-school-announcements-and-news'; diff --git a/lib/routes/scnu/physics-school-announcements-and-news.ts b/lib/routes/scnu/physics-school-announcements-and-news.ts index 3be4f1618..082ff971b 100644 --- a/lib/routes/scnu/physics-school-announcements-and-news.ts +++ b/lib/routes/scnu/physics-school-announcements-and-news.ts @@ -44,7 +44,7 @@ const getItemsFromURLs = async (URLs, cache) => { return items; }; -module.exports.announcementsRouter = async (ctx) => { +export const announcementsRouter = async (ctx) => { const URLs = { 党政: 'https://physics.scnu.edu.cn/NEWS/Notices/PartyAndGovernment/', 教务: 'https://physics.scnu.edu.cn/NEWS/Notices/Education/', @@ -61,7 +61,7 @@ module.exports.announcementsRouter = async (ctx) => { }); }; -module.exports.newsRouter = async (ctx) => { +export const newsRouter = async (ctx) => { const URLs = { 学院新闻: 'https://physics.scnu.edu.cn/NEWS/News/College/', 教务新闻: 'https://physics.scnu.edu.cn/NEWS/News/Education/', @@ -77,7 +77,7 @@ module.exports.newsRouter = async (ctx) => { }); }; -module.exports.researchNewsRouter = async (ctx) => { +export const researchNewsRouter = async (ctx) => { const URLs = { 学术报告: 'https://physics.scnu.edu.cn/RESEARCH/EVENTS/Seminars/', 学术会议: 'https://physics.scnu.edu.cn/RESEARCH/EVENTS/Conferences/', diff --git a/lib/routes/scnu/research-news-router.ts b/lib/routes/scnu/research-news-router.ts new file mode 100644 index 000000000..248a9a1f8 --- /dev/null +++ b/lib/routes/scnu/research-news-router.ts @@ -0,0 +1 @@ +export { researchNewsRouter as default } from './physics-school-announcements-and-news'; diff --git a/lib/routes/scnu/router.ts b/lib/routes/scnu/router.ts index e770d7535..89f786e65 100644 --- a/lib/routes/scnu/router.ts +++ b/lib/routes/scnu/router.ts @@ -2,9 +2,9 @@ export default (router) => { router.get('/cs/match', './cs/match'); router.get('/jw', './jw'); router.get('/library', './library'); - router.get('/physics-school-announcements', './physics-school-announcements-and-news'.announcementsRouter); - router.get('/physics-school-news', './physics-school-announcements-and-news'.newsRouter); - router.get('/physics-school-research-news', './physics-school-announcements-and-news'.researchNewsRouter); + router.get('/physics-school-announcements', './announcements-router'); + router.get('/physics-school-news', './news-router'); + router.get('/physics-school-research-news', './research-news-router'); router.get('/ss', './ss'); router.get('/yjs', './yjs'); }; diff --git a/lib/routes/sdu/wh/jwc.ts b/lib/routes/sdu/wh/jwc.ts index 24b0af648..6b23096c7 100644 --- a/lib/routes/sdu/wh/jwc.ts +++ b/lib/routes/sdu/wh/jwc.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { load } from 'cheerio'; const data = require('../data').wh.jwc; -const extractor = require('../extractor'); +import extractor from '../extractor'; import { parseDate } from '@/utils/parse-date'; import timezone from '@/utils/timezone'; diff --git a/lib/routes/sdu/wh/news.ts b/lib/routes/sdu/wh/news.ts index c8dc1da61..9da76f482 100644 --- a/lib/routes/sdu/wh/news.ts +++ b/lib/routes/sdu/wh/news.ts @@ -2,7 +2,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { load } from 'cheerio'; const data = require('../data').wh.news; -const extractor = require('../extractor'); +import extractor from '../extractor'; import { parseDate } from '@/utils/parse-date'; export default async (ctx) => { diff --git a/lib/routes/segmentfault/utils.ts b/lib/routes/segmentfault/utils.ts index 63d3b1d14..ef7746761 100644 --- a/lib/routes/segmentfault/utils.ts +++ b/lib/routes/segmentfault/utils.ts @@ -3,7 +3,7 @@ import got from '@/utils/got'; import { load } from 'cheerio'; import { parseDate } from '@/utils/parse-date'; import { config } from '@/config'; -const { getAcwScV2ByArg1 } = require('../5eplay/utils'); +import { getAcwScV2ByArg1 } from '../5eplay/utils'; const host = 'https://segmentfault.com'; diff --git a/lib/routes/sina/finance/china.ts b/lib/routes/sina/finance/china.ts index 92bb28ef5..81bdc06a2 100644 --- a/lib/routes/sina/finance/china.ts +++ b/lib/routes/sina/finance/china.ts @@ -1,5 +1,5 @@ import cache from '@/utils/cache'; -const { getRollNewsList, parseRollNewsList, parseArticle } = require('../utils'); +import { getRollNewsList, parseRollNewsList, parseArticle } from '../utils'; export default async (ctx) => { const map = { diff --git a/lib/routes/sina/finance/stock/usstock.ts b/lib/routes/sina/finance/stock/usstock.ts index 9edf6ab2d..3f7c589d8 100644 --- a/lib/routes/sina/finance/stock/usstock.ts +++ b/lib/routes/sina/finance/stock/usstock.ts @@ -1,7 +1,7 @@ import cache from '@/utils/cache'; import got from '@/utils/got'; import { parseDate } from '@/utils/parse-date'; -const { parseArticle } = require('../../utils'); +import { parseArticle } from '../../utils'; export default async (ctx) => { const { cids = '57045' } = ctx.req.param(); diff --git a/lib/routes/twitter/developer-api/search.ts b/lib/routes/twitter/developer-api/search.ts index 468ec234b..551d10db6 100644 --- a/lib/routes/twitter/developer-api/search.ts +++ b/lib/routes/twitter/developer-api/search.ts @@ -1,4 +1,4 @@ -const utils = require('../utils'); +import utils from '../utils'; export default async (ctx) => { const keyword = ctx.req.param('keyword'); diff --git a/lib/routes/twitter/developer-api/user.ts b/lib/routes/twitter/developer-api/user.ts index 76126d2cc..8eb27f724 100644 --- a/lib/routes/twitter/developer-api/user.ts +++ b/lib/routes/twitter/developer-api/user.ts @@ -1,4 +1,4 @@ -const utils = require('../utils'); +import utils from '../utils'; export default async (ctx) => { const id = ctx.req.param('id'); diff --git a/lib/routes/twitter/web-api/media.ts b/lib/routes/twitter/web-api/media.ts index 4a7118f40..4a1ab7918 100644 --- a/lib/routes/twitter/web-api/media.ts +++ b/lib/routes/twitter/web-api/media.ts @@ -1,4 +1,4 @@ -const utils = require('../utils'); +import utils from '../utils'; // import { config } from '@/config'; import { getUser, getUserMedia } from './twitter-api'; import { initToken } from './token'; diff --git a/lib/routes/twitter/web-api/search.ts b/lib/routes/twitter/web-api/search.ts index 3c98a4010..dc83731f1 100644 --- a/lib/routes/twitter/web-api/search.ts +++ b/lib/routes/twitter/web-api/search.ts @@ -1,4 +1,4 @@ -const utils = require('../utils'); +import utils from '../utils'; import { getSearch } from './twitter-api'; import { initToken } from './token'; diff --git a/lib/routes/twitter/web-api/tweet.ts b/lib/routes/twitter/web-api/tweet.ts index 211f38cd1..081e06989 100644 --- a/lib/routes/twitter/web-api/tweet.ts +++ b/lib/routes/twitter/web-api/tweet.ts @@ -1,6 +1,6 @@ // import { config } from '@/config'; import { getUser, getUserTweet } from './twitter-api'; -const utils = require('../utils'); +import utils from '../utils'; import { fallback, queryToBoolean } from '@/utils/readable-social'; import { config } from '@/config'; import { initToken } from './token'; diff --git a/lib/routes/twitter/web-api/user.ts b/lib/routes/twitter/web-api/user.ts index b38d734ff..5670e59ac 100644 --- a/lib/routes/twitter/web-api/user.ts +++ b/lib/routes/twitter/web-api/user.ts @@ -1,4 +1,4 @@ -const utils = require('../utils'); +import utils from '../utils'; import { getUser, getUserTweets, getUserTweetsAndReplies, excludeRetweet } from './twitter-api'; import { initToken } from './token'; diff --git a/lib/routes/weibo/oasis/user.ts b/lib/routes/weibo/oasis/user.ts index 5d8799786..a0189c158 100644 --- a/lib/routes/weibo/oasis/user.ts +++ b/lib/routes/weibo/oasis/user.ts @@ -1,5 +1,5 @@ import buildData from '@/utils/common-config'; -const weiboUtils = require('../utils'); +import weiboUtils from '../utils'; export default async (ctx) => { const userid = ctx.req.param('userid'); diff --git a/lib/routes/weibo/search/hot.ts b/lib/routes/weibo/search/hot.ts index fd6066fe6..ad4c34de4 100644 --- a/lib/routes/weibo/search/hot.ts +++ b/lib/routes/weibo/search/hot.ts @@ -7,7 +7,7 @@ import { config } from '@/config'; import { art } from '@/utils/render'; import { load } from 'cheerio'; import * as path from 'node:path'; -// const weiboUtils = require('../utils'); +// import weiboUtils from '../utils'; // Default hide all picture let wpic = 'false'; diff --git a/lib/routes/zhihu/xhu/activities.ts b/lib/routes/zhihu/xhu/activities.ts index c2e5974b2..b6dfc0910 100644 --- a/lib/routes/zhihu/xhu/activities.ts +++ b/lib/routes/zhihu/xhu/activities.ts @@ -1,6 +1,6 @@ import got from '@/utils/got'; import auth from './auth'; -const utils = require('../utils'); +import utils from '../utils'; import { parseDate } from '@/utils/parse-date'; export default async (ctx) => { diff --git a/lib/routes/zhihu/xhu/collection.ts b/lib/routes/zhihu/xhu/collection.ts index 131de8c49..b42b30656 100644 --- a/lib/routes/zhihu/xhu/collection.ts +++ b/lib/routes/zhihu/xhu/collection.ts @@ -1,6 +1,6 @@ import got from '@/utils/got'; import auth from './auth'; -const { generateData } = require('../pin/utils'); +import { generateData } from '../pin/utils'; import { parseDate } from '@/utils/parse-date'; export default async (ctx) => { diff --git a/lib/routes/zhihu/xhu/question.ts b/lib/routes/zhihu/xhu/question.ts index a29e03f17..8ad42056a 100644 --- a/lib/routes/zhihu/xhu/question.ts +++ b/lib/routes/zhihu/xhu/question.ts @@ -1,6 +1,6 @@ import got from '@/utils/got'; import auth from './auth'; -const utils = require('../utils'); +import utils from '../utils'; import { parseDate } from '@/utils/parse-date'; export default async (ctx) => { diff --git a/lib/routes/zhihu/xhu/topic.ts b/lib/routes/zhihu/xhu/topic.ts index ed45ea1da..f2201d9de 100644 --- a/lib/routes/zhihu/xhu/topic.ts +++ b/lib/routes/zhihu/xhu/topic.ts @@ -1,6 +1,6 @@ import got from '@/utils/got'; import auth from './auth'; -const utils = require('../utils'); +import utils from '../utils'; import { parseDate } from '@/utils/parse-date'; export default async (ctx) => {