v2.1.7 — 修复周列表点击事件变量名错误

- 后端 api_calendar_sync_all 查询后自动去重保存到各日期 checkin
- 不再只填充当前选中的日期
- 弹窗显示已填充天数

app.py

@@ -6,10 +6,11 @@ from datetime import timedelta
 from functools import wraps
 from flask import Flask, render_template, request, jsonify, session, redirect, url_for
 from werkzeug.security import generate_password_hash, check_password_hash
-from database import init_db, get_checkin, save_checkin, delete_checkin, get_all_checkins
+from database import init_db, get_checkin, save_checkin, delete_checkin, get_all_checkins, get_weeks_list, get_daily_backup, get_wishes, save_wish, update_wish, delete_wish, reorder_wishes
 
 app = Flask(__name__)
-app.secret_key = os.urandom(24)
+# 固定密钥确保 gunicorn 多 worker 下 session 可互通
+app.secret_key = os.environ.get('SECRET_KEY', 'ziwei-power-secret-2026')
 
 # 会话持久化：30 天
 app.config['PERMANENT_SESSION_LIFETIME'] = timedelta(days=30)
@@ -71,11 +72,35 @@ def logout():
 def compute_stats():
     """计算统计数据，供 API 和模板共用"""
     rows = get_all_checkins()
-    total_days = len(rows)
+    total_weeks = len(rows)
     total_morning = 0
     total_evening = 0
     total_study = 0
     calendar = {}
+    all_morning_items = []
+    all_evening_items = []
+    all_study_items = []
+
+    # 关键词 → 板块 自动归类规则
+    PILLAR_KEYWORDS = {
+        '医药营销': ['科普','科研','学术会议','学术','会议','患者管理','临床推广','临床','药企','处方','KOL','代表','拜访','荣昌','恒瑞','信达','鲁银','OPC','项目','标杆','客户'],
+        '医疗服务': ['诊疗','治疗','医生','医院','科室','手术','门诊','患者','病','护理','诊断','影像','检验'],
+        '医疗支付': ['医保','商保','理赔','支付','保险','费用','报销','商业保险','保单'],
+        'AI 智能': ['AI','数字人','智能','算法','自动化','平台','系统','网站','开发','代码','程序','模型'],
+        '公司治理': ['团队','组织','管理','招聘','HR','制度','流程','财务','考核','KPI','规划','人才','架构','预算'],
+        '个人修养': ['早起','睡觉','俯卧撑','运动','冥想','阅读','复盘','写作','习惯','修身','立志','责善','改过','勤学'],
+    }
+
+    def classify_auto(text):
+        """根据文本内容自动归类"""
+        if not text or not text.strip():
+            return ''
+        text_lower = text.strip()
+        for pillar, keywords in PILLAR_KEYWORDS.items():
+            for kw in keywords:
+                if kw in text_lower:
+                    return pillar
+        return ''  # 未匹配
 
     for row in rows:
         d = row['date']
@@ -84,7 +109,42 @@ def compute_stats():
         evening = data.get('evening', [])
         study = data.get('study', [])
 
-        morning_count = sum(1 for x in morning if isinstance(x, str) and x.strip())
+        # 收集并自动归类
+        for mi in morning:
+            text = mi if isinstance(mi, str) else mi.get('text', '')
+            if isinstance(text, str) and text.strip():
+                auto_pillar = mi.get('pillar', '') if isinstance(mi, dict) else ''
+                if not auto_pillar:
+                    auto_pillar = classify_auto(text)
+                all_morning_items.append({'text': text.strip(), 'pillar': auto_pillar})
+
+        for ei in evening:
+            if isinstance(ei, dict):
+                m = (ei.get('mistake') or '').strip()
+                imp = (ei.get('improvement') or '').strip()
+                if m or imp:
+                    pillar = ei.get('pillar', '') or classify_auto(m + ' ' + imp)
+                    all_evening_items.append({'mistake': m, 'improvement': imp, 'pillar': pillar})
+            elif isinstance(ei, str) and ei.strip():
+                all_evening_items.append({'mistake': ei.strip(), 'improvement': '', 'pillar': classify_auto(ei)})
+
+        for si in study:
+            name = si.get('name', '') if isinstance(si, dict) else str(si)
+            if name.strip():
+                pillar = si.get('pillar', '') if isinstance(si, dict) else ''
+                if not pillar:
+                    pillar = classify_auto(name)
+                all_study_items.append({
+                    'name': name.strip(),
+                    'done': si.get('done', False) if isinstance(si, dict) else False,
+                    'note': si.get('note', '') if isinstance(si, dict) else '',
+                    'pillar': pillar
+                })
+
+        morning_count = sum(1 for x in morning if (
+            isinstance(x, str) and x.strip() or
+            isinstance(x, dict) and (x.get('text', '') or '').strip()
+        ))
         evening_count = sum(1 for x in evening if (
             isinstance(x, str) and x.strip() or
             isinstance(x, dict) and (x.get('mistake', '') or '').strip()
@@ -102,10 +162,38 @@ def compute_stats():
             # day_score = 60 + extra * 5  (不在此处使用，仅用于日历状态)
         calendar[d] = 'pass' if all_three else 'fail'
 
+    # 构建板块统计
+    pillars = ['医疗服务','医药营销','医疗支付','AI 智能','公司治理','个人修养']
+    pillar_breakdown = {}
+    for p in pillars:
+        pillar_breakdown[p] = {
+            'morning': 0, 'evening': 0, 'study': 0,
+            'morning_items': [], 'evening_items': [], 'study_items': []
+        }
+    for mi in all_morning_items:
+        p = mi['pillar']
+        if p in pillar_breakdown:
+            pillar_breakdown[p]['morning'] += 1
+            pillar_breakdown[p]['morning_items'].append(mi)
+    for ei in all_evening_items:
+        p = ei['pillar']
+        if p in pillar_breakdown:
+            pillar_breakdown[p]['evening'] += 1
+            pillar_breakdown[p]['evening_items'].append(ei)
+    for si in all_study_items:
+        p = si['pillar']
+        if p in pillar_breakdown:
+            pillar_breakdown[p]['study'] += 1
+            pillar_breakdown[p]['study_items'].append(si)
+
     return dict(
-        total_days=total_days, total_morning=total_morning,
+        total_weeks=total_weeks, total_morning=total_morning,
         total_evening=total_evening, total_study=total_study,
-        calendar=calendar
+        calendar=calendar,
+        morning_items=all_morning_items,
+        evening_items=all_evening_items,
+        study_items=all_study_items,
+        pillar_breakdown=pillar_breakdown
     )
 
 
@@ -114,9 +202,11 @@ def compute_stats():
 def index():
     import json
     stats = compute_stats()
+    wishes = [dict(w) for w in get_wishes()]
     return render_template('index.html',
                            username=session.get('display_name', session.get('username', '')),
-                           initial_stats=json.dumps(stats, ensure_ascii=False))
+                           initial_stats=json.dumps(stats, ensure_ascii=False),
+                           initial_wishes=json.dumps(wishes, ensure_ascii=False))
 
 
 # ── API ──────────────────────────────────────────────
@@ -124,10 +214,10 @@ def index():
 @app.route('/api/checkin', methods=['GET'])
 @login_required
 def api_get_checkin():
-    date = request.args.get('date', '')
+    week = request.args.get('week', '')
-    if not date:
+    if not week:
-        return jsonify({'ok': False, 'error': '缺少 date 参数'}), 400
+        return jsonify({'ok': False, 'error': '缺少 week 参数'}), 400
-    row = get_checkin(date)
+    row = get_checkin(week)
     return jsonify({'ok': True, 'data': row})
 
 
@@ -135,21 +225,29 @@ def api_get_checkin():
 @login_required
 def api_save_checkin():
     body = request.get_json(force=True)
-    date = body.get('date', '')
+    week = body.get('week', '')
-    if not date:
+    if not week:
-        return jsonify({'ok': False, 'error': '缺少 date 字段'}), 400
+        return jsonify({'ok': False, 'error': '缺少 week 字段'}), 400
     data = body.get('data', {})
-    save_checkin(date, data)
+    save_checkin(week, data)
     return jsonify({'ok': True})
 
 
-@app.route('/api/checkin/<date>', methods=['DELETE'])
+@app.route('/api/checkin/<week>', methods=['DELETE'])
 @login_required
-def api_delete_checkin(date):
+def api_delete_checkin(week):
-    delete_checkin(date)
+    delete_checkin(week)
     return jsonify({'ok': True})
 
 
+@app.route('/api/checkin/weeks', methods=['GET'])
+@login_required
+def api_weeks():
+    """返回所有已打卡周号"""
+    weeks = get_weeks_list()
+    return jsonify({'ok': True, 'data': weeks})
+
+
 @app.route('/api/history', methods=['GET'])
 @login_required
 def api_history():
@@ -157,6 +255,17 @@ def api_history():
     return jsonify({'ok': True, 'data': rows})
 
 
+@app.route('/api/history/daily', methods=['GET'])
+@login_required
+def api_history_daily():
+    """查看某周的原始日记录"""
+    week = request.args.get('week', '')
+    if not week:
+        return jsonify({'ok': False, 'error': '缺少 week 参数'}), 400
+    rows = get_daily_backup(week)
+    return jsonify({'ok': True, 'data': rows})
+
+
 @app.route('/api/stats', methods=['GET'])
 @login_required
 def api_stats():
@@ -174,9 +283,171 @@ def api_user():
     })
 
 
+# ── 心愿清单 API ──────────────────────────────
+
+@app.route('/api/wishes', methods=['GET'])
+@login_required
+def api_get_wishes():
+    wishes = [dict(w) for w in get_wishes()]
+    return jsonify({'ok': True, 'data': wishes})
+
+
+@app.route('/api/wishes', methods=['POST'])
+@login_required
+def api_create_wish():
+    body = request.get_json(force=True)
+    name = body.get('name', '').strip()
+    if not name:
+        return jsonify({'ok': False, 'error': '名称不能为空'}), 400
+    quadrant = body.get('quadrant', '重要不紧急')
+    deadline = body.get('deadline', '')
+    wid = save_wish(name, quadrant, deadline)
+    return jsonify({'ok': True, 'id': wid})
+
+
+@app.route('/api/wishes/<int:wish_id>', methods=['PUT'])
+@login_required
+def api_update_wish(wish_id):
+    body = request.get_json(force=True)
+    update_wish(wish_id, **body)
+    return jsonify({'ok': True})
+
+
+@app.route('/api/wishes/<int:wish_id>', methods=['DELETE'])
+@login_required
+def api_delete_wish(wish_id):
+    delete_wish(wish_id)
+    return jsonify({'ok': True})
+
+
+@app.route('/api/wishes/reorder', methods=['PUT'])
+@login_required
+def api_reorder_wishes():
+    body = request.get_json(force=True)
+    order = body.get('order', [])
+    if not isinstance(order, list):
+        return jsonify({'ok': False, 'error': 'order 必须是列表'}), 400
+    reorder_wishes(order)
+    return jsonify({'ok': True})
+
+
+# ── 日历同步 API ────────────────────────────
+
+CALENDAR_CACHE = os.path.join(os.path.expanduser('~'), '.workbuddy', 'data', 'ziwei-power', 'calendar_cache.json')
+DING_MCP_URL = 'https://mcp-gw.dingtalk.com/server/95959163f85d8b58a167f65cd8bd3d22690b16c75ebacd0fa095016396a10e0d?key=0993e4d4e44c50ea25a0db840cc5815e'
+
+
+def _fetch_dingtalk_events_week(week_str):
+    """调用钉钉 MCP 查询指定周（周一~周日）的全部日程"""
+    import json as _json, urllib.request as _ur
+    from datetime import datetime, timezone, timedelta
+    tz = timezone(timedelta(hours=8))
+    try:
+        year_part, week_part = week_str.split('-W')
+        year = int(year_part)
+        week = int(week_part)
+    except (ValueError, IndexError):
+        return []
+    jan1 = datetime(year, 1, 1, tzinfo=tz)
+    monday = jan1 + timedelta(days=(week - 1) * 7 - jan1.weekday())
+    results = []
+    for i in range(7):
+        d = monday + timedelta(days=i)
+        ds = d.strftime('%Y-%m-%d')
+        start_ts = int(d.replace(hour=0, minute=0, second=0).timestamp() * 1000)
+        end_ts = int(d.replace(hour=23, minute=59, second=59).timestamp() * 1000)
+        body = _json.dumps({
+            'jsonrpc': '2.0', 'method': 'tools/call', 'id': 1,
+            'params': {'name': 'list_calendar_events', 'arguments': {
+                'calendarId': 'primary', 'startTime': start_ts, 'endTime': end_ts, 'limit': 20
+            }}
+        }).encode('utf-8')
+        req = _ur.Request(DING_MCP_URL, data=body, headers={
+            'Content-Type': 'application/json', 'Accept': 'application/json'
+        })
+        try:
+            with _ur.urlopen(req, timeout=10) as resp:
+                data = _json.loads(resp.read())
+            events = data.get('result', {}).get('structuredContent', {}).get('result', {}).get('events', [])
+        except Exception:
+            continue
+        for e in events:
+            summary = (e.get('summary') or '').strip()
+            if not summary:
+                continue
+            start = e.get('start', {}).get('dateTime', '')
+            end = e.get('end', {}).get('dateTime', '')
+            time_str = ''
+            if start and end:
+                time_str = start[11:16] + '-' + end[11:16]
+            results.append({
+                'date': ds, 'summary': summary,
+                'time': time_str, 'location': e.get('location') or ''
+            })
+    return results
+
+
+@app.route('/api/calendar-sync', methods=['GET'])
+@login_required
+def api_calendar_sync():
+    week = request.args.get('week', '')
+    if not week:
+        return jsonify({'ok': False, 'error': '缺少 week 参数'}), 400
+    events = _fetch_dingtalk_events_week(week)
+    return jsonify({'ok': True, 'data': events})
+
+
+@app.route('/api/calendar-sync-all', methods=['GET'])
+@login_required
+def api_calendar_sync_all():
+    """批量查询过去4周~未来4周的钉钉日程，并自动填充到对应周的 checkin"""
+    import json as _json
+    from datetime import datetime, timedelta
+    today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+    results = []
+    saved_weeks = 0
+    for delta in range(-4, 5):
+        # 计算目标周
+        target = today + timedelta(weeks=delta)
+        iso_year, iso_week, _ = target.isocalendar()
+        week_key = f"{iso_year}-W{iso_week:02d}"
+        events = _fetch_dingtalk_events_week(week_key)
+        if events:
+            results.append({'date': week_key, 'events': events})
+            # 自动去重填充
+            existing = get_checkin(week_key)
+            data = existing['data'] if existing else {'morning': [], 'evening': [], 'study': []}
+            morning = data.get('morning', [])
+            existing_texts = set()
+            for mi in morning:
+                t = mi if isinstance(mi, str) else mi.get('text', '')
+                if t.strip():
+                    existing_texts.add(t.strip())
+            added = False
+            for evt in events:
+                summary = (evt.get('summary') or '').strip()
+                if not summary:
+                    continue
+                text = f"【{evt['time']}】{summary}" if evt.get('time') else summary
+                loc = evt.get('location', '')
+                if loc:
+                    text += f" @{loc}"
+                text = text.strip()
+                if text not in existing_texts:
+                    morning.append(text)
+                    existing_texts.add(text)
+                    added = True
+            if added:
+                data['morning'] = morning
+                save_checkin(week_key, data)
+                saved_weeks += 1
+    return jsonify({'ok': True, 'data': results, 'saved_days': saved_weeks})
+
+
 # ── 启动 ──────────────────────────────────────────────
 
 if __name__ == '__main__':
     init_db()
     app.config['TEMPLATES_AUTO_RELOAD'] = True
-    app.run(host='0.0.0.0', port=5058, debug=False)
+    port = int(os.environ.get('PORT', 5058))
+    app.run(host='0.0.0.0', port=port, debug=False)

database.py

@@ -10,6 +10,9 @@ DB_DIR = os.path.join(os.path.expanduser('~'), '.workbuddy', 'data', 'ziwei-powe
 os.makedirs(DB_DIR, exist_ok=True)
 DB_PATH = os.path.join(DB_DIR, 'ziwei_power.db')
 
+# 当前数据库 schema 版本 —— 改表结构时必须 +1 并补迁移逻辑
+CURRENT_SCHEMA_VERSION = 4
+
 
 def get_conn():
     conn = sqlite3.connect(DB_PATH)
@@ -17,9 +20,31 @@ def get_conn():
     return conn
 
 
+def _get_schema_version(conn):
+    """读取当前数据库的 schema 版本，无表时返回 0"""
+    conn.execute('''
+        CREATE TABLE IF NOT EXISTS schema_version (
+            version INTEGER NOT NULL
+        )
+    ''')
+    row = conn.execute('SELECT version FROM schema_version').fetchone()
+    return row['version'] if row else 0
+
+
+def _set_schema_version(conn, version):
+    """写入 schema 版本"""
+    conn.execute('DELETE FROM schema_version')
+    conn.execute('INSERT INTO schema_version (version) VALUES (?)', (version,))
+
+
 def init_db():
-    """初始化数据库表"""
+    """初始化数据库表 & 自动迁移"""
     conn = get_conn()
+    current = _get_schema_version(conn)
+
+    # ── 迁移步骤（按版本号递增）────────────────────────
+    if current < 1:
+        # v1: 初始表结构
         conn.execute('''
             CREATE TABLE IF NOT EXISTS checkins (
                 id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -29,6 +54,57 @@ def init_db():
                 updated_at TEXT NOT NULL
             )
         ''')
+
+    if current < 2:
+        # v2: 心愿清单
+        conn.execute('''
+            CREATE TABLE IF NOT EXISTS wishes (
+                id INTEGER PRIMARY KEY AUTOINCREMENT,
+                name TEXT NOT NULL,
+                priority TEXT NOT NULL DEFAULT '中',
+                deadline TEXT NOT NULL DEFAULT '',
+                done INTEGER NOT NULL DEFAULT 0,
+                sort_order INTEGER NOT NULL DEFAULT 0,
+                created_at TEXT NOT NULL
+            )
+        ''')
+
+    if current < 3:
+        # v3: 优先级改为四象限
+        conn.execute("ALTER TABLE wishes ADD COLUMN quadrant TEXT NOT NULL DEFAULT '重要不紧急'")
+        conn.execute("UPDATE wishes SET quadrant = CASE priority WHEN '高' THEN '重要紧急' WHEN '中' THEN '重要不紧急' WHEN '低' THEN '不紧急不重要' ELSE '重要不紧急' END WHERE quadrant = '重要不紧急'")
+
+    if current < 4:
+        # v4: 日打卡 → 周打卡
+        # 备份旧表 → 聚合 → 新建周表
+        existing = conn.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='checkins'").fetchone()
+        if existing:
+            # 检查是否已有备份表（幂等）
+            backup_exists = conn.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='checkins_daily_backup'").fetchone()
+            if not backup_exists:
+                conn.execute("ALTER TABLE checkins RENAME TO checkins_daily_backup")
+            # 重新创建 checkins 表（结构不变，date 语义变为周号）
+            conn.execute('''
+                CREATE TABLE IF NOT EXISTS checkins (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    date TEXT UNIQUE NOT NULL,
+                    data TEXT NOT NULL,
+                    created_at TEXT NOT NULL,
+                    updated_at TEXT NOT NULL
+                )
+            ''')
+            # 聚合日数据到周
+            if not backup_exists:
+                _aggregate_daily_to_weekly(conn)
+
+    # ── 将来加字段/改表在此扩展 ──
+    # if current < 2:
+    #     conn.execute('ALTER TABLE checkins ADD COLUMN tags TEXT DEFAULT ""')
+    #     # 可选：对已有行做数据补全
+    #     conn.execute("UPDATE checkins SET tags = '[]' WHERE tags IS NULL")
+
+    # ── 写入最新版本号 ──
+    _set_schema_version(conn, CURRENT_SCHEMA_VERSION)
     conn.commit()
     conn.close()
 
@@ -92,3 +168,146 @@ def get_all_checkins():
             'updated_at': row['updated_at']
         })
     return results
+
+
+# ── 心愿清单 CRUD ──────────────────────────────────
+
+def get_wishes():
+    """获取所有心愿，按 sort_order 排序"""
+    conn = get_conn()
+    rows = conn.execute('SELECT * FROM wishes ORDER BY sort_order').fetchall()
+    conn.close()
+    return [dict(row) for row in rows]
+
+
+def save_wish(name, quadrant, deadline):
+    """新增一条心愿"""
+    now = datetime.now().isoformat()
+    conn = get_conn()
+    max_order = conn.execute('SELECT COALESCE(MAX(sort_order), -1) + 1 AS n FROM wishes').fetchone()['n']
+    conn.execute(
+        'INSERT INTO wishes (name, quadrant, deadline, done, sort_order, created_at) VALUES (?, ?, ?, 0, ?, ?)',
+        (name, quadrant, deadline, max_order, now)
+    )
+    conn.commit()
+    wish_id = conn.execute('SELECT last_insert_rowid()').fetchone()[0]
+    conn.close()
+    return wish_id
+
+
+def update_wish(wish_id, **kwargs):
+    """更新心愿字段"""
+    allowed = ['name', 'quadrant', 'deadline', 'done']
+    updates = {k: v for k, v in kwargs.items() if k in allowed}
+    if not updates:
+        return
+    conn = get_conn()
+    sets = ', '.join(f'{k} = ?' for k in updates)
+    vals = list(updates.values()) + [wish_id]
+    conn.execute(f'UPDATE wishes SET {sets} WHERE id = ?', vals)
+    conn.commit()
+    conn.close()
+
+
+def delete_wish(wish_id):
+    """删除心愿"""
+    conn = get_conn()
+    conn.execute('DELETE FROM wishes WHERE id = ?', (wish_id,))
+    conn.commit()
+    conn.close()
+
+
+def reorder_wishes(order_list):
+    """批量更新排序：order_list = [id1, id2, ...]"""
+    conn = get_conn()
+    for idx, wid in enumerate(order_list):
+        conn.execute('UPDATE wishes SET sort_order = ? WHERE id = ?', (idx, wid))
+    conn.commit()
+    conn.close()
+
+
+def get_weeks_list():
+    """返回所有已有打卡记录的周号列表"""
+    conn = get_conn()
+    rows = conn.execute('SELECT DISTINCT date FROM checkins ORDER BY date').fetchall()
+    conn.close()
+    return [r['date'] for r in rows]
+
+
+def get_daily_backup(week_str):
+    """获取某周的原始日记录（从备份表）"""
+    from datetime import datetime as _dt, timedelta
+    if '-W' not in week_str:
+        return []
+    year_part, week_part = week_str.split('-W')
+    try:
+        year = int(year_part)
+        week = int(week_part)
+    except (ValueError, IndexError):
+        return []
+    jan1 = _dt(year, 1, 1)
+    delta = timedelta(days=(week - 1) * 7 - jan1.weekday())
+    monday = jan1 + delta
+    dates = [monday.strftime('%Y-%m-%d')]
+    for i in range(1, 7):
+        dates.append((monday + timedelta(days=i)).strftime('%Y-%m-%d'))
+    conn = get_conn()
+    placeholders = ','.join('?' for _ in dates)
+    exists = conn.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='checkins_daily_backup'").fetchone()
+    if not exists:
+        conn.close()
+        return []
+    rows = conn.execute(
+        f"SELECT date, data FROM checkins_daily_backup WHERE date IN ({placeholders}) ORDER BY date",
+        dates
+    ).fetchall()
+    conn.close()
+    results = []
+    for row in rows:
+        results.append({'date': row['date'], 'data': json.loads(row['data'])})
+    return results
+
+
+def _aggregate_daily_to_weekly(conn):
+    """将 checkins_daily_backup 的日数据聚合为周数据，写入 checkins"""
+    from datetime import datetime as _dt
+    rows = conn.execute('SELECT date, data FROM checkins_daily_backup ORDER BY date').fetchall()
+    weekly = {}
+    for row in rows:
+        try:
+            d = _dt.strptime(row['date'], '%Y-%m-%d')
+        except ValueError:
+            continue
+        iso_year, iso_week, _ = d.isocalendar()
+        week_key = f"{iso_year}-W{iso_week:02d}"
+        if week_key not in weekly:
+            weekly[week_key] = {'morning': [], 'evening': [], 'study': []}
+        data = json.loads(row['data'])
+        for mi in data.get('morning', []):
+            text = mi if isinstance(mi, str) else mi.get('text', '')
+            if text:
+                existing_texts = {x if isinstance(x, str) else x.get('text', '') for x in weekly[week_key]['morning']}
+                if text not in existing_texts:
+                    weekly[week_key]['morning'].append(mi)
+        for ei in data.get('evening', []):
+            mst = ei.get('mistake', '') if isinstance(ei, dict) else ''
+            if mst:
+                existing = {x.get('mistake', '') if isinstance(x, dict) else x for x in weekly[week_key]['evening']}
+                if mst not in existing:
+                    weekly[week_key]['evening'].append(ei if isinstance(ei, dict) else {'mistake': ei, 'improvement': ''})
+        existing_names = {}
+        for si in weekly[week_key]['study']:
+            nm = si.get('name', '') if isinstance(si, dict) else str(si)
+            if nm:
+                existing_names[nm] = si
+        for si in data.get('study', []):
+            nm = si.get('name', '') if isinstance(si, dict) else str(si)
+            if nm and nm not in existing_names:
+                weekly[week_key]['study'].append(si)
+                existing_names[nm] = si
+    now = _dt.now().isoformat()
+    for week_key in sorted(weekly.keys()):
+        conn.execute(
+            'INSERT INTO checkins (date, data, created_at, updated_at) VALUES (?, ?, ?, ?)',
+            (week_key, json.dumps(weekly[week_key], ensure_ascii=False), now, now)
+        )

deploy.sh

@@ -0,0 +1,67 @@
+#!/bin/bash
+# ziwei-power 一键部署脚本
+# 用法: bash deploy.sh [port]
+#
+# 首次运行: 自动生成 .env (SECRET_KEY)，之后不变
+# 多 worker 安全: 所有 worker 共享同一密钥
+
+set -e
+
+PORT="${1:-5058}"
+PROJECT_DIR="$(cd "$(dirname "$0")" && pwd)"
+LOG_FILE="/tmp/ziwei-power.log"
+
+echo "=== ziwei-power 部署 ==="
+echo "目录: $PROJECT_DIR"
+echo "端口: $PORT"
+
+# 1. 停止旧进程
+OLD_PID=$(lsof -ti :$PORT 2>/dev/null || true)
+if [ -n "$OLD_PID" ]; then
+    echo "停止旧进程 PID=$OLD_PID..."
+    kill $OLD_PID 2>/dev/null || true
+    sleep 1
+fi
+
+# 2. 创建/激活 venv
+cd "$PROJECT_DIR"
+if [ ! -d "venv" ]; then
+    echo "创建虚拟环境..."
+    python3 -m venv venv
+fi
+
+echo "安装依赖..."
+venv/bin/pip install -q -r requirements.txt
+
+# 3. 生成/读取固定 SECRET_KEY（多 worker 共享）
+if [ ! -f ".env" ]; then
+    echo "生成 SECRET_KEY..."
+    python3 -c "import os; print('SECRET_KEY=' + os.urandom(24).hex())" > .env
+fi
+set -a; source .env; set +a
+export SECRET_KEY
+
+# 4. 自动建表（首次运行）
+echo "初始化数据库..."
+venv/bin/python -c "
+from database import init_db
+init_db()
+print('数据库就绪')
+"
+
+# 4. 启动服务
+echo "启动服务 (PID=$$)..."
+nohup venv/bin/python app.py > "$LOG_FILE" 2>&1 &
+NEW_PID=$!
+sleep 1
+
+if kill -0 $NEW_PID 2>/dev/null; then
+    echo "部署完成！"
+    echo "  访问: http://localhost:$PORT"
+    echo "  日志: $LOG_FILE"
+    echo "  PID : $NEW_PID"
+else
+    echo "启动失败，查看日志:"
+    cat "$LOG_FILE"
+    exit 1
+fi

templates/icons.html

@@ -67,4 +67,8 @@
   <symbol id="icon-pencil" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
     <path d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L6.832 19.82a4.5 4.5 0 0 1-1.897 1.13l-2.685.8.8-2.685a4.5 4.5 0 0 1 1.13-1.897L16.863 4.487Zm0 0L19.5 7.125"/>
   </symbol>
+  <!-- 星星 -->
+  <symbol id="icon-star" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+    <path d="M11.48 3.499a.562.562 0 0 1 1.04 0l2.125 5.111a.563.563 0 0 0 .475.345l5.518.442c.499.04.701.663.321.988l-4.204 3.602a.563.563 0 0 0-.182.557l1.285 5.385a.562.562 0 0 1-.84.61l-4.725-2.885a.563.563 0 0 0-.586 0L6.982 20.54a.562.562 0 0 1-.84-.61l1.285-5.386a.562.562 0 0 0-.182-.557l-4.204-3.602a.563.563 0 0 1 .321-.988l5.518-.442a.563.563 0 0 0 .475-.345L11.48 3.5Z"/>
+  </symbol>
 </svg>

templates/index.html

@@ -6,34 +6,96 @@
 <title>紫微 · 磁场管理</title>
 <link rel="stylesheet" href="{{ url_for('static', filename='style.css') }}">
 <script>window.__INITIAL_STATS__ = {{ initial_stats | safe }};</script>
+<script>window.__INITIAL_WISHES__ = {{ initial_wishes | safe }};</script>
 </head>
 <body>
 {% include "icons.html" %}
 
 <div id="toast" class="toast"></div>
 
+<!-- 日历同步弹窗 -->
+<div class="sync-modal-overlay" id="sync-modal-overlay" style="display:none">
+  <div class="sync-modal">
+    <div class="sync-modal-header">
+      <h3>📅 日历同步</h3>
+      <button class="sync-modal-close" onclick="closeSyncModal()">&times;</button>
+    </div>
+    <div class="sync-modal-loading" id="sync-loading">
+      <div class="sync-spinner"></div>
+      <p>正在从钉钉同步过去4周~未来4周日程…</p>
+    </div>
+    <div class="sync-modal-results" id="sync-results" style="display:none">
+      <div class="sync-summary" id="sync-summary"></div>
+      <div class="sync-list" id="sync-list"></div>
+    </div>
+    <div class="sync-modal-footer">
+      <button class="btn-wish-save" onclick="closeSyncModal()">关闭</button>
+    </div>
+  </div>
+</div>
+
 <div class="app-layout">
 
   <!-- ═══ 左侧边栏 ═══ -->
   <aside class="sidebar">
 
     <!-- 用户信息 -->
-    <div class="sidebar-user">
+    <div class="sidebar-user" id="sidebar-user-menu" onclick="toggleUserMenu(event)">
       <div class="user-avatar">{{ username[0] }}</div>
-      <div class="user-info">
       <span class="user-name">{{ username }}</span>
-        <span class="user-tag">道阁 · 紫微</span>
+      <div class="user-dropdown" id="user-dropdown" style="display:none">
-      </div>
+        <a class="user-dropdown-item" href="/logout" onclick="return confirm('确定退出登录？')">
-      <a href="/logout" class="btn-logout-icon" title="退出登录" onclick="return confirm('确定退出登录？')">
+          <svg class="icon-sm"><use href="#icon-logout"/></svg> 退出登录
-        <svg class="icon-sm"><use href="#icon-logout"/></svg>
         </a>
       </div>
+    </div>
 
-    <!-- 统计信息 -->
+    <!-- 功能入口 -->
+    <nav class="sidebar-nav">
+      <a class="nav-item active" data-panel="daily" onclick="switchPanel('daily')">
+        <svg class="icon-md"><use href="#icon-calendar"/></svg>
+        <span class="nav-label">打卡</span>
+      </a>
+      <a class="nav-item" data-panel="weekly" onclick="switchPanel('weekly')">
+        <svg class="icon-md"><use href="#icon-chart-bar"/></svg>
+        <span class="nav-label">评分</span>
+      </a>
+      <a class="nav-item" data-panel="wishes" onclick="switchPanel('wishes')">
+        <svg class="icon-md"><use href="#icon-star"/></svg>
+        <span class="nav-label">心愿</span>
+      </a>
+      <a class="nav-item" data-panel="history" onclick="switchPanel('history')">
+        <svg class="icon-md"><use href="#icon-list-bullet"/></svg>
+        <span class="nav-label">记录</span>
+      </a>
+      <a class="nav-item" data-panel="blueprint" onclick="switchPanel('blueprint')">
+        <svg class="icon-md"><use href="#icon-sun"/></svg>
+        <span class="nav-label">蓝图</span>
+      </a>
+    </nav>
+  </aside>
+
+  <!-- ═══ 右侧主内容区 ═══ -->
+  <main class="main-content">
+
+    <!-- ── 每周打卡面板 ── -->
+    <section class="panel active" id="panel-daily">
+      <div class="panel-header">
+        <h2>每周打卡</h2>
+        <div class="panel-header-right">
+          <input type="week" id="check-date" class="check-date-input" onchange="loadCheckin()">
+          <button class="btn-cal-sync" onclick="syncCalendar()" title="同步钉钉日历">
+            <svg class="icon-sm"><use href="#icon-calendar"/></svg> 日历同步
+          </button>
+        </div>
+      </div>
+      <div class="daily-layout">
+        <!-- 左侧：统计 + 日历 -->
+        <div class="daily-sidebar">
           <div class="sidebar-stats" id="sidebar-stats">
             <div class="stat-item">
               <span class="stat-num" id="stat-days">--</span>
-        <span class="stat-label">打卡天</span>
+              <span class="stat-label">打卡周</span>
             </div>
             <div class="stat-item">
               <span class="stat-num" id="stat-morning">--</span>
@@ -44,65 +106,43 @@
               <span class="stat-label">勤学</span>
             </div>
           </div>
-
+          <div class="calendar-widget inline">
-    <!-- 日历 -->
-    <div class="calendar-widget">
             <div class="cal-header">
+              <button class="cal-nav" onclick="changeCalYear(-1)">
+                <svg class="icon-sm"><use href="#icon-chevron-left"/></svg>
+              </button>
+              <span class="cal-month-label" id="cal-year-label">2026年</span>
+              <button class="cal-nav" onclick="changeCalYear(1)">
+                <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
+              </button>
+            </div>
+            <div class="cal-header cal-month-header">
               <button class="cal-nav" onclick="changeCalMonth(-1)">
                 <svg class="icon-sm"><use href="#icon-chevron-left"/></svg>
               </button>
-        <span class="cal-month-label" id="cal-month-label">2026年 6月</span>
+              <span class="cal-month-label" id="cal-month-label">7月</span>
               <button class="cal-nav" onclick="changeCalMonth(1)">
                 <svg class="icon-sm"><use href="#icon-chevron-right"/></svg>
               </button>
             </div>
-      <div class="cal-weekdays">
+            <div class="cal-week-rows" id="cal-weeks"></div>
-        <span>日</span><span>一</span><span>二</span><span>三</span><span>四</span><span>五</span><span>六</span>
-      </div>
-      <div class="cal-grid" id="cal-grid"></div>
-      <div class="cal-legend">
-        <span class="legend-dot pass"></span> 达标
-        <span class="legend-dot fail"></span> 未达标
-        <span class="legend-dot empty"></span> 未打卡
           </div>
         </div>
-
+        <!-- 右侧：Tab + 内容 -->
-    <!-- 功能入口 -->
+        <div class="daily-main">
-    <nav class="sidebar-nav">
+          <div class="daily-tabs">
-      <a class="nav-item active" data-panel="daily" onclick="switchPanel('daily')">
+            <button class="daily-tab active" data-tab="morning" onclick="switchDailyTab(this)">
-        <svg class="icon-sm"><use href="#icon-calendar"/></svg>
+              <svg class="icon-sm"><use href="#icon-sun"/></svg> 早间立志
-        每日打卡
+            </button>
-      </a>
+            <button class="daily-tab" data-tab="evening" onclick="switchDailyTab(this)">
-      <a class="nav-item" data-panel="weekly" onclick="switchPanel('weekly')">
+              <svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善改过
-        <svg class="icon-sm"><use href="#icon-chart-bar"/></svg>
+            </button>
-        每周评分
+            <button class="daily-tab" data-tab="study" onclick="switchDailyTab(this)">
-      </a>
+              <svg class="icon-sm"><use href="#icon-book-open"/></svg> 勤学打卡
-      <a class="nav-item" data-panel="history" onclick="switchPanel('history')">
-        <svg class="icon-sm"><use href="#icon-list-bullet"/></svg>
-        历史记录
-      </a>
-    </nav>
-
-    <!-- 底部新建按钮 -->
-    <div class="sidebar-footer">
-      <button class="btn-new-day" onclick="goToday()">
-        <svg class="icon-sm"><use href="#icon-sun"/></svg>
-        回到今天
             </button>
           </div>
-  </aside>
-
-  <!-- ═══ 右侧主内容区 ═══ -->
-  <main class="main-content">
-
-    <!-- ── 每日打卡面板 ── -->
-    <section class="panel active" id="panel-daily">
-      <div class="panel-header">
-        <h2>每日打卡</h2>
-        <input type="date" id="check-date" class="check-date-input" onchange="loadCheckin()">
-      </div>
           <div class="daily-grid">
-        <div class="card card-morning">
+        <div class="card card-morning daily-card active" data-card="morning">
           <div class="card-head">
             <div class="card-head-left">
               <svg class="icon-h2"><use href="#icon-sun"/></svg>
@@ -112,13 +152,13 @@
               <svg class="icon-sm"><use href="#icon-pencil"/></svg>
             </button>
           </div>
-          <p class="card-desc">今天最重要的 1~3 件事</p>
+          <p class="card-desc">本周最重要的 1~3 件事</p>
           <div id="morning-list"></div>
           <button class="btn-add edit-only" onclick="addMorning()">
             <svg class="icon-sm"><use href="#icon-plus"/></svg> 增加一条
           </button>
         </div>
-        <div class="card card-evening">
+        <div class="card card-evening daily-card" data-card="evening">
           <div class="card-head">
             <div class="card-head-left">
               <svg class="icon-h2"><use href="#icon-magnifying-glass"/></svg>
@@ -128,21 +168,23 @@
               <svg class="icon-sm"><use href="#icon-pencil"/></svg>
             </button>
           </div>
-          <p class="card-desc">今天犯的错 &amp; 改进方案（最多5条）</p>
+          <p class="card-desc">本周反思改正（最多5条）</p>
           <div id="evening-list"></div>
           <button class="btn-add edit-only" onclick="addEvening()">
             <svg class="icon-sm"><use href="#icon-plus"/></svg> 增加一条
           </button>
         </div>
-        <div class="card card-study">
+        <div class="card card-study daily-card" data-card="study">
           <div class="card-head">
             <svg class="icon-h2"><use href="#icon-book-open"/></svg>
             <h3>勤学打卡</h3>
           </div>
-          <p class="card-desc">今日修行清单</p>
+          <p class="card-desc">本周修行清单</p>
           <div id="study-list"></div>
         </div>
       </div>
+        </div><!-- /daily-main -->
+      </div><!-- /daily-layout -->
     </section>
 
     <!-- ── 每周评分面板 ── -->
@@ -188,6 +230,81 @@
       <div id="history-grid" class="history-grid"></div>
     </section>
 
+    <!-- ── 心愿清单面板 ── -->
+    <section class="panel" id="panel-wishes">
+      <div class="panel-header">
+        <h2>心愿清单</h2>
+        <button class="btn-edit-toggle" id="wishes-edit-toggle" onclick="toggleWishesEdit(this)" title="编辑">
+          <svg class="icon-sm"><use href="#icon-pencil"/></svg>
+        </button>
+      </div>
+      <!-- 新增表单 -->
+      <div class="wish-form" id="wish-form" style="display:none">
+        <input type="text" id="wish-name" placeholder="心愿名称…" maxlength="50">
+        <div class="wish-form-row">
+          <select id="wish-quadrant">
+            <option value="重要紧急">重要紧急</option>
+            <option value="重要不紧急" selected>重要不紧急</option>
+            <option value="紧急不重要">紧急不重要</option>
+            <option value="不紧急不重要">不紧急不重要</option>
+          </select>
+          <input type="date" id="wish-deadline">
+        </div>
+        <div class="wish-form-actions">
+          <button class="btn-wish-save" onclick="addWish()">添加</button>
+          <button class="btn-wish-cancel" onclick="hideWishForm()">取消</button>
+        </div>
+      </div>
+      <button class="btn-add edit-only" id="wishes-add-btn" onclick="showWishForm()" style="margin-bottom:16px">
+        <svg class="icon-sm"><use href="#icon-plus"/></svg> 新增心愿
+      </button>
+      <!-- 四象限网格 -->
+      <div class="quad-grid">
+        <div class="quad-cell" data-quadrant="重要紧急" id="quad-重要紧急">
+          <div class="quad-title">重要 & 紧急</div>
+          <div class="quad-list" id="quad-list-重要紧急"></div>
+        </div>
+        <div class="quad-cell" data-quadrant="重要不紧急" id="quad-重要不紧急">
+          <div class="quad-title">重要 & 不紧急</div>
+          <div class="quad-list" id="quad-list-重要不紧急"></div>
+        </div>
+        <div class="quad-cell" data-quadrant="紧急不重要" id="quad-紧急不重要">
+          <div class="quad-title">紧急 & 不重要</div>
+          <div class="quad-list" id="quad-list-紧急不重要"></div>
+        </div>
+        <div class="quad-cell" data-quadrant="不紧急不重要" id="quad-不紧急不重要">
+          <div class="quad-title">不紧急 & 不重要</div>
+          <div class="quad-list" id="quad-list-不紧急不重要"></div>
+        </div>
+      </div>
+      <div class="wishes-empty" id="wishes-empty" style="display:none">暂无心愿，点击上方按钮添加</div>
+    </section>
+
+    <!-- ── 蓝图面板 ── -->
+    <section class="panel" id="panel-blueprint">
+      <div class="panel-header">
+        <h2>人生蓝图</h2>
+      </div>
+      <!-- Tab 筛选 -->
+      <div class="bp-tabs">
+        <button class="bp-tab active" data-filter="all" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-list-bullet"/></svg> 全部
+        </button>
+        <button class="bp-tab" data-filter="morning" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-bolt"/></svg> 立志
+        </button>
+        <button class="bp-tab" data-filter="evening" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-magnifying-glass"/></svg> 责善
+        </button>
+        <button class="bp-tab" data-filter="study" onclick="filterBlueprint(this)">
+          <svg class="icon-sm"><use href="#icon-book-open"/></svg> 勤学
+        </button>
+      </div>
+      <!-- 明细列表 -->
+      <div class="bp-list" id="bp-list"></div>
+      <div class="bp-list-empty" id="bp-list-empty" style="display:none">暂无记录</div>
+    </section>
+
   </main>
 </div>