diff --git a/.github/workflows/autoReserve.yml b/.github/workflows/autoReserve.yml index 97e85678..032b5d8d 100644 --- a/.github/workflows/autoReserve.yml +++ b/.github/workflows/autoReserve.yml @@ -10,6 +10,16 @@ on: - '.github/workflows/**' schedule: - cron: '20 0,1 * * *' + workflow_dispatch: + logLevel: + description: 'Log level' + required: true + default: 'warning' + type: choice + options: + - info + - warning + - debug env: TZ: Asia/Shanghai @@ -57,4 +67,4 @@ jobs: # # stop the build if there are Python syntax errors or undefined names # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics # # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide -# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics \ No newline at end of file +# flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics diff --git a/.gitignore b/.gitignore index 00cc65c4..6388655a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /.idea/vcs.xml /.idea/* /__pycache__/* +.DS_Store diff --git a/config.py b/config.py index 600f1c86..f63d04c0 100644 --- a/config.py +++ b/config.py @@ -1,5 +1,7 @@ import os + + ''' *********** 商品配置 *********** ''' @@ -18,15 +20,15 @@ 如没有配置则不推送消息 为了安全,这里使用的环境配置.git里面请自行百度如何添加secrets.pycharm也可以自主添加.如果你实在不会,就直接用明文吧(O.o) ''' -PUSH_TOKEN = os.environ.get("PUSHPLUS_KEY") - +# PUSH_TOKEN = os.environ.get("PUSHPLUS_KEY") +PUSH_TOKEN = "6875d2d9ff6c48e897f9e9cfd6fefc9c" ''' *********** 地图配置 *********** 获取地点信息,这里用的高德api,需要自己去高德开发者平台申请自己的key ''' -AMAP_KEY = os.environ.get("GAODE_KEY") - +# AMAP_KEY = os.environ.get("GAODE_KEY") +AMAP_KEY = "b2519ad6d7dab6b816847958fe5d551b" ''' *********** 个人账户认证配置 *********** @@ -45,7 +47,8 @@ 如果不会配置环境变量(建议学习)、不care安全性、非开源运行,你可以在这里明文指定,eg:PRIVATE_AES_KEY = '666666' ps:本来是写了判断是否配置密钥,可以自由选择明文保存的方式。但是还是为了安全性,限制了必须使用AES加密。哪怕是明文密钥。 ''' -PRIVATE_AES_KEY = os.environ.get("PRIVATE_AES_KEY") +# PRIVATE_AES_KEY = os.environ.get("PRIVATE_AES_KEY") +PRIVATE_AES_KEY = '123456' ''' diff --git a/myConfig/credentials b/myConfig/credentials index 78825fa9..4fe50ee7 100644 --- a/myConfig/credentials +++ b/myConfig/credentials @@ -1,30 +1,20 @@ -[uWR4tJYwwGVeVsmJj9R14g==] -hidemobile = 133****5975 -enddate = 9 -userid = W96eIlsWXyCd6ublmyJ9EA== -province = 浙江省 -city = 杭州市 -token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcwNjUzMDIzMSwidXNlcklkIjoxMDY1MzY5Mjc0LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcwMzkzODIzMX0.ClVujF3kFWXmnbaryYlxTt9lPM9IZNVq6DehCxyZeu8 -lat = 29.832377 -lng = 119.737102 +[nD8/xxBuEtHe1QqSM+3KVw==] +hidemobile = 185****1386 +enddate = 20241231 +userid = rnSFJHBsz9yReqSCNsdj/w== +province = 北京市 +city = 北京市 +token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcxNDY0Nzc4NCwidXNlcklkIjoxMTE4NTQyMjI2LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcxMjA1NTc4NH0.NS2AnsPD3LSPwjCVBCHN6209PlkaO6HJ-5SImbXxjc0 +lat = 40.045464 +lng = 116.401477 -[jFBvOaeHYivLlO74LP9NVg==] -hidemobile = 189****2497 -enddate = 9 -userid = wPyBsPLCEGHWLpMIjGt+gQ== -province = 安徽省 -city = 合肥市 -token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcwNjUzMDE2NCwidXNlcklkIjoxMTI2Nzk0MTU0LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcwMzkzODE2NH0.uXsw-2VXcwRKTvSWtfoAAlbIDGk3FCEZqUVhaUM0Jz0 -lat = 31.711810 -lng = 117.312910 - -[ocI3HatJ83n9d2GA4KQKPw==] -hidemobile = 156****4670 -enddate = 20240301 -userid = F4SFqJZwSkm7lw8OTAwYAQ== -province = 山东省 -city = 青岛市 -token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcwNjUzMDM5NiwidXNlcklkIjoxMTI1NTAzOTc2LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcwMzkzODM5Nn0.Wf7YHN_6jNKxUSjPH51Y1TRAgjWuZISVJb9F9UodV5A -lat = 35.999910 -lng = 120.147283 +[0vtH7/CpZNK0v6Xq1mt7jA==] +hidemobile = 131****2179 +enddate = 20241231 +userid = E65tQiMMmSmnXUbmnW4JmA== +province = 北京市 +city = 北京市 +token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcxNDY0Nzk0MywidXNlcklkIjoxMTU0Nzk5MDIyLCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcxMjA1NTk0M30.s0R5trs9Rc2PIZkJsFN8DvkmK5sD3MJi1aBSdgCjYrg +lat = 40.045464 +lng = 116.401477