diff --git a/backend/alembic/versions/35d925df4568_008_modify_field_type.py b/backend/alembic/versions/35d925df4568_008_modify_field_type.py new file mode 100644 index 00000000..5a9b67c8 --- /dev/null +++ b/backend/alembic/versions/35d925df4568_008_modify_field_type.py @@ -0,0 +1,35 @@ +"""008_modify_field_type + +Revision ID: 35d925df4568 +Revises: ff653d5df198 +Create Date: 2025-05-28 12:15:28.296915 + +""" +from alembic import op +import sqlalchemy as sa +import sqlmodel.sql.sqltypes +from sqlalchemy.dialects import postgresql + +# revision identifiers, used by Alembic. +revision = '35d925df4568' +down_revision = 'ff653d5df198' +branch_labels = None +depends_on = None + + +def upgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('core_datasource', 'create_time', + existing_type=postgresql.TIMESTAMP(timezone=True), + type_=sa.DateTime(), + existing_nullable=True) + # ### end Alembic commands ### + + +def downgrade(): + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('core_datasource', 'create_time', + existing_type=sa.DateTime(), + type_=postgresql.TIMESTAMP(timezone=True), + existing_nullable=True) + # ### end Alembic commands ### diff --git a/backend/apps/datasource/models/datasource.py b/backend/apps/datasource/models/datasource.py index f41ca5ce..55742f7b 100644 --- a/backend/apps/datasource/models/datasource.py +++ b/backend/apps/datasource/models/datasource.py @@ -14,7 +14,7 @@ class CoreDatasource(SQLModel, table=True): type: str = Field(max_length=64) type_name: str = Field(max_length=64, nullable=True) configuration: str = Field(sa_column=Column(Text)) - create_time: datetime = Field(sa_column=Column(DateTime(timezone=True), nullable=True)) + create_time: datetime = Field(sa_column=Column(DateTime(timezone=False), nullable=True)) create_by: int = Field(sa_column=Column(BigInteger())) status: str = Field(max_length=64, nullable=True) diff --git a/frontend/src/views/ds/form.vue b/frontend/src/views/ds/form.vue index 1a743a7e..24774eb3 100644 --- a/frontend/src/views/ds/form.vue +++ b/frontend/src/views/ds/form.vue @@ -58,7 +58,7 @@ :disabled="!isCreate" accept=".xls, .xlsx, .csv" :headers="headers" - action="http://localhost:8000/api/v1/datasource/uploadExcel" + :action="getUploadURL" :before-upload="beforeUpload" :on-success="onSuccess" > @@ -181,6 +181,8 @@ const tableListLoading = ref(false); const token = wsCache.get("user.token"); const headers = ref({ "X-SQLBOT-TOKEN": `Bearer ${token}` }); const dialogTitle = ref(""); +const getUploadURL = import.meta.env.VITE_API_BASE_URL + '/datasource/uploadExcel' + const rules = reactive({ name: [