Skip to content

Commit 8311e05

Browse files
binaryYukibinaryYuki
committed
feat: remove unused db
Signed-off-by: binaryYuki <60097976+binaryYuki@users.noreply.github.com>
1 parent 1e76d4f commit 8311e05

File tree

10 files changed

+10
-575
lines changed

10 files changed

+10
-575
lines changed

‎.github/workflows/autoci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
context: .
134134
platforms: linux/amd64,linux/arm64
135135
push: true
136-
tags: akkk1234/oleapi:latest
136+
tags: akkk1234/oleapi:test
137137
cache-from: type=local,src=/tmp/.buildx-cache
138138
cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
139139
build-args: |

‎_auth.py‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
import datetime
2-
import json
32
import os
43
from logging import getLogger
54

65
import dotenv
76
import jwt
87
from fastapi import APIRouter, BackgroundTasks, Request
9-
from sqlalchemy import text
108
from starlette.responses import JSONResponse
119

12-
from _db import SessionLocal, User, WebHookStorage
13-
1410
logger = getLogger(__name__)
1511

1612
dotenv.load_dotenv()
@@ -59,48 +55,7 @@ async def store_webhook_data(data: dict):
5955
"""
6056
:param data:
6157
"""
62-
async with SessionLocal() as session:
63-
async with session.begin():
64-
webhook = WebHookStorage(
65-
hook_id=data["hookId"],
66-
event=data["event"],
67-
session_id=data["sessionId"],
68-
user_agent=data["userAgent"],
69-
user_ip=data["userIp"],
70-
sessionId=data["sessionId"],
71-
)
72-
data = data['user']
73-
user = User(
74-
id=data['id'],
75-
username=data['username'],
76-
primaryEmail=data['primaryEmail'],
77-
primaryPhone=data['primaryPhone'],
78-
name=data['name'],
79-
avatar=data['avatar'],
80-
customData=json.dumps(data['customData']), # 将字典序列化为JSON字符串
81-
identities=json.dumps(data['identities']),
82-
profile=json.dumps(data['profile']),
83-
applicationId=data['applicationId'],
84-
lastSignInAt=data['lastSignInAt'] / 1000,
85-
createdAt=data['createdAt'] / 1000,
86-
updatedAt=data['updatedAt'] / 1000,
87-
)
88-
# 通过 id 判断用户是否存在 如果存在就更新用户信息 否则插入新用户
89-
user_exist = await session.execute(text(f"SELECT * FROM users WHERE id='{data['id']}'"))
90-
user_exist = user_exist.fetchone()
91-
if user_exist:
92-
await session.execute(
93-
text(f"UPDATE users SET username='{data['username']}', primaryEmail='{data['primaryEmail']}', "
94-
f"primaryPhone='{data['primaryPhone']}', name='{data['name']}', avatar='{data['avatar']}', "
95-
f"customData='{json.dumps(data['customData'])}', identities='{json.dumps(data['identities'])}', "
96-
f"profile='{json.dumps(data['profile'])}', applicationId='{data['applicationId']}', "
97-
f"lastSignInAt='{data['lastSignInAt'] / 1000}', createdAt='{data['createdAt'] / 1000}', "
98-
f"updatedAt='{data['updatedAt'] / 1000}' WHERE id='{data['id']}'"))
99-
else:
100-
session.add(user)
101-
session.add(webhook)
102-
await session.commit()
103-
await session.close()
58+
pass
10459

10560

10661
@authRoute.api_route('/hook', methods=['POST'])

‎_cronjobs.py‎

Lines changed: 2 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import json
22
import logging
3-
from datetime import datetime
43

54
from fastapi_utils.tasks import repeat_every
65
from httpx import AsyncClient
7-
from sqlalchemy.exc import OperationalError
86

9-
from _db import PushLog, SessionLocal, test_db_connection
107
from _redis import delete_key, get_key, get_keys_by_pattern, redis_client, set_key as redis_set_key
118

129
logger = logging.getLogger(__name__)
@@ -20,46 +17,7 @@ async def logPushTask(taskId: str, data: dict):
2017
:return: Boolean
2118
:example: {'data': {'baseURL': 'https://api.day.app/uKeSrwm3ainGgn5SAmRyg9/', 'msg': 'You have a new notification!', 'push_receiver': 'yuki', 'icon': 'https://static.olelive.com/snap/fa77502e442ee6bbd39be20b2a2810ee.jpg?_n=202409290554', 'click_url': 'https://example.com', 'is_passive': False, 'headers': {'Authorization': 'Bearer your_token_here', 'Content-Type': 'application/json'}, 'log_data': {'push_id': '12345', 'push_receiver': 'user@example.com', 'push_by': 'system'}}, 'result': 'success'}
2219
"""
23-
async with SessionLocal() as session:
24-
async with session.begin():
25-
push_result = True if data['result'] == 'success' else False
26-
pushLog = PushLog(
27-
push_id=taskId,
28-
push_receiver=data['data']['log_data']['push_receiver'],
29-
push_channel="bark",
30-
push_at=datetime.now(),
31-
push_by=data['data']['log_data']['push_by'] if 'push_by' in data['data']['log_data'] else 'system',
32-
push_result=push_result,
33-
push_message=data['data']['msg'],
34-
push_server='bark',
35-
user_id=data['data']['log_data']['user_id'] if 'user_id' in data['data']['log_data'] else None
36-
)
37-
session.add(pushLog)
38-
try:
39-
await session.commit()
40-
return True
41-
except OperationalError as e:
42-
async with session.begin():
43-
session.rollback()
44-
pushLog = PushLog(
45-
push_id=taskId,
46-
push_receiver=data['data']['log_data']['push_receiver'],
47-
push_channel="bark",
48-
push_at=datetime.now(),
49-
push_by=data['data']['log_data']['push_by'] if 'push_by' in data['data'][
50-
'log_data'] else 'system',
51-
push_result=push_result,
52-
push_message=data['data']['msg'],
53-
push_server='bark',
54-
user_id=data['data']['log_data']['user_id'] if 'user_id' in data['data']['log_data'] else None
55-
)
56-
session.add(pushLog)
57-
await session.commit()
58-
return True
59-
except Exception as e:
60-
logger.error(f"Failed to log push task: {e}", exc_info=True)
61-
return False
62-
20+
pass
6321

6422
@repeat_every(seconds=30, wait_first=True) # wait_first=True 表示等待第一次执行 也就是启动时执行
6523
async def pushTaskExecQueue() -> bool:
@@ -128,6 +86,4 @@ async def keepMySQLAlive():
12886
"""
12987
Keep MySQL alive avoid server from cool startup
13088
"""
131-
await test_db_connection()
132-
# print("MySQL is alive")
133-
return True
89+
pass

0 commit comments

Comments
 (0)