diff --git a/.trae/documents/Optimize Payment Flow and Registration Management.md b/.trae/documents/Optimize Payment Flow and Registration Management.md new file mode 100644 index 0000000..1303b2c --- /dev/null +++ b/.trae/documents/Optimize Payment Flow and Registration Management.md @@ -0,0 +1,37 @@ +I will optimize the registration and payment flow with the specific requirement to record the actual payment amount. + +### 1. Backend Updates (`main.py`) +- **Database Schema**: Add `out_trade_no` column to `gsdh_data` to link users with payment orders. +- **Pre-payment Validation**: + - Update `create_payment` (H5) and `create_native_payment`. + - Check if phone exists in `gsdh_data`. + - **Logic**: + - If `fee` has a valid amount (not empty, '0', or 'PENDING'), reject as "Already Registered". + - If `fee` is empty/PENDING, allow payment. + - Upsert user with `fee` = 'PENDING' and `payment_channel` = '..._pending'. +- **Payment Status Sync**: + - Update `check_payment_status`: + - When WeChat returns `SUCCESS`: + - **Update `fee`** to the actual configured payment amount (e.g., "0.01"). + - Update `payment_channel` to the final channel (removing '_pending'). + - Update `out_trade_no` logic to ensure we find the correct user. + +### 2. Frontend Optimization (`templates/ticket.html`) +- **Dynamic Form Fields**: + - Replace hardcoded inputs with a loop that renders fields based on `config.field_config` (managed in Admin). + - Respect "Show", "Required", and "Label" settings. +- **QR Code Modal**: + - Add explicit text: "请使用微信扫一扫完成支付" (Please use WeChat Scan to pay). + - Optimize layout. +- **Payment Logic**: + - Handle "Already Registered" error. + - Redirect to Success Page on completion. + +### 3. New Success Page +- Create `templates/success.html` to show a "Registration Successful" message. +- Add route in `main.py`. + +### 4. Admin Interface +- Verify `templates/admin.html` field configuration works with the new `ticket.html` dynamic rendering. + +This ensures that successful payments overwrite the 'PENDING' status with the actual amount paid. \ No newline at end of file diff --git a/__pycache__/main.cpython-312.pyc b/__pycache__/main.cpython-312.pyc index 664b0f1..d272258 100644 Binary files a/__pycache__/main.cpython-312.pyc and b/__pycache__/main.cpython-312.pyc differ diff --git a/config.json b/config.json index 939d34e..602effb 100644 --- a/config.json +++ b/config.json @@ -9,20 +9,37 @@ "bg_color": "#050814", "header_image": "/static/image1.jpg", "enable_ticket_validation": false, - "enable_payment": false, + "enable_payment": true, "payment_amount": 0.01, "wechat_pay_config": { - "appid": "", - "mchid": "", - "api_v3_key": "", - "serial_no": "", - "private_key_path": "", - "notify_url": "" + "appid": "wxdf2ca73e6c0929f0", + "mchid": "1723685511", + "api_v3_key": "XishanquBanzhanweixinzhifumiyao3", + "serial_no": "49E299FC2F01841ECD6658D8B037C5338BD170BA", + "private_key_path": "static/cert/apiclient_key.pem", + "notify_url": "https://event.quant-speed.com/ticket/finish/" }, "enable_seating": false, "total_tables": 14, "max_per_table": 10, - "field_config": { + "ticket_field_config": { + "name": { + "label": "姓名", + "show": true, + "required": true + }, + "phone": { + "label": "手机号码", + "show": true, + "required": true + }, + "industry_company": { + "label": "单位名称", + "show": true, + "required": true + } + }, + "checkin_field_config": { "name": { "label": "姓名", "show": true, @@ -36,31 +53,31 @@ "company_name": { "label": "单位名称", "show": true, - "required": true + "required": false }, "position": { "label": "职务", "show": true, - "required": true + "required": false }, "business_scope": { "label": "公司主要经营 / 业务", "show": true, - "required": true + "required": false }, "vision_2026": { "label": "2026年业务愿景", - "show": false, + "show": true, "required": false } }, "wall_config": { - "bg_opacity": 0.9, + "bg_opacity": 0.3, "show_title": true, - "learn_more_url": "https://www.example.com", + "learn_more_url": "", "show_fields": { "name": true, - "company_name": false, + "company_name": true, "position": true, "vision_2026": true, "business_scope": true @@ -68,7 +85,7 @@ }, "db_host": "6.6.6.66", "db_port": "5432", - "db_user": "AI_event", - "db_password": "123AI_event", - "db_name": "AI_event" + "db_user": "123", + "db_password": "1231", + "db_name": "123" } \ No newline at end of file diff --git a/docker_deply.sh b/docker_deply.sh index 9c2346e..9d22996 100755 --- a/docker_deply.sh +++ b/docker_deply.sh @@ -19,10 +19,16 @@ # SERVER_PORT="6222" # 配置局域网变量 - 公司局域网上传方法 -SERVER_HOST="6.6.6.86" # 服务器IP地址 -SERVER_USER="ubuntu" # 服务器用户名 -SERVER_PASSWORD="qweasdzxc1" # 服务器密码 -SERVER_PORT="22" # SSH端口，默认22 +# SERVER_HOST="6.6.6.86" # 服务器IP地址 +# SERVER_USER="ubuntu" # 服务器用户名 +# SERVER_PASSWORD="qweasdzxc1" # 服务器密码 +# SERVER_PORT="22" # SSH端口，默认22 + + +SERVER_HOST="6.6.6.66" # 服务器IP地址 +SERVER_USER="quant" # 服务器用户名 +SERVER_PASSWORD="123quant-speed" # 服务器密码 +SERVER_PORT="22" IMAGE_NAME="checkin_sys" # Docker镜像名称 @@ -163,27 +169,32 @@ deploy_on_server() { sshpass -p "$SERVER_PASSWORD" ssh -p "$SERVER_PORT" -o StrictHostKeyChecking=no "${SERVER_USER}@${SERVER_HOST}" << EOF set -e + # 定义 sudo 包装函数以处理密码输入 + run_sudo() { + echo "$SERVER_PASSWORD" | sudo -S -p '' "\$@" + } + echo "[INFO] 开始服务器端部署..." # 检查并停止现有容器 - if sudo docker ps -a --format 'table {{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then + if run_sudo docker ps -a --format 'table {{.Names}}' | grep -q "^${CONTAINER_NAME}$"; then echo "[INFO] 发现现有容器 ${CONTAINER_NAME}，正在停止并删除..." - sudo docker stop ${CONTAINER_NAME} || true - sudo docker rm ${CONTAINER_NAME} || true + run_sudo docker stop ${CONTAINER_NAME} || true + run_sudo docker rm ${CONTAINER_NAME} || true fi # 检查并删除现有镜像 - if sudo docker images --format 'table {{.Repository}}:{{.Tag}}' | grep -q "^${IMAGE_NAME}:${IMAGE_TAG}$"; then + if run_sudo docker images --format 'table {{.Repository}}:{{.Tag}}' | grep -q "^${IMAGE_NAME}:${IMAGE_TAG}$"; then echo "[INFO] 发现现有镜像 ${IMAGE_NAME}:${IMAGE_TAG}，正在删除..." - sudo docker rmi ${IMAGE_NAME}:${IMAGE_TAG} || true + run_sudo docker rmi ${IMAGE_NAME}:${IMAGE_TAG} || true fi # 加载新镜像 echo "[INFO] 加载新镜像..." - sudo docker load -i /tmp/${TAR_FILE} + run_sudo docker load -i /tmp/${TAR_FILE} # 验证镜像是否加载成功 - if sudo docker images | grep -q "${IMAGE_NAME}"; then + if run_sudo docker images | grep -q "${IMAGE_NAME}"; then echo "[SUCCESS] 镜像加载成功" else echo "[ERROR] 镜像加载失败" @@ -194,21 +205,21 @@ deploy_on_server() { echo "[INFO] 启动新容器..." # 使用 host 网络模式，让容器直接使用宿主机网络栈，从而可以通过 localhost:5432 访问宿主机数据库 # 同时覆盖环境变量，强制使用本地数据库配置 - sudo docker run -d --network host --name ${CONTAINER_NAME} \ + run_sudo docker run -d --network host --name ${CONTAINER_NAME} \ --env-file /tmp/.env \ -e DB_HOST=localhost \ -e DB_PORT=5432 \ ${IMAGE_NAME}:${IMAGE_TAG} # 验证容器是否启动成功 - if sudo docker ps | grep -q "${CONTAINER_NAME}"; then + if run_sudo docker ps | grep -q "${CONTAINER_NAME}"; then echo "[SUCCESS] 容器启动成功" echo "[INFO] 容器状态:" - sudo docker ps | grep "${CONTAINER_NAME}" + run_sudo docker ps | grep "${CONTAINER_NAME}" else echo "[ERROR] 容器启动失败" echo "[INFO] 查看容器日志:" - sudo docker logs ${CONTAINER_NAME} + run_sudo docker logs ${CONTAINER_NAME} exit 1 fi diff --git a/main.py b/main.py index c1dc8d0..7677b78 100644 --- a/main.py +++ b/main.py @@ -13,6 +13,11 @@ import os import json import shutil import difflib +import time +import base64 +import requests +from cryptography.hazmat.primitives import serialization, hashes +from cryptography.hazmat.primitives.asymmetric import padding from concurrent.futures import ProcessPoolExecutor from dotenv import load_dotenv @@ -39,7 +44,12 @@ DEFAULT_CONFIG = { "enable_seating": True, "total_tables": 14, "max_per_table": 10, - "field_config": { + "ticket_field_config": { + "name": {"label": "姓名", "show": True, "required": True}, + "phone": {"label": "手机号码", "show": True, "required": True}, + "industry_company": {"label": "单位名称", "show": True, "required": True} + }, + "checkin_field_config": { "name": {"label": "姓名", "show": True, "required": True}, "phone": {"label": "手机号码", "show": True, "required": True}, "company_name": {"label": "单位名称", "show": True, "required": False}, @@ -1198,6 +1208,7 @@ def reset_database(): industry_company VARCHAR(200), fee VARCHAR(50), payment_channel VARCHAR(50), + out_trade_no VARCHAR(100), is_signed VARCHAR(10) DEFAULT 'FALSE' ); """) @@ -1270,6 +1281,7 @@ def init_database(): industry_company VARCHAR(200), fee VARCHAR(50), payment_channel VARCHAR(50), + out_trade_no VARCHAR(100), is_signed VARCHAR(10) DEFAULT 'FALSE' ); """) @@ -1323,6 +1335,7 @@ def init_database(): safe_add_column('gsdh_data', 'fee', 'VARCHAR(50)') safe_add_column('gsdh_data', 'payment_channel', 'VARCHAR(50)') + safe_add_column('gsdh_data', 'out_trade_no', 'VARCHAR(100)') safe_add_column('gsdh_data', 'is_signed', "VARCHAR(10) DEFAULT 'FALSE'") safe_add_column('checkin_info', 'social_point', 'INTEGER DEFAULT 5') @@ -1434,6 +1447,58 @@ class WeChatPayService: else: raise Exception(f"WeChat Pay Error: {response.text}") + def native_payment(self, description, out_trade_no, amount_fen, client_ip=None): + url = "https://api.mch.weixin.qq.com/v3/pay/transactions/native" + path = "/v3/pay/transactions/native" + + data = { + "appid": self.appid, + "mchid": self.mchid, + "description": description, + "out_trade_no": out_trade_no, + "notify_url": self.notify_url, + "amount": { + "total": amount_fen, + "currency": "CNY" + } + } + + body = json.dumps(data) + auth = self.build_authorization_header("POST", path, body) + + headers = { + "Content-Type": "application/json", + "Accept": "application/json", + "Authorization": auth + } + + response = requests.post(url, data=body, headers=headers) + + if response.status_code in [200, 202]: + return response.json() + else: + raise Exception(f"WeChat Pay Error: {response.text}") + + def query_order(self, out_trade_no): + url = f"https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{out_trade_no}?mchid={self.mchid}" + path = f"/v3/pay/transactions/out-trade-no/{out_trade_no}?mchid={self.mchid}" + + auth = self.build_authorization_header("GET", path, "") + + headers = { + "Accept": "application/json", + "Authorization": auth + } + + response = requests.get(url, headers=headers) + + if response.status_code == 200: + return response.json() + elif response.status_code == 404: + return {"trade_state": "NOTPAY"} # Or handle as not found + else: + raise Exception(f"WeChat Query Error: {response.text}") + @app.get("/ticket", response_class=HTMLResponse) async def ticket_page(request: Request): global CONFIG @@ -1444,6 +1509,12 @@ async def ticket_page(request: Request): return templates.TemplateResponse("ticket.html", {"request": request, "config": CONFIG}) +@app.get("/success", response_class=HTMLResponse) +async def success_page(request: Request): + global CONFIG + CONFIG = load_config() + return templates.TemplateResponse("success.html", {"request": request, "config": CONFIG}) + class TicketPaymentRequest(BaseModel): name: str phone: str @@ -1488,23 +1559,31 @@ async def create_payment(req: TicketPaymentRequest, request: Request): new_id = str(max_id + 1) # Upsert user (if phone exists, update; else insert) - # Actually, if phone exists, we should update. - cur.execute("SELECT new_id FROM gsdh_data WHERE phone = %s", (req.phone,)) + cur.execute("SELECT new_id, fee FROM gsdh_data WHERE phone = %s", (req.phone,)) existing = cur.fetchone() if existing: user_id = existing[0] + current_fee = existing[1] + + # Validation: Check if already paid + # Conditions for "Unpaid": None, Empty String, '0', 'PENDING' + if current_fee and current_fee not in ['0', 'PENDING']: + cur.close() + release_db_connection(conn) + return JSONResponse(content={"success": False, "message": "该手机号已完成报名，无需重复支付"}, status_code=400) + cur.execute(""" UPDATE gsdh_data - SET name=%s, industry_company=%s, fee='PENDING', payment_channel='wechat_h5_pending' + SET name=%s, industry_company=%s, fee='PENDING', payment_channel='wechat_h5_pending', out_trade_no=%s WHERE new_id=%s - """, (req.name, req.company_name, user_id)) + """, (req.name, req.company_name, out_trade_no, user_id)) else: user_id = new_id cur.execute(""" - INSERT INTO gsdh_data (new_id, name, phone, industry_company, fee, payment_channel, is_signed) - VALUES (%s, %s, %s, %s, 'PENDING', 'wechat_h5_pending', 'FALSE') - """, (user_id, req.name, req.phone, req.company_name)) + INSERT INTO gsdh_data (new_id, name, phone, industry_company, fee, payment_channel, is_signed, out_trade_no) + VALUES (%s, %s, %s, %s, 'PENDING', 'wechat_h5_pending', 'FALSE', %s) + """, (user_id, req.name, req.phone, req.company_name, out_trade_no)) # Also store extra info in checkin_info? # Requirement: "If registration paid then add to gsdh_data" @@ -1540,6 +1619,141 @@ async def create_payment(req: TicketPaymentRequest, request: Request): release_db_connection(conn) return JSONResponse(content={"success": False, "message": str(e)}, status_code=500) +@app.post("/api/payment/native") +async def create_native_payment(req: TicketPaymentRequest, request: Request): + """ + 处理 Native 支付请求 (扫码支付)。 + """ + try: + global CONFIG + CONFIG = load_config() + + if not CONFIG.get("enable_payment", False): + return JSONResponse(content={"success": False, "message": "支付未开启"}, status_code=403) + + wc_config = CONFIG.get("wechat_pay_config", {}) + service = WeChatPayService(wc_config) + + # 1. Generate Order ID + out_trade_no = f"TICKET_{int(time.time())}_{uuid.uuid4().hex[:6]}" + + # 2. Amount (Convert to Fen) + amount_yuan = float(CONFIG.get("payment_amount", 0.01)) + amount_fen = int(amount_yuan * 100) + + # 3. Save Temporary User Data (Pending Payment) + conn = get_db_connection() + cur = conn.cursor() + + # Calculate new ID + cur.execute("SELECT MAX(CAST(new_id AS INTEGER)) FROM gsdh_data WHERE new_id ~ '^[0-9]+$'") + row = cur.fetchone() + max_id = row[0] if row and row[0] is not None else 0 + new_id = str(max_id + 1) + + # Upsert user + cur.execute("SELECT new_id, fee FROM gsdh_data WHERE phone = %s", (req.phone,)) + existing = cur.fetchone() + + if existing: + user_id = existing[0] + current_fee = existing[1] + + # Validation: Check if already paid + if current_fee and current_fee not in ['0', 'PENDING']: + cur.close() + release_db_connection(conn) + return JSONResponse(content={"success": False, "message": "该手机号已完成报名，无需重复支付"}, status_code=400) + + cur.execute(""" + UPDATE gsdh_data + SET name=%s, industry_company=%s, fee='PENDING', payment_channel='微信线上支付_pending', out_trade_no=%s + WHERE new_id=%s + """, (req.name, req.company_name, out_trade_no, user_id)) + else: + user_id = new_id + cur.execute(""" + INSERT INTO gsdh_data (new_id, name, phone, industry_company, fee, payment_channel, is_signed, out_trade_no) + VALUES (%s, %s, %s, %s, 'PENDING', '微信线上支付_pending', 'FALSE', %s) + """, (user_id, req.name, req.phone, req.company_name, out_trade_no)) + + conn.commit() + cur.close() + release_db_connection(conn) + + # 4. Call WeChat Pay + try: + res = service.native_payment( + description=f"{CONFIG.get('event_title', 'Event')} Ticket", + out_trade_no=out_trade_no, + amount_fen=amount_fen, + client_ip=request.client.host + ) + code_url = res.get("code_url") + return {"success": True, "code_url": code_url, "out_trade_no": out_trade_no} + + except Exception as wx_e: + print(f"WeChat Pay Failed: {wx_e}") + if "Private key not loaded" in str(wx_e): + return JSONResponse(content={"success": False, "message": "服务端未配置支付证书，无法发起支付"}, status_code=500) + return JSONResponse(content={"success": False, "message": f"支付请求失败: {str(wx_e)}"}, status_code=500) + + except Exception as e: + if 'conn' in locals() and conn: + release_db_connection(conn) + return JSONResponse(content={"success": False, "message": str(e)}, status_code=500) + +@app.get("/api/payment/check/{out_trade_no}") +async def check_payment_status(out_trade_no: str): + """ + 查询订单支付状态。 + """ + try: + global CONFIG + CONFIG = load_config() + wc_config = CONFIG.get("wechat_pay_config", {}) + service = WeChatPayService(wc_config) + + # Call WeChat Query API + try: + res = service.query_order(out_trade_no) + trade_state = res.get("trade_state") + + if trade_state == "SUCCESS": + # Update DB to mark as paid + conn = get_db_connection() + try: + cur = conn.cursor() + + # Get actual amount from Config + amount = str(CONFIG.get("payment_amount", 0.01)) + + # Update gsdh_data + # Remove '_pending' suffix from payment_channel and set actual fee + cur.execute(""" + UPDATE gsdh_data + SET fee = %s, + payment_channel = REPLACE(payment_channel, '_pending', '') + WHERE out_trade_no = %s + """, (amount, out_trade_no)) + + conn.commit() + cur.close() + finally: + release_db_connection(conn) + + return {"success": True, "trade_state": trade_state} + + except Exception as wx_e: + # Mock for testing without keys + if "Private key not loaded" in str(wx_e): + # Simulate success for testing? No, stick to error. + return {"success": False, "message": "配置错误"} + return {"success": False, "message": str(wx_e)} + + except Exception as e: + return JSONResponse(content={"success": False, "message": str(e)}, status_code=500) + @app.post("/api/payment/notify") async def payment_notify(request: Request): # Handle WeChat Pay Callback diff --git a/static/cert/apiclient_cert.p12 b/static/cert/apiclient_cert.p12 new file mode 100644 index 0000000..886960b Binary files /dev/null and b/static/cert/apiclient_cert.p12 differ diff --git a/static/cert/apiclient_cert.pem b/static/cert/apiclient_cert.pem new file mode 100644 index 0000000..4b37b5e --- /dev/null +++ b/static/cert/apiclient_cert.pem @@ -0,0 +1,25 @@ +-----BEGIN CERTIFICATE----- +MIIEITCCAwmgAwIBAgIUSeKZ/C8BhB7NZljYsDfFM4vRcLowDQYJKoZIhvcNAQEL +BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT +FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg +Q0EwHhcNMjYwMTI4MTQxNTE4WhcNMzEwMTI3MTQxNTE4WjB7MRMwEQYDVQQDDAox +NzIzNjg1NTExMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM +HuS6keWNl+mHj+i/ueenkeaKgOaciemZkOWFrOWPuDELMAkGA1UEBhMCQ04xETAP +BgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA +xxKpTgk0MAbX/cU2zXn9T6uCWToRJzNXiGf45RIcP9mD7wlXdr3p2HQ6Vv3zhDKE +goj980THhoaqX3mWXs9jxMNtdXPsjrFXk0I0e0O7BqFl/5pVicoDv3GZ/LASdqwC +rLFWZRmmkB45ehb5qoFBTFBmE3SS5qm8v2UbrrRMuu07vM1AHmtw36YyAlGRKaMj +fQVr5l0u9769j2F8Rd8/HlyiyjUZjhpRiGuv/n1eEWoL6ZIFGA/BCPgvU+Q+Xm3q +6aZd8odO5p2c1knlV/dJfRv2vC9Q8fXLalr3UQF0bM0vFCKn2sWLRYFo9Z+Nep51 +/S9eUZn+7yhpxoImKBGycQIDAQABo4G5MIG2MAkGA1UdEwQCMAAwCwYDVR0PBAQD +AgP4MIGbBgNVHR8EgZMwgZAwgY2ggYqggYeGgYRodHRwOi8vZXZjYS5pdHJ1cy5j +b20uY24vcHVibGljL2l0cnVzY3JsP0NBPTFCRDQyMjBFNTBEQkMwNEIwNkFEMzk3 +NTQ5ODQ2QzAxQzNFOEVCRDImc2c9SEFDQzQ3MUI2NTQyMkUxMkIyN0E5RDMzQTg3 +QUQxQ0RGNTkyNkUxNDAzNzEwDQYJKoZIhvcNAQELBQADggEBAEqNn5h/g+PNkbwM +2sIl8aSgtB1tOgBAQH0sI2zqJbP/nEkeqAS1PL7Eo8EwbVrxXQV7rv75+iF8g3ry +DiCGGgooO4F/Ohh3X1BwiSKokzl8sZV6rB/ojHKkfwA0GE9xualqo2sikGpNQyUt +BeDp9OC8puBd7LR8KK8fJ7+3e3xcnH+cWZ6IZCRXgVtlofvM3OuzHQs0Bq31B4fp +yhuX1Dig/gldeKt2S624tUfOaVVdFROikYFKx8vxcsWmKMZnK8M5UBiJJIE/txvK +TT+vRUXdjZ737j4GQ86T6vedn5S88rFFiBv7LsQTIa69CRdD2dGajoTexgh1m+l9 +LsHf65A= +-----END CERTIFICATE----- diff --git a/static/cert/apiclient_key.pem b/static/cert/apiclient_key.pem new file mode 100644 index 0000000..6f7ba2d --- /dev/null +++ b/static/cert/apiclient_key.pem @@ -0,0 +1,28 @@ +-----BEGIN PRIVATE KEY----- +MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHEqlOCTQwBtf9 +xTbNef1Pq4JZOhEnM1eIZ/jlEhw/2YPvCVd2venYdDpW/fOEMoSCiP3zRMeGhqpf +eZZez2PEw211c+yOsVeTQjR7Q7sGoWX/mlWJygO/cZn8sBJ2rAKssVZlGaaQHjl6 +FvmqgUFMUGYTdJLmqby/ZRuutEy67Tu8zUAea3DfpjICUZEpoyN9BWvmXS73vr2P +YXxF3z8eXKLKNRmOGlGIa6/+fV4RagvpkgUYD8EI+C9T5D5eberppl3yh07mnZzW +SeVX90l9G/a8L1Dx9ctqWvdRAXRszS8UIqfaxYtFgWj1n416nnX9L15Rmf7vKGnG +giYoEbJxAgMBAAECggEAf6NzcllsYK7Cpi9gp/ZjeEWbWeJlRSEiKo+fgiBOhJHO +ieEPd07lNKexED3beRN66sczLFsZIyQM8RJgW4HVkj9LW1dsgUEryXtVcwNGU0YA +xBYMakBgjssj1GSAMh6vyFIb9s6vgRAgAivhAHXHjEqwaCECX2rNXlpRmX55BBAd +nMudGbbnb/jE9EUVOEvovrYqfCCxloHejCEY2/XwmU2GpGkDQIklOv2gnsvAWvDu +V+jx8OlMDeyoAZ65yIdRzgrX20JmxqyXZPOfbleNmR3F03sgpuv5cZSZVgLU8Hd+ +CPVDGOV66kupFmsMi5R2rvrExhTp4I0V6s5s+wwNAQKBgQDu7G8BQcUB4NXsKemf +D89e5di0BKK5+MvMDGYTRmEMJJ9Ag1iCD11/4eg6iEei1h6TRTxmvDWm3e20KnrK +8Ug3oJQf8kYYUGgmIDhvWegfbAw1RNoZ9+I7UYofUzFk4pAdJMMqolc0kXIoOPX7 +uym/FiDgIqstjNRr+kbLtU8/qQKBgQDVTRU/cE3R0eZMDZ3EvbqD00BzPmK3h3Hs +9358oh3v0Xf69p2TH58gVpbJPbHydeUvbmjPc6QeRFT9pVA7dFqXi3lJ4WOu9vu+ +l2Sn0NX+g7khDzig8lj27RWxmAVc5H//VqeSxi8Z87JWGKGn1bkttN8MGvCSn8UA +W3LLfRw5iQKBgQCAmI1etdGdozBA/oYZ8N6Ci1/J9LzJMBow53OBaF4PtR5qEMfw +qOiATk06Q+Oax3iJd7h860xNViH82Ohilt9x4WIYl8QWjiCgdLMra86+Kt+fREHH +vF3t44NePN7XGALNTN4m8l3Rk39IGvB631Am43gqaz6LM8OZoom8VwgikQKBgEFT +4nYTh0ID72zLns5q7X0CbnLdYI6lRRc2ld7GKDUTCpQqhAhTXwEgg/4OjzmbMh5c +ymz/FfzPINiukOwkrrpLVVJzXXxw2Jl+9K0RIPlajpC5gLaKgwTdiA9kaAATW8Bw +YdJqMHLaWHxV/uzQYG7HPqkOdy/xDv0VBQudvc9BAoGBANIzo192Da7c7BrtDetc +C+/sc8B4Y/1mkTDc/LS3b53VfGA+otsCAKZF53ezK8xQrtWONFKF9dWkk/fPERsV +qgfg3WQIiaobDpLbjgbIOkcP/PX2H0HqhrRofDBt6QiTANBuh6FK4KOPnklXuYPp +8Sj4YnidN9RxTxPdIQuoQKaV +-----END PRIVATE KEY----- diff --git a/static/js/qrcode.min.js b/static/js/qrcode.min.js new file mode 100644 index 0000000..993e88f --- /dev/null +++ b/static/js/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
"),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file diff --git a/templates/admin.html b/templates/admin.html index 5dc8ab5..a5e420e 100644 --- a/templates/admin.html +++ b/templates/admin.html @@ -73,6 +73,41 @@ font-size: 1.2rem; border-bottom: 1px solid rgba(255, 255, 255, 0.1); padding-bottom: 10px; + cursor: pointer; + display: flex; + justify-content: space-between; + align-items: center; + user-select: none; + } + + h2::after { + content: '▼'; + font-size: 0.8em; + transition: transform 0.3s; + opacity: 0.7; + } + + .card.collapsed h2::after { + transform: rotate(-90deg); + } + + .card.collapsed h2 { + border-bottom: none; + margin-bottom: 0; + } + + .card-content { + transition: all 0.3s ease-in-out; + max-height: 3000px; /* Ensure enough height for content */ + opacity: 1; + overflow: hidden; + } + + .card.collapsed .card-content { + max-height: 0; + opacity: 0; + margin: 0; + padding: 0; } .form-group { @@ -297,219 +332,259 @@

基本信息设置

-
- - -
-
- - -
-
- - -
-
- - -
-
- - +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
-
+