merge
This commit is contained in:
parent
924b2864d3
commit
322b3408ab
2
.env
2
.env
@ -1,3 +1,3 @@
|
|||||||
ALGORITHM=HS256
|
ALGORITHM=HS256
|
||||||
DATABASE_URL=sqlite:///test.db
|
DATABASE_URL=mysql://shixun:TEzzsLddDRdDwXdE@120.53.31.148:3306/shixun
|
||||||
SECRET_KEY=your_secret_key
|
SECRET_KEY=your_secret_key
|
||||||
|
|||||||
@ -2,7 +2,7 @@
|
|||||||
<module type="PYTHON_MODULE" version="4">
|
<module type="PYTHON_MODULE" version="4">
|
||||||
<component name="NewModuleRootManager">
|
<component name="NewModuleRootManager">
|
||||||
<content url="file://$MODULE_DIR$" />
|
<content url="file://$MODULE_DIR$" />
|
||||||
<orderEntry type="jdk" jdkName="Python 3.11" jdkType="Python SDK" />
|
<orderEntry type="jdk" jdkName="demo1" jdkType="Python SDK" />
|
||||||
<orderEntry type="sourceFolder" forTests="false" />
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
</component>
|
</component>
|
||||||
</module>
|
</module>
|
||||||
14
.idea/deployment.xml
Normal file
14
.idea/deployment.xml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="PublishConfigData" serverName="ecs2" remoteFilesAllowedToDisappearOnAutoupload="false">
|
||||||
|
<serverData>
|
||||||
|
<paths name="ecs2">
|
||||||
|
<serverdata>
|
||||||
|
<mappings>
|
||||||
|
<mapping deploy="./shixun/" local="$PROJECT_DIR$" web="/" />
|
||||||
|
</mappings>
|
||||||
|
</serverdata>
|
||||||
|
</paths>
|
||||||
|
</serverData>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -28,5 +28,5 @@
|
|||||||
</profile-state>
|
</profile-state>
|
||||||
</entry>
|
</entry>
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11" project-jdk-type="Python SDK" />
|
<component name="ProjectRootManager" version="2" project-jdk-name="demo1" project-jdk-type="Python SDK" />
|
||||||
</project>
|
</project>
|
||||||
14
.idea/webServers.xml
Normal file
14
.idea/webServers.xml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="WebServers">
|
||||||
|
<option name="servers">
|
||||||
|
<webServer id="c90c26ce-7c47-4054-9829-4cec3d848165" name="ecs2" url="http://ecs2.heshunme.xyz:10000">
|
||||||
|
<fileTransfer rootFolder="/root" accessType="SFTP" host="ecs2.heshunme.xyz" port="22" sshConfigId="f1f6e1a9-94a6-4cd9-ba1a-ad35f1bc3d3e" sshConfig="root@ecs2.heshunme.xyz:22 key" keyPair="true">
|
||||||
|
<advancedOptions>
|
||||||
|
<advancedOptions dataProtectionLevel="Private" keepAliveTimeout="0" passiveMode="true" shareSSLContext="true" />
|
||||||
|
</advancedOptions>
|
||||||
|
</fileTransfer>
|
||||||
|
</webServer>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@ -2,19 +2,13 @@
|
|||||||
# @Time : 2024/11/19 下午8:05
|
# @Time : 2024/11/19 下午8:05
|
||||||
# @FileName: manage_project.py
|
# @FileName: manage_project.py
|
||||||
# @Software: PyCharm
|
# @Software: PyCharm
|
||||||
from fastapi import HTTPException, Response, Depends, APIRouter
|
from datetime import datetime
|
||||||
from typing import Optional, Annotated
|
|
||||||
from datetime import datetime, timedelta
|
from fastapi import APIRouter
|
||||||
from jose import JWTError, jwt
|
|
||||||
from sqlalchemy import delete
|
from sqlalchemy import delete
|
||||||
|
|
||||||
from sqlmodel import select
|
|
||||||
|
|
||||||
from models import Tenant, User, Project, ProjectUserLink
|
|
||||||
from dependencies import *
|
from dependencies import *
|
||||||
from fastapi import APIRouter
|
from models import Project, ProjectUserLink
|
||||||
|
|
||||||
from typing import List
|
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
TenantRole = 1
|
TenantRole = 1
|
||||||
|
|||||||
@ -3,21 +3,13 @@
|
|||||||
# @FileName: manage_tanant.py
|
# @FileName: manage_tanant.py
|
||||||
# @Software: PyCharm
|
# @Software: PyCharm
|
||||||
from fastapi import APIRouter
|
from fastapi import APIRouter
|
||||||
from fastapi import HTTPException, Response, Depends, APIRouter
|
|
||||||
from typing import Optional, Annotated
|
|
||||||
from datetime import datetime, timedelta
|
|
||||||
from jose import JWTError, jwt
|
|
||||||
from sqlalchemy import delete
|
from sqlalchemy import delete
|
||||||
|
|
||||||
from sqlmodel import select
|
|
||||||
|
|
||||||
from models import Tenant, User, Project
|
|
||||||
from dependencies import *
|
from dependencies import *
|
||||||
|
|
||||||
router = APIRouter()
|
router = APIRouter()
|
||||||
|
|
||||||
from fastapi import HTTPException, Response
|
from fastapi import HTTPException, Response
|
||||||
from sqlalchemy.orm import Session
|
|
||||||
from models import Tenant, User # 假设你已导入 Tenant 和 User 模型
|
from models import Tenant, User # 假设你已导入 Tenant 和 User 模型
|
||||||
from dependencies import SessionDep # 假设 SessionDep 是数据库会话的依赖
|
from dependencies import SessionDep # 假设 SessionDep 是数据库会话的依赖
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user