From 055d3ecf2e6f6e634fe441e06d7255438d95b9b5 Mon Sep 17 00:00:00 2001 From: Yu haishuai <1535188660@qq.com> Date: Thu, 11 Jan 2024 18:23:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- myConfig/credentials | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/myConfig/credentials b/myConfig/credentials index 78825fa9..956aa058 100644 --- a/myConfig/credentials +++ b/myConfig/credentials @@ -1,30 +1,20 @@ -[uWR4tJYwwGVeVsmJj9R14g==] -hidemobile = 133****5975 +[TeT30tpKhxY49AkLTZxllQ==] +hidemobile = 188****6348 enddate = 9 -userid = W96eIlsWXyCd6ublmyJ9EA== -province = 浙江省 -city = 杭州市 -token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcwNjUzMDIzMSwidXNlcklkIjoxMDY1MzY5Mjc0LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcwMzkzODIzMX0.ClVujF3kFWXmnbaryYlxTt9lPM9IZNVq6DehCxyZeu8 -lat = 29.832377 -lng = 119.737102 +userid = NRNY4FFxf94XSTD6EJGURw== +province = 北京市 +city = 北京市 +token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcwNzU1MzE4NCwidXNlcklkIjoxMTQwNzQ2Njk0LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcwNDk2MTE4NH0.t9Epxt6jf4BIKTsPVhQuwpUaPMQHe51pc7lw-FzhxYs +lat = 39.819561 +lng = 116.148279 -[jFBvOaeHYivLlO74LP9NVg==] -hidemobile = 189****2497 +[UeU2IWooeztQo6VDmvLH+g==] +hidemobile = 158****4631 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 +userid = dxo0H1I4C2ceLVg91HU/0g== +province = 北京市 +city = 北京市 +token = eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJtdCIsImV4cCI6MTcwNzU1NDA2MCwidXNlcklkIjoxMTQ0MTEzOTc1LCJkZXZpY2VJZCI6IjJGMjA3NUQwLUI2NkMtNDI4Ny1BOTAzLURCRkY2MzU4MzQyQSIsImlhdCI6MTcwNDk2MjA2MH0.Mppkl92GTJpvtVQrE95o5aL5TZBxqu4CKr18mEwFf6Q +lat = 39.819561 +lng = 116.148279 From 34e9da1da66b7151958ff55426e9cd9afe349354 Mon Sep 17 00:00:00 2001 From: Yu haishuai <1535188660@qq.com> Date: Thu, 11 Jan 2024 20:49:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/actionActive.txt | 10 +++++----- .github/workflows/autoReserve.yml | 4 ++-- config.py | 11 ++++++----- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.github/workflows/actionActive.txt b/.github/workflows/actionActive.txt index af0fc52d..d2b0c3bd 100644 --- a/.github/workflows/actionActive.txt +++ b/.github/workflows/actionActive.txt @@ -1,6 +1,6 @@ action 需要定时激活一下 -20231230201344 -2023-8-17 09:23:23123 -2023-8-1 17:35:431122 -2023-9-9 09:47:42 -2023-9-20 09:39:34 \ No newline at end of file +20240112201344 +2024-1-15 09:23:23123 +2024-1-19 17:35:431122 +2024-1-31 09:47:42 +2024-2-10 09:39:34 \ No newline at end of file diff --git a/.github/workflows/autoReserve.yml b/.github/workflows/autoReserve.yml index 97e85678..46bf6ff6 100644 --- a/.github/workflows/autoReserve.yml +++ b/.github/workflows/autoReserve.yml @@ -25,10 +25,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Set up Python 3.10 + - name: Set up Python 3.8.2 uses: actions/setup-python@v3 with: - python-version: "3.10" + python-version: "3.8.2" - name: Install dependencies run: | python -m pip install --upgrade pip diff --git a/config.py b/config.py index 600f1c86..4184faf9 100644 --- a/config.py +++ b/config.py @@ -19,14 +19,14 @@ 为了安全,这里使用的环境配置.git里面请自行百度如何添加secrets.pycharm也可以自主添加.如果你实在不会,就直接用明文吧(O.o) ''' PUSH_TOKEN = os.environ.get("PUSHPLUS_KEY") - +PUSH_TOKEN = 'edb956c697a04268b851be438de4fb67' ''' *********** 地图配置 *********** 获取地点信息,这里用的高德api,需要自己去高德开发者平台申请自己的key ''' -AMAP_KEY = os.environ.get("GAODE_KEY") - +#AMAP_KEY = os.environ.get("bef9cbb9d786f89cf73fff347373ee7b") +AMAP_KEY = '2068c9b7f292c679e7bf3882bcac3403' ''' *********** 个人账户认证配置 *********** @@ -34,7 +34,7 @@ 不配置,使用默认路径,在项目目录中;如果需要配置,你自己应该也会配置路径 例如: CREDENTIALS_PATH = './myConfig/credentials' ''' -CREDENTIALS_PATH = None +CREDENTIALS_PATH = './myConfig/credentials' ''' @@ -45,7 +45,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 = '1010697281' '''