diff --git a/new_gebi1.har b/new_gebi1.har
new file mode 100644
index 0000000000..fbd4fe841f
--- /dev/null
+++ b/new_gebi1.har
@@ -0,0 +1,294 @@
+[
+ {
+ "comment": "判断是否填写Cookie",
+ "request": {
+ "method": "GET",
+ "url": "{% if not cookie %}",
+ "headers": [],
+ "cookies": [],
+ "data": ""
+ },
+ "rule": {
+ "success_asserts": [],
+ "failed_asserts": [],
+ "extract_variables": []
+ }
+ },
+ {
+ "comment": "获取登录前formhash",
+ "request": {
+ "method": "GET",
+ "url": "https://www.gebi1.com/member.php?mod=logging&action=login&infloat=yes&handlekey=login&inajax=1&ajaxtarget=fwin_content_login",
+ "headers": [],
+ "cookies": [],
+ "data": ""
+ },
+ "rule": {
+ "success_asserts": [
+ {
+ "re": "200",
+ "from": "status"
+ }
+ ],
+ "failed_asserts": [],
+ "extract_variables": [
+ {
+ "name": "formhash",
+ "re": "\"formhash\".*?value=\"(.*?)\"",
+ "from": "content"
+ },
+ {
+ "name": "loginhash",
+ "re": "loginhash=([^\\s\"&]+)",
+ "from": "content"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "密码登录获取Cookie",
+ "request": {
+ "method": "POST",
+ "url": "https://www.gebi1.com/member.php?mod=logging&action=login&loginsubmit=yes&handlekey=login&loginhash={{loginhash|urlencode}}&inajax=1",
+ "headers": [],
+ "cookies": [],
+ "data": "formhash={{formhash}}&referer=https%3A%2F%2Fwww.gebi1.com%2F&username={{username|urlencode}}&password={{password|urlencode}}&questionid=0&answer=",
+ "mimeType": "application/x-www-form-urlencoded"
+ },
+ "rule": {
+ "success_asserts": [
+ {
+ "re": "欢迎您回来",
+ "from": "content"
+ }
+ ],
+ "failed_asserts": [],
+ "extract_variables": [
+ {
+ "re": "username':'(.+)','usergroup",
+ "from": "content",
+ "name": "username"
+ },
+ {
+ "re": "uid':'(\\d+)'",
+ "from": "content",
+ "name": "uid"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "判断块结束",
+ "request": {
+ "method": "GET",
+ "url": "{% endif %}",
+ "headers": [],
+ "cookies": [],
+ "data": ""
+ },
+ "rule": {
+ "success_asserts": [],
+ "failed_asserts": [],
+ "extract_variables": []
+ }
+ },
+ {
+ "comment": "生成时间戳",
+ "request": {
+ "method": "GET",
+ "url": "api://util/timestamp",
+ "headers": [],
+ "cookies": []
+ },
+ "rule": {
+ "success_asserts": [],
+ "failed_asserts": [],
+ "extract_variables": [
+ {
+ "re": "(\\d{10})",
+ "from": "content",
+ "name": "t"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "获取hash",
+ "request": {
+ "method": "GET",
+ "url": "https://www.gebi1.com/home.php?mod=spacecp&ac=credit&showcredit=1",
+ "headers": [],
+ "cookies": [
+ {
+ "name": "cookie",
+ "value": "{{cookie}}"
+ }
+ ]
+ },
+ "rule": {
+ "success_asserts": [
+ {
+ "re": "个人资料",
+ "from": "content"
+ }
+ ],
+ "failed_asserts": [
+ {
+ "re": "您需要先登录",
+ "from": "content"
+ }
+ ],
+ "extract_variables": [
+ {
+ "re": "formhash=(\\w*)\"",
+ "from": "content",
+ "name": "hash"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "签到",
+ "request": {
+ "method": "POST",
+ "url": "https://www.gebi1.com/plugin.php?id=k_misign%3Asign&operation=qiandao&format=button&formhash={{ hash |urlencode}}",
+ "headers": [],
+ "cookies": [],
+ "data": "formhash={{ hash |urlencode}}&qdxq=kx",
+ "mimeType": "application/x-www-form-urlencoded"
+ },
+ "rule": {
+ "success_asserts": [
+ {
+ "re": "签到成功",
+ "from": "content"
+ },
+ {
+ "re": "今日已签",
+ "from": "content"
+ }
+ ],
+ "failed_asserts": [],
+ "extract_variables": [
+ {
+ "name": "qd",
+ "re": "连续.*?([\\d.]+).*天",
+ "from": "content"
+ },
+ {
+ "name": "accumulate",
+ "re": "已累计签到.*?([\\d.]+).*天。",
+ "from": "content"
+ },
+ {
+ "name": "status",
+ "re": "签到成功",
+ "from": "content"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "签到状态判断",
+ "request": {
+ "method": "GET",
+ "url": "{% if status==\"签到成功\" %}",
+ "headers": [],
+ "cookies": [],
+ "data": ""
+ },
+ "rule": {
+ "success_asserts": [],
+ "failed_asserts": [],
+ "extract_variables": []
+ }
+ },
+ {
+ "comment": "Unicode转换",
+ "request": {
+ "method": "POST",
+ "url": "api://util/unicode",
+ "headers": [],
+ "cookies": [],
+ "data": "html_unescape=false&content=隔壁网签到:已连续签到{{qd}}天,累计签到{{accumulate}}天。"
+ },
+ "rule": {
+ "success_asserts": [
+ {
+ "re": "200",
+ "from": "status"
+ },
+ {
+ "re": "\"状态\": \"200\"",
+ "from": "content"
+ }
+ ],
+ "failed_asserts": [],
+ "extract_variables": [
+ {
+ "name": "__log__",
+ "re": "\"转换后\": \"(.*)\"",
+ "from": "content"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "判断条件不成立",
+ "request": {
+ "method": "GET",
+ "url": "{% else %}",
+ "headers": [],
+ "cookies": [],
+ "data": ""
+ },
+ "rule": {
+ "success_asserts": [],
+ "failed_asserts": [],
+ "extract_variables": []
+ }
+ },
+ {
+ "comment": "Unicode转换",
+ "request": {
+ "method": "POST",
+ "url": "api://util/unicode",
+ "headers": [],
+ "cookies": [],
+ "data": "html_unescape=false&content=隔壁网签到:今天已经签到咯"
+ },
+ "rule": {
+ "success_asserts": [
+ {
+ "re": "200",
+ "from": "status"
+ },
+ {
+ "re": "\"状态\": \"200\"",
+ "from": "content"
+ }
+ ],
+ "failed_asserts": [],
+ "extract_variables": [
+ {
+ "name": "__log__",
+ "re": "\"转换后\": \"(.*)\"",
+ "from": "content"
+ }
+ ]
+ }
+ },
+ {
+ "comment": "判断块结束",
+ "request": {
+ "method": "GET",
+ "url": "{% endif %}",
+ "headers": [],
+ "cookies": [],
+ "data": ""
+ },
+ "rule": {
+ "success_asserts": []
+ }
+ }
+]
\ No newline at end of file
diff --git a/tpls_history.json b/tpls_history.json
index c304b066f6..7dd2d7abf5 100644
--- a/tpls_history.json
+++ b/tpls_history.json
@@ -3540,6 +3540,18 @@
"date": "2024-08-18 17:47:46",
"version": "20240818",
"commenturl": "https://github.com/qd-today/templates/issues/718"
+ },
+ "隔壁网(新)": {
+ "name": "隔壁网(新)",
+ "author": "stay,XuanRui",
+ "url": "https://raw.githubusercontent.com/qd-today/templates/master/new_gebi1.har",
+ "update": false,
+ "comments": "username 和 password 是登录的账号密码
填写Cookies后无需填写账号和密码
https://www.gebi1.com",
+ "filename": "new_gebi1.har",
+ "content": "W3siY29tbWVudCI6ICLliKTmlq3mmK/lkKbloavlhplDb29raWUiLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIkdFVCIsICJ1cmwiOiAieyUgaWYgbm90IGNvb2tpZSAlfSIsICJoZWFkZXJzIjogW10sICJjb29raWVzIjogW10sICJkYXRhIjogIiJ9LCAicnVsZSI6IHsic3VjY2Vzc19hc3NlcnRzIjogW10sICJmYWlsZWRfYXNzZXJ0cyI6IFtdLCAiZXh0cmFjdF92YXJpYWJsZXMiOiBbXX19LCB7ImNvbW1lbnQiOiAi6I635Y+W55m75b2V5YmNZm9ybWhhc2giLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIkdFVCIsICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2ViaTEuY29tL21lbWJlci5waHA/bW9kPWxvZ2dpbmcmYWN0aW9uPWxvZ2luJmluZmxvYXQ9eWVzJmhhbmRsZWtleT1sb2dpbiZpbmFqYXg9MSZhamF4dGFyZ2V0PWZ3aW5fY29udGVudF9sb2dpbiIsICJoZWFkZXJzIjogW10sICJjb29raWVzIjogW10sICJkYXRhIjogIiJ9LCAicnVsZSI6IHsic3VjY2Vzc19hc3NlcnRzIjogW3sicmUiOiAiMjAwIiwgImZyb20iOiAic3RhdHVzIn1dLCAiZmFpbGVkX2Fzc2VydHMiOiBbXSwgImV4dHJhY3RfdmFyaWFibGVzIjogW3sibmFtZSI6ICJmb3JtaGFzaCIsICJyZSI6ICJcImZvcm1oYXNoXCIuKj92YWx1ZT1cIiguKj8pXCIiLCAiZnJvbSI6ICJjb250ZW50In0sIHsibmFtZSI6ICJsb2dpbmhhc2giLCAicmUiOiAibG9naW5oYXNoPShbXlxcc1wiJl0rKSIsICJmcm9tIjogImNvbnRlbnQifV19fSwgeyJjb21tZW50IjogIuWvhueggeeZu+W9leiOt+WPlkNvb2tpZSIsICJyZXF1ZXN0IjogeyJtZXRob2QiOiAiUE9TVCIsICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2ViaTEuY29tL21lbWJlci5waHA/bW9kPWxvZ2dpbmcmYWN0aW9uPWxvZ2luJmxvZ2luc3VibWl0PXllcyZoYW5kbGVrZXk9bG9naW4mbG9naW5oYXNoPXt7bG9naW5oYXNofHVybGVuY29kZX19JmluYWpheD0xIiwgImhlYWRlcnMiOiBbXSwgImNvb2tpZXMiOiBbXSwgImRhdGEiOiAiZm9ybWhhc2g9e3tmb3JtaGFzaH19JnJlZmVyZXI9aHR0cHMlM0ElMkYlMkZ3d3cuZ2ViaTEuY29tJTJGJnVzZXJuYW1lPXt7dXNlcm5hbWV8dXJsZW5jb2RlfX0mcGFzc3dvcmQ9e3twYXNzd29yZHx1cmxlbmNvZGV9fSZxdWVzdGlvbmlkPTAmYW5zd2VyPSIsICJtaW1lVHlwZSI6ICJhcHBsaWNhdGlvbi94LXd3dy1mb3JtLXVybGVuY29kZWQifSwgInJ1bGUiOiB7InN1Y2Nlc3NfYXNzZXJ0cyI6IFt7InJlIjogIuasoui/juaCqOWbnuadpSIsICJmcm9tIjogImNvbnRlbnQifV0sICJmYWlsZWRfYXNzZXJ0cyI6IFtdLCAiZXh0cmFjdF92YXJpYWJsZXMiOiBbeyJyZSI6ICJ1c2VybmFtZSc6JyguKyknLCd1c2VyZ3JvdXAiLCAiZnJvbSI6ICJjb250ZW50IiwgIm5hbWUiOiAidXNlcm5hbWUifSwgeyJyZSI6ICJ1aWQnOicoXFxkKyknIiwgImZyb20iOiAiY29udGVudCIsICJuYW1lIjogInVpZCJ9XX19LCB7ImNvbW1lbnQiOiAi5Yik5pat5Z2X57uT5p2fIiwgInJlcXVlc3QiOiB7Im1ldGhvZCI6ICJHRVQiLCAidXJsIjogInslIGVuZGlmICV9IiwgImhlYWRlcnMiOiBbXSwgImNvb2tpZXMiOiBbXSwgImRhdGEiOiAiIn0sICJydWxlIjogeyJzdWNjZXNzX2Fzc2VydHMiOiBbXSwgImZhaWxlZF9hc3NlcnRzIjogW10sICJleHRyYWN0X3ZhcmlhYmxlcyI6IFtdfX0sIHsiY29tbWVudCI6ICLnlJ/miJDml7bpl7TmiLMiLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIkdFVCIsICJ1cmwiOiAiYXBpOi8vdXRpbC90aW1lc3RhbXAiLCAiaGVhZGVycyI6IFtdLCAiY29va2llcyI6IFtdfSwgInJ1bGUiOiB7InN1Y2Nlc3NfYXNzZXJ0cyI6IFtdLCAiZmFpbGVkX2Fzc2VydHMiOiBbXSwgImV4dHJhY3RfdmFyaWFibGVzIjogW3sicmUiOiAiKFxcZHsxMH0pIiwgImZyb20iOiAiY29udGVudCIsICJuYW1lIjogInQifV19fSwgeyJjb21tZW50IjogIuiOt+WPlmhhc2giLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIkdFVCIsICJ1cmwiOiAiaHR0cHM6Ly93d3cuZ2ViaTEuY29tL2hvbWUucGhwP21vZD1zcGFjZWNwJmFjPWNyZWRpdCZzaG93Y3JlZGl0PTEiLCAiaGVhZGVycyI6IFtdLCAiY29va2llcyI6IFt7Im5hbWUiOiAiY29va2llIiwgInZhbHVlIjogInt7Y29va2llfX0ifV19LCAicnVsZSI6IHsic3VjY2Vzc19hc3NlcnRzIjogW3sicmUiOiAi5Liq5Lq66LWE5paZIiwgImZyb20iOiAiY29udGVudCJ9XSwgImZhaWxlZF9hc3NlcnRzIjogW3sicmUiOiAi5oKo6ZyA6KaB5YWI55m75b2VIiwgImZyb20iOiAiY29udGVudCJ9XSwgImV4dHJhY3RfdmFyaWFibGVzIjogW3sicmUiOiAiZm9ybWhhc2g9KFxcdyopXCIiLCAiZnJvbSI6ICJjb250ZW50IiwgIm5hbWUiOiAiaGFzaCJ9XX19LCB7ImNvbW1lbnQiOiAi562+5YiwIiwgInJlcXVlc3QiOiB7Im1ldGhvZCI6ICJQT1NUIiwgInVybCI6ICJodHRwczovL3d3dy5nZWJpMS5jb20vcGx1Z2luLnBocD9pZD1rX21pc2lnbiUzQXNpZ24mb3BlcmF0aW9uPXFpYW5kYW8mZm9ybWF0PWJ1dHRvbiZmb3JtaGFzaD17eyBoYXNoIHx1cmxlbmNvZGV9fSIsICJoZWFkZXJzIjogW10sICJjb29raWVzIjogW10sICJkYXRhIjogImZvcm1oYXNoPXt7IGhhc2ggfHVybGVuY29kZX19JnFkeHE9a3giLCAibWltZVR5cGUiOiAiYXBwbGljYXRpb24veC13d3ctZm9ybS11cmxlbmNvZGVkIn0sICJydWxlIjogeyJzdWNjZXNzX2Fzc2VydHMiOiBbeyJyZSI6ICLnrb7liLDmiJDlip8iLCAiZnJvbSI6ICJjb250ZW50In0sIHsicmUiOiAi5LuK5pel5bey562+IiwgImZyb20iOiAiY29udGVudCJ9XSwgImZhaWxlZF9hc3NlcnRzIjogW10sICJleHRyYWN0X3ZhcmlhYmxlcyI6IFt7Im5hbWUiOiAicWQiLCAicmUiOiAi6L+e57utLio/KFtcXGQuXSspLirlpKkiLCAiZnJvbSI6ICJjb250ZW50In0sIHsibmFtZSI6ICJhY2N1bXVsYXRlIiwgInJlIjogIuW3sue0r+iuoeetvuWIsC4qPyhbXFxkLl0rKS4q5aSp44CCIiwgImZyb20iOiAiY29udGVudCJ9LCB7Im5hbWUiOiAic3RhdHVzIiwgInJlIjogIuetvuWIsOaIkOWKnyIsICJmcm9tIjogImNvbnRlbnQifV19fSwgeyJjb21tZW50IjogIuetvuWIsOeKtuaAgeWIpOaWrSIsICJyZXF1ZXN0IjogeyJtZXRob2QiOiAiR0VUIiwgInVybCI6ICJ7JSBpZiBzdGF0dXM9PVwi562+5Yiw5oiQ5YqfXCIgJX0iLCAiaGVhZGVycyI6IFtdLCAiY29va2llcyI6IFtdLCAiZGF0YSI6ICIifSwgInJ1bGUiOiB7InN1Y2Nlc3NfYXNzZXJ0cyI6IFtdLCAiZmFpbGVkX2Fzc2VydHMiOiBbXSwgImV4dHJhY3RfdmFyaWFibGVzIjogW119fSwgeyJjb21tZW50IjogIlVuaWNvZGXovazmjaIiLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIlBPU1QiLCAidXJsIjogImFwaTovL3V0aWwvdW5pY29kZSIsICJoZWFkZXJzIjogW10sICJjb29raWVzIjogW10sICJkYXRhIjogImh0bWxfdW5lc2NhcGU9ZmFsc2UmY29udGVudD3pmpTlo4HnvZHnrb7liLDvvJrlt7Lov57nu63nrb7liLB7e3FkfX3lpKnvvIzntK/orqHnrb7liLB7e2FjY3VtdWxhdGV9feWkqeOAgiJ9LCAicnVsZSI6IHsic3VjY2Vzc19hc3NlcnRzIjogW3sicmUiOiAiMjAwIiwgImZyb20iOiAic3RhdHVzIn0sIHsicmUiOiAiXCLnirbmgIFcIjogXCIyMDBcIiIsICJmcm9tIjogImNvbnRlbnQifV0sICJmYWlsZWRfYXNzZXJ0cyI6IFtdLCAiZXh0cmFjdF92YXJpYWJsZXMiOiBbeyJuYW1lIjogIl9fbG9nX18iLCAicmUiOiAiXCLovazmjaLlkI5cIjogXCIoLiopXCIiLCAiZnJvbSI6ICJjb250ZW50In1dfX0sIHsiY29tbWVudCI6ICLliKTmlq3mnaHku7bkuI3miJDnq4siLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIkdFVCIsICJ1cmwiOiAieyUgZWxzZSAlfSIsICJoZWFkZXJzIjogW10sICJjb29raWVzIjogW10sICJkYXRhIjogIiJ9LCAicnVsZSI6IHsic3VjY2Vzc19hc3NlcnRzIjogW10sICJmYWlsZWRfYXNzZXJ0cyI6IFtdLCAiZXh0cmFjdF92YXJpYWJsZXMiOiBbXX19LCB7ImNvbW1lbnQiOiAiVW5pY29kZei9rOaNoiIsICJyZXF1ZXN0IjogeyJtZXRob2QiOiAiUE9TVCIsICJ1cmwiOiAiYXBpOi8vdXRpbC91bmljb2RlIiwgImhlYWRlcnMiOiBbXSwgImNvb2tpZXMiOiBbXSwgImRhdGEiOiAiaHRtbF91bmVzY2FwZT1mYWxzZSZjb250ZW50PemalOWjgee9keetvuWIsO+8muS7iuWkqeW3sue7j+etvuWIsOWSryJ9LCAicnVsZSI6IHsic3VjY2Vzc19hc3NlcnRzIjogW3sicmUiOiAiMjAwIiwgImZyb20iOiAic3RhdHVzIn0sIHsicmUiOiAiXCLnirbmgIFcIjogXCIyMDBcIiIsICJmcm9tIjogImNvbnRlbnQifV0sICJmYWlsZWRfYXNzZXJ0cyI6IFtdLCAiZXh0cmFjdF92YXJpYWJsZXMiOiBbeyJuYW1lIjogIl9fbG9nX18iLCAicmUiOiAiXCLovazmjaLlkI5cIjogXCIoLiopXCIiLCAiZnJvbSI6ICJjb250ZW50In1dfX0sIHsiY29tbWVudCI6ICLliKTmlq3lnZfnu5PmnZ8iLCAicmVxdWVzdCI6IHsibWV0aG9kIjogIkdFVCIsICJ1cmwiOiAieyUgZW5kaWYgJX0iLCAiaGVhZGVycyI6IFtdLCAiY29va2llcyI6IFtdLCAiZGF0YSI6ICIifSwgInJ1bGUiOiB7InN1Y2Nlc3NfYXNzZXJ0cyI6IFtdfX1d",
+ "date": "2024-08-18 21:36:45",
+ "version": "20240818",
+ "commenturl": "https://github.com/qd-today/templates/issues/639"
}
}
}
\ No newline at end of file