From ef7773a4695f233ae20c70f18f9185a06bae7674 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Mon, 18 Jan 2021 10:10:40 +0800
Subject: [PATCH] update

---
 .gitignore          |  2 +-
 config.json         |  2 +-
 pmcalendar.php      | 12 ++++++++----
 uploader/.gitignore |  1 -
 4 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 uploader/.gitignore

diff --git a/.gitignore b/.gitignore
index 0067b81..50aa1bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 
 .idea
-uploader
\ No newline at end of file
+/uploader
diff --git a/config.json b/config.json
index 1f7096a..0906e3b 100644
--- a/config.json
+++ b/config.json
@@ -1 +1 @@
-{"games":["\u98ce\u66b4\u5947\u5175","\u6b4c\u624bCOCOS","\u4e2d\u53e4\u6218\u9524","\u5996\u7075\u6218\u59ec","\u751f\u5316\u7eaa\u5143","\u90e8\u843d\u6218\u9b42","\u8bd9\u8c10\u4e09\u56fd","\u50cf\u7d20\u9879\u76ee","\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u5176\u4ed6"],"roles":["\u8212\u5c55"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"gxcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"gxyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f"],"xfvroles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u9093\u5b9a\u5764"],"xfyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u8212\u5c55"],"dbvroles":[""],"dbyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35"],"dbyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"dbcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"sxyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"sxaroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"]}
\ No newline at end of file
+{"games":["\u98ce\u66b4\u5947\u5175","\u6b4c\u624bCOCOS","\u4e2d\u53e4\u6218\u9524","\u5996\u7075\u6218\u59ec","\u751f\u5316\u7eaa\u5143","\u90e8\u843d\u6218\u9b42","\u8bd9\u8c10\u4e09\u56fd","\u50cf\u7d20\u9879\u76ee","\u5b64\u5c9b\u5947\u5175","\u90e8\u843d\u7e41\u4f53\u7248","\u90e8\u843d\u97e9\u6587\u7248","\u90e8\u843d\u8d8a\u5357\u7248","\u90e8\u843d\u82f1\u6587\u7248","\u90e8\u843d\u6cf0\u6587\u7248","\u90e8\u843dH5\u7248","\u66d9\u5149\u4e4b\u5883","\u9b54\u6cd5\u95e8H5","\u6b63\u7248\u9b54\u6cd5\u95e8\u539f\u751f","3D\u963f\u51e1\u8fbe","\u5927\u6218\u56fd","\u5927\u4e09\u56fd","\u5927\u4e09\u56fd\u97e9\u6587","\u5766\u514b\u7a81\u88ad","\u5251\u5723\u6302\u673a","\u7cbe\u7075\u7eaa\u5143","\u9b54\u6cd5\u65e0\u654c","\u4e50\u8c37\u519b\u5e08","X\u7cbe\u7075","\u5730\u4ea7\u5927\u4ea8","\u4e50\u8c37MT","\u8d85\u7ea7\u6536\u85cf\u5bb6","\u4e71\u4e16\u957f\u6b4c","\u6b4c\u624b2019","\u6218\u56fd\u4e89\u9e23","\u6697\u9ed1\u5730\u4e0b\u57ce\u7e41\u4f53","\u5c71\u6d77\u7ecf","3D\u751f\u5316","\u5176\u4ed6"],"roles":["\u8212\u5c55"],"gxvroles":[""],"gxyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"gxcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"gxyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f"],"xfvroles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u9093\u5b9a\u946b","\u9976\u677e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u9093\u5b9a\u5764"],"xfyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587","\u8212\u5c55"],"dbvroles":[""],"dbyferoles":["\u8212\u5c55","\u9093\u5b9a\u658c","\u5510\u51ef","\u55bb\u987a\u745e","\u5218\u601d\u654f","\u6556\u957f\u521a","\u5218\u601d\u79cb","\u6885\u5bb6\u8d35"],"dbyyeroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"dbcperoles":["\u9093\u5b9a\u946b","\u9976\u677e","\u5434\u9e23\u9a9e","\u91d1\u5143\u5143","\u7f57\u68a6\u83f2","\u9676\u4e39","\u5ed6\u5b50\u9f99"],"sxyyeroles":["\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u9b4f\u6676","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"],"sxaroles":["\u9b4f\u6676","\u67f3\u94b0\u6ce2","\u6c60\u6e90","\u9093\u6770","\u674e\u4fca","\u9ec4\u6653","\u674e\u5b9c\u6cfd","\u9a6c\u5929\u5e73","\u53f6\u664f\u6587"]}
\ No newline at end of file
diff --git a/pmcalendar.php b/pmcalendar.php
index 06bec44..dbcd193 100644
--- a/pmcalendar.php
+++ b/pmcalendar.php
@@ -17,9 +17,9 @@ function request_by_curl($remote_server, $post_string) {
 }
 
 
-function sendNotice($title,$text){
+function sendNotice($title,$text,$token){
 	//今天设置过菜单
-	$webhook = "https://oapi.dingtalk.com/robot/send?access_token=1a9389969a7b6decc779c86c0969c23cfd7c3d4bf02fe3bb78da348fb526e227";
+	$webhook = "https://oapi.dingtalk.com/robot/send?access_token={$token}";
 
 	$data = array(
 		'msgtype'=>'actionCard',
@@ -92,7 +92,9 @@ if ($act == 'newevent') {
     DB::exe($sql);
 	
 	if($dict['event'] == '上线'){
-		sendNotice('Event新增了上线节点',"**Event新增了上线节点**\n\n【{$dict['game']}】{$dict['title']}\n\n时间：{$dict['start']}");
+		sendNotice('Event新增了上线节点',"**Event新增了上线节点**\n\n【{$dict['game']}】{$dict['title']}\n\n时间：{$dict['start']}",'1a9389969a7b6decc779c86c0969c23cfd7c3d4bf02fe3bb78da348fb526e227');
+
+		sendNotice('Event新增了上线节点',"**Event新增了上线节点**\n\n【{$dict['game']}】{$dict['title']}\n\n时间：{$dict['start']}",'0be37dacbaa5c76893fb85d4dab5bc23e6b981b5fa3c33908132af8e29eacf8c');
 	}
 
     we('1');
@@ -110,7 +112,9 @@ if ($act == 'newevent') {
 
 	$info = getOneEvent($id);
 	if($info['event'] == '上线'){
-		sendNotice('Event上线节点',"**Event上线节点信息补充**\n\n【{$info['game']}】{$info['title']}\n\n时间：{$info['start']}\n\n{$data_array['msg']}");
+		sendNotice('Event上线节点',"**Event上线节点信息补充**\n\n【{$info['game']}】{$info['title']}\n\n时间：{$info['start']}\n\n{$data_array['msg']}",'1a9389969a7b6decc779c86c0969c23cfd7c3d4bf02fe3bb78da348fb526e227');
+
+		sendNotice('Event上线节点',"**Event上线节点信息补充**\n\n【{$info['game']}】{$info['title']}\n\n时间：{$info['start']}\n\n{$data_array['msg']}",'0be37dacbaa5c76893fb85d4dab5bc23e6b981b5fa3c33908132af8e29eacf8c');
 	}
 
     we('1');
diff --git a/uploader/.gitignore b/uploader/.gitignore
deleted file mode 100644
index 8b13789..0000000
--- a/uploader/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-