diff --git a/app.py b/app.py index ceb0766..ffd3512 100644 --- a/app.py +++ b/app.py @@ -118,6 +118,7 @@ def create_app() -> Flask: with app.app_context(): db.create_all() + _migrate_schema() _ensure_default_user() _ensure_admin_from_env() @@ -254,6 +255,7 @@ def create_app() -> Flask: path = (form.path.data or "").strip() or "/" s = Service( name=form.name.data.strip(), + scheme=form.scheme.data, host=form.host.data.strip(), port=form.port.data, path=path, @@ -288,6 +290,7 @@ def create_app() -> Flask: ).all() if form.validate_on_submit(): s.name = form.name.data.strip() + s.scheme = form.scheme.data s.host = form.host.data.strip() s.port = form.port.data s.path = (form.path.data or "").strip() or "/" @@ -331,6 +334,28 @@ def create_app() -> Flask: return app +def _migrate_schema() -> None: + """SQLite 已有库补列(db.create_all 不会 ALTER 已有表)。""" + from sqlalchemy import inspect, text + + try: + insp = inspect(db.engine) + if "services" not in insp.get_table_names(): + return + cols = {c["name"] for c in insp.get_columns("services")} + if "scheme" not in cols: + with db.engine.begin() as conn: + conn.execute( + text( + "ALTER TABLE services ADD COLUMN scheme VARCHAR(8) " + "NOT NULL DEFAULT 'http'" + ) + ) + print("[nav] 已为 services 表添加 scheme 列(默认 http)。", flush=True) + except Exception as exc: + print(f"[nav] 数据库结构迁移跳过或失败: {exc}", flush=True) + + def _first_group_id() -> Optional[int]: g = ServiceGroup.query.order_by(ServiceGroup.sort_order, ServiceGroup.id).first() return g.id if g else None diff --git a/forms.py b/forms.py index d025548..3f6bd57 100644 --- a/forms.py +++ b/forms.py @@ -21,7 +21,16 @@ class GroupForm(FlaskForm): class ServiceForm(FlaskForm): name = StringField("服务名称", validators=[DataRequired(message="请输入服务名称")]) - host = StringField("内网 IP 或主机名", validators=[DataRequired(message="请输入主机")]) + scheme = SelectField( + "协议", + choices=[("http", "HTTP"), ("https", "HTTPS")], + default="http", + validators=[DataRequired(message="请选择协议")], + ) + host = StringField( + "主机或域名", + validators=[DataRequired(message="请输入主机或域名")], + ) port = IntegerField( "端口", validators=[ diff --git a/models.py b/models.py index 19bd418..0ab57c4 100644 --- a/models.py +++ b/models.py @@ -39,6 +39,7 @@ class Service(db.Model): id = db.Column(db.Integer, primary_key=True) name = db.Column(db.String(120), nullable=False) + scheme = db.Column(db.String(8), nullable=False, default="http") host = db.Column(db.String(255), nullable=False) port = db.Column(db.Integer, nullable=False) path = db.Column(db.String(512), nullable=False, default="/") @@ -51,4 +52,7 @@ class Service(db.Model): p = (self.path or "/").strip() if not p.startswith("/"): p = "/" + p - return f"http://{self.host}:{self.port}{p}" + proto = (self.scheme or "http").strip().lower() + if proto not in ("http", "https"): + proto = "http" + return f"{proto}://{self.host}:{self.port}{p}" diff --git a/templates/admin_service_form.html b/templates/admin_service_form.html index 9f65507..0317fea 100644 --- a/templates/admin_service_form.html +++ b/templates/admin_service_form.html @@ -28,9 +28,16 @@