Merge pull request #117 from BUAA-SE-coders007/dev

release分支更新到beta版本

Author: coder0xe

.env

@@ -50,7 +50,18 @@ jobs:
           pip install -r requirements.txt
 
       - name: Check FastAPI Server
+        env:
+            ALGORITHM: ${{ secrets.ALGORITHM }}
+            DATABASE_URL: ${{ secrets.DATABASE_URL }}
+            FERNET_SECRET_KEY: ${{ secrets.FERNET_SECRET_KEY }}
+            KIMI_API_KEY: ${{ secrets.KIMI_API_KEY }}
+            REMOTE_HOST: ${{ secrets.REMOTE_HOST }}
+            REMOTE_PATH: ${{ secrets.REMOTE_PATH }}
+            REMOTE_USER: ${{ secrets.REMOTE_USER }}
+            SECRET_KEY: ${{ secrets.SECRET_KEY }}
+            SENDER_PASSWORD: ${{ secrets.SENDER_PASSWORD }}
+            SERVER_SSH_KEY: ${{ secrets.SERVER_SSH_KEY }}
+            SQLALCHEMY_DATABASE_URL: ${{ secrets.SQLALCHEMY_DATABASE_URL }}
         run: |
           uvicorn app.main:app --host 0.0.0.0 --port 8000 --log-level warning &
-          sleep 5
-          curl -f http://localhost:8000/docs
+          sleep 5

.github/workflows/check.yml

@@ -1,4 +1,5 @@
 env
 __pycache__
 articles
-app.log
+app.log
+.env

.gitignore

@@ -63,7 +63,6 @@ version_path_separator = os
 # are written from script.py.mako
 # output_encoding = utf-8
 
-sqlalchemy.url = mysql+pymysql://root:[email protected]:3306/JieNote
 
 
 [post_write_hooks]

alembic.ini

@@ -9,12 +9,17 @@
 # this is the Alembic Config object, which provides
 # access to the values within the .ini file in use.
 config = context.config
+import os
+from dotenv import load_dotenv
 
+# 加载.env文件
+load_dotenv()
 # Interpret the config file for Python logging.
 # This line sets up loggers basically.
 if config.config_file_name is not None:
     fileConfig(config.config_file_name)
-
+sqlalchemy_url = os.environ.get("DATABASE_URL")
+config.set_main_option("sqlalchemy.url", sqlalchemy_url)
 # add your model's MetaData object here
 # for 'autogenerate' support
 # from myapp import mymodel

alembic/env.py

@@ -0,0 +1,34 @@
+"""Article、ArticleDB表增加点击量
+
+Revision ID: 023952869ee6
+Revises: f89d896e9b57
+Create Date: 2025-05-27 20:53:36.631307
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '023952869ee6'
+down_revision: Union[str, None] = 'f89d896e9b57'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('articleDB', sa.Column('clicks', sa.Integer(), nullable=False))
+    op.add_column('articles', sa.Column('clicks', sa.Integer(), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('articles', 'clicks')
+    op.drop_column('articleDB', 'clicks')
+    # ### end Alembic commands ###

alembic/versions/023952869ee6_article_articledb表增加点击量.py

@@ -0,0 +1,32 @@
+"""增加文献库简介
+
+Revision ID: 0ff7f968ec3b
+Revises: 9256d579f585
+Create Date: 2025-06-01 19:36:53.514027
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '0ff7f968ec3b'
+down_revision: Union[str, None] = '9256d579f585'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('articleDB', sa.Column('intro', sa.Text(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('articleDB', 'intro')
+    # ### end Alembic commands ###

alembic/versions/0ff7f968ec3b_增加文献库简介.py

@@ -0,0 +1,38 @@
+"""Article表增加所属个人或组织
+
+Revision ID: 56dcd6190dd0
+Revises: 023952869ee6
+Create Date: 2025-05-27 21:37:05.492437
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '56dcd6190dd0'
+down_revision: Union[str, None] = '023952869ee6'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('articles', sa.Column('user_id', sa.Integer(), nullable=True))
+    op.add_column('articles', sa.Column('group_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'articles', 'groups', ['group_id'], ['id'])
+    op.create_foreign_key(None, 'articles', 'users', ['user_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'articles', type_='foreignkey')
+    op.drop_constraint(None, 'articles', type_='foreignkey')
+    op.drop_column('articles', 'group_id')
+    op.drop_column('articles', 'user_id')
+    # ### end Alembic commands ###

alembic/versions/56dcd6190dd0_article表增加所属个人或组织.py

@@ -0,0 +1,53 @@
+"""权限定义、删除申请表，Article表URL
+
+Revision ID: 618f8bcbc41e
+Revises: 56dcd6190dd0
+Create Date: 2025-05-27 23:08:11.483163
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '618f8bcbc41e'
+down_revision: Union[str, None] = '56dcd6190dd0'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('delete_applications',
+    sa.Column('group_id', sa.Integer(), nullable=True),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('item_type', sa.Integer(), nullable=False),
+    sa.Column('item_id', sa.Integer(), nullable=False),
+    sa.ForeignKeyConstraint(['group_id'], ['groups.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('user_id', 'item_type', 'item_id')
+    )
+    op.create_table('operate_permissions',
+    sa.Column('group_id', sa.Integer(), nullable=False),
+    sa.Column('user_id', sa.Integer(), nullable=False),
+    sa.Column('item_type', sa.Integer(), nullable=False),
+    sa.Column('item_id', sa.Integer(), nullable=False),
+    sa.Column('accessible', sa.Boolean(), nullable=False),
+    sa.ForeignKeyConstraint(['group_id'], ['groups.id'], ),
+    sa.ForeignKeyConstraint(['user_id'], ['users.id'], ),
+    sa.PrimaryKeyConstraint('group_id', 'user_id', 'item_type', 'item_id')
+    )
+    op.add_column('articles', sa.Column('url', sa.String(length=200), nullable=False))
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('articles', 'url')
+    op.drop_table('operate_permissions')
+    op.drop_table('delete_applications')
+    # ### end Alembic commands ###

alembic/versions/618f8bcbc41e_权限定义_删除申请表_article表url.py

@@ -0,0 +1,34 @@
+"""Note表group_id
+
+Revision ID: 6a0b40746e6c
+Revises: 618f8bcbc41e
+Create Date: 2025-05-27 23:56:45.363419
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = '6a0b40746e6c'
+down_revision: Union[str, None] = '618f8bcbc41e'
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('notes', sa.Column('group_id', sa.Integer(), nullable=True))
+    op.create_foreign_key(None, 'notes', 'groups', ['group_id'], ['id'])
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'notes', type_='foreignkey')
+    op.drop_column('notes', 'group_id')
+    # ### end Alembic commands ###