Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

合并 #152

Open
wants to merge 83 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
9cc9eea
refactor: 调整api模块
iDerekLi Feb 4, 2022
f8a30cc
Merge pull request #5 from iDerekLi/workflows
iDerekLi Feb 4, 2022
dad60cf
test: 测试脚本
iDerekLi Feb 4, 2022
88236d7
fix: 修复沾喜气未执行
iDerekLi Feb 15, 2022
fe143e1
Merge pull request #7 from iDerekLi/workflows
iDerekLi Feb 15, 2022
5731379
Merge pull request #9 from MuYuLPW/main
iDerekLi Feb 28, 2022
0a2daae
Merge pull request #11 from iDerekLi/dev
iDerekLi Feb 28, 2022
ff38b76
Merge pull request #12 from iDerekLi/workflows
iDerekLi Feb 28, 2022
da74a0b
fix(email): 修复未配置邮箱报错问题
iDerekLi Mar 2, 2022
cfe4abc
refactor(checkin): 重构签到脚本
iDerekLi Mar 2, 2022
38ca7ba
chore(checkin): 更新签到执行实现
iDerekLi Mar 2, 2022
d4e67bb
Merge pull request #15 from iDerekLi/workflows
iDerekLi Mar 2, 2022
ff5ef6c
chore(checkin): 移除多余打印结果
iDerekLi Mar 2, 2022
bd2050d
Merge pull request #16 from iDerekLi/workflows
iDerekLi Mar 2, 2022
655cea7
chore(checkin): 暴露错误结果
iDerekLi Mar 2, 2022
3c06aa7
Merge pull request #17 from iDerekLi/workflows
iDerekLi Mar 2, 2022
6b6df19
chore(checkin): 调整输出格式
iDerekLi Mar 2, 2022
2f326a4
refactor(seaGold): 重构海底掘金游戏
iDerekLi Mar 2, 2022
44e59df
chore(checkin): 调试输出模板
iDerekLi Mar 2, 2022
5769fa7
Merge pull request #18 from iDerekLi/workflows
iDerekLi Mar 2, 2022
5279e73
chore(seaGold): 调整执行顺序
iDerekLi Mar 2, 2022
8d8a370
Merge pull request #19 from iDerekLi/workflows
iDerekLi Mar 2, 2022
089e2b6
Update README.md
iDerekLi Mar 3, 2022
0f51a7f
Update README.md
iDerekLi Mar 3, 2022
a0e32b6
Merge pull request #20 from iDerekLi/workflows
iDerekLi Mar 3, 2022
dd0f4b1
chore: 升级掘金助手版本
iDerekLi Mar 17, 2022
c92c245
feat: 签到脚本添加事件埋点
iDerekLi Mar 17, 2022
54beea8
Merge pull request #24 from iDerekLi/workflows
iDerekLi Mar 17, 2022
3ac8a87
Update checkin.yml
BIGMONK Mar 21, 2022
f1f557f
Merge branch 'iDerekLi:main' into main
BIGMONK Mar 29, 2022
acaf492
添加钉钉机器人通知
BIGMONK Apr 2, 2022
b1d1617
Merge pull request #27 from BIGMONK/dev-dingding
iDerekLi Apr 8, 2022
5bb823f
Update checkin.yml
iDerekLi Apr 8, 2022
2667057
Merge pull request #28 from iDerekLi/workflows
iDerekLi Apr 10, 2022
81dcf13
chore: 更新版本
iDerekLi May 25, 2022
1f24ac5
Merge branch 'workflows' of github.com:iDerekLi/juejin-helper into wo…
iDerekLi May 25, 2022
87ebc66
feat: 新增BugFix模块
iDerekLi May 25, 2022
6f11f4c
chore(email): 更新模板信息
iDerekLi May 25, 2022
815329e
Merge pull request #32 from iDerekLi/workflows
iDerekLi May 25, 2022
77d1d0c
docs: 更新描述信息
iDerekLi May 25, 2022
d6dec78
Merge pull request #33 from iDerekLi/workflows
iDerekLi May 25, 2022
45f5462
feat: 增加PushPlus推送方式
ZiuChen May 30, 2022
85799f7
refactor: 抽离钉钉推送逻辑
ZiuChen May 30, 2022
b1b242f
refactor: 新增postMessage函数统一执行推送
ZiuChen May 30, 2022
5246cc3
chore: 将PUSHPLUS_TOKEN添加至workflow
ZiuChen May 30, 2022
e93d89f
fix: 修正变量名错误
ZiuChen May 30, 2022
6e74788
docs: README UPDATE
ZiuChen May 30, 2022
ed0788a
feat: 增加推送响应日志输出
ZiuChen May 31, 2022
8503953
Merge pull request #36 from ZiuChen/main
iDerekLi May 31, 2022
42dd779
perf: 移除杂项
iDerekLi May 31, 2022
78927d3
chore(env): 添加说明
iDerekLi May 31, 2022
e3f626d
chore(env): 添加说明
iDerekLi May 31, 2022
8c35db8
fix(push): 修复钉钉缺失依赖
iDerekLi May 31, 2022
f50780b
perf: 移除杂项
iDerekLi May 31, 2022
616f207
fix: 修复扫描错误路径
iDerekLi May 31, 2022
8992243
docs: 更新README
iDerekLi May 31, 2022
93498d4
docs(pr): 添加pr描述
iDerekLi May 31, 2022
f729e15
Merge pull request #38 from iDerekLi/workflows
iDerekLi May 31, 2022
935800c
feat: 支持多个Cookie的签到与挖矿任务
ZiuChen Jun 1, 2022
1c056c2
docs: 更新README
ZiuChen Jun 1, 2022
d599237
style: 使用Prettier插件规范代码风格
ZiuChen Jun 1, 2022
693b628
Merge pull request #41 from ZiuChen/workflows
iDerekLi Jun 1, 2022
c01117c
Merge pull request #42 from iDerekLi/workflows
iDerekLi Jun 1, 2022
07c5dd5
chore(pr): 调整pr模板
iDerekLi Jun 1, 2022
da1b239
feat(contributing): 添加贡献描述
iDerekLi Jun 1, 2022
681049b
Merge pull request #43 from iDerekLi/workflows
iDerekLi Jun 1, 2022
9b40745
style: 修复输出格式
iDerekLi Jun 2, 2022
35db4ad
Merge pull request #44 from iDerekLi/workflows
iDerekLi Jun 2, 2022
df7d7b2
revert: 移除对多Cookie的支持
ZiuChen Jun 2, 2022
a03e742
feat: 增加环境变量`COOKIE__1`与`COOKIE__2`以支持多用户
ZiuChen Jun 2, 2022
6f6efef
chore: 将`COOKIE__1`与`COOKIE__2`添加至workflow
ZiuChen Jun 2, 2022
f543d2a
docs: README UPDATE
ZiuChen Jun 2, 2022
83e8844
Merge pull request #48 from ZiuChen/workflows
iDerekLi Jun 2, 2022
3d653fb
fix: 修改多用户策略
iDerekLi Jun 2, 2022
b6b523b
Merge pull request #49 from iDerekLi/workflows
iDerekLi Jun 2, 2022
073dfb2
feat: 多用户通知合并为一条
ZiuChen Jun 20, 2022
627c9c7
调整统一消息输出格式
iDerekLi Jun 24, 2022
0ff00d9
调整统一输出格式
iDerekLi Jun 24, 2022
4716ee2
Merge pull request #53 from ZiuChen/workflows
iDerekLi Jun 24, 2022
5fbe11c
fix: 调整语法兼容问题
iDerekLi Jun 24, 2022
4f3cf48
style: 修改格式长度
iDerekLi Jun 24, 2022
801f0de
Merge pull request #55 from iDerekLi/workflows
iDerekLi Jun 24, 2022
673c693
Merge remote-tracking branch 'upstream/main'
LQiTong Aug 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"tabWidth": 2,
"semi": true,
"singleQuote": false,
"printWidth": 100,
"trailingComma": "none",
"bracketSpacing": false
}
20 changes: 20 additions & 0 deletions scripts/utils/dingding.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
const fetch = require("node-fetch");

const env = require("./env");
async function dingding({ subject, text, html }) {
return fetch(env.DINGDING_WEBHOOK, {
headers: {
"Content-Type": "application/json",
Charset: "UTF-8"
},
method: "POST",
body: JSON.stringify({
msgtype: "text",
text: {
content: `${subject}\n${text || html}`
}
})
}).then((res) => console.log(JSON.stringify(res)));
}

module.exports = dingding;
12 changes: 12 additions & 0 deletions scripts/utils/pushMessage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
const env = require("./env");
const email = require("./email");
const pushplus = require("./pushplus");
const dingding = require("./dingding");

async function pushMessage({ subject, text, html }) {
env.EMAIL_USER && (await email({ subject, text, html }));
env.DINGDING_WEBHOOK && (await dingding({ subject, text, html }));
env.PUSHPLUS_TOKEN && (await pushplus({ subject, text, html }));
}

module.exports = pushMessage;
41 changes: 41 additions & 0 deletions scripts/utils/pushplus.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
const fetch = require("node-fetch");
const env = require("./env");
const userConfig = {
url: "http://www.pushplus.plus/send",
token: env.PUSHPLUS_TOKEN
};

async function main({ subject, text, html }) {
if (!userConfig.token) {
console.warn("未配置PushPlus之Token, 请先配置PushPlus");
return;
}
return await postMessage({
token: userConfig.token,
title: subject,
content: text || html,
topic: "",
template: "html",
channel: "wechat",
webhook: "",
callbackUrl: "",
timestamp: ""
})
.then((res) => res.json())
.then((json) => {
console.log(`PushPlus推送结果: ` + json.msg);
return json;
});
}

async function postMessage(message) {
return await fetch(userConfig.url, {
method: "POST",
headers: {
"Content-Type": "application/json"
},
body: JSON.stringify(message)
}).catch((err) => console.log(err));
}

module.exports = main;