alicorn-dev/KintoneAppBuilder
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add active ,onwer in domain

Browse Source
This commit is contained in:
方 柏
2024-11-24 21:01:21 +09:00
parent 0fddeaa036
commit 440a0bd647
4 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/app/api/api_v1/routers/platform.py
View File

@@ -272,7 +272,7 @@ async def domain_details(
@r.post("/domain", response_model=Domain, response_model_exclude_none=True) @r.post("/domain", response_model=Domain, response_model_exclude_none=True)
async def domain_create( async def domain_create(
request: Request, request: Request,
domain: DomainBase, domain: DomainIn,
user=Depends(get_current_active_user), user=Depends(get_current_active_user),
db=Depends(get_db), db=Depends(get_db),
): ):
@@ -287,7 +287,7 @@ async def domain_create(
) )
async def domain_edit( async def domain_edit(
request: Request, request: Request,
domain: DomainBase, domain: DomainIn,
user=Depends(get_current_active_user), user=Depends(get_current_active_user),
db=Depends(get_db), db=Depends(get_db),
): ):
@@ -312,7 +312,7 @@ async def domain_delete(
@r.get( @r.get(
"/domain", "/domain",
# response_model=List[Domain], response_model=List[Domain],
response_model_exclude_none=True, response_model_exclude_none=True,
) )
async def userdomain_details( async def userdomain_details(

9
backend/app/db/crud.py
View File

@@ -277,7 +277,7 @@ def get_flows_by_app(db: Session,domainurl: str, appid: str):
raise Exception("Data not found") raise Exception("Data not found")
return flows return flows
def create_domain(db: Session, domain: schemas.DomainBase,userid:int): def create_domain(db: Session, domain: schemas.DomainIn,userid:int):
domain.encrypt_kintonepwd() domain.encrypt_kintonepwd()
db_domain = models.Domain( db_domain = models.Domain(
tenantid = domain.tenantid, tenantid = domain.tenantid,
@@ -286,7 +286,8 @@ def create_domain(db: Session, domain: schemas.DomainBase,userid:int):
kintoneuser=domain.kintoneuser, kintoneuser=domain.kintoneuser,
kintonepwd=domain.kintonepwd, kintonepwd=domain.kintonepwd,
createuserid = userid, createuserid = userid,
updateuserid = userid updateuserid = userid,
ownerid = domain.ownerid
) )
db.add(db_domain) db.add(db_domain)
db.flush() db.flush()
@@ -305,7 +306,7 @@ def delete_domain(db: Session,id: int):
def edit_domain( def edit_domain(
db: Session, domain: schemas.DomainBase,userid:int db: Session, domain: schemas.DomainIn,userid:int
) -> schemas.Domain: ) -> schemas.Domain:
domain.encrypt_kintonepwd() domain.encrypt_kintonepwd()
db_domain = db.query(models.Domain).get(domain.id) db_domain = db.query(models.Domain).get(domain.id)
@@ -317,7 +318,7 @@ def edit_domain(
db_domain.kintoneuser=domain.kintoneuser db_domain.kintoneuser=domain.kintoneuser
db_domain.kintonepwd = domain.kintonepwd db_domain.kintonepwd = domain.kintonepwd
db_domain.updateuserid = userid db_domain.updateuserid = userid
db_domain.update_time = datetime.now db_domain.ownerid = domain.ownerid
db.add(db_domain) db.add(db_domain)
db.commit() db.commit()
db.refresh(db_domain) db.refresh(db_domain)

3
backend/app/db/models.py
View File

@@ -158,8 +158,11 @@ class Domain(Base):
return decrypted_pwd return decrypted_pwd
createuserid = Column(Integer,ForeignKey("user.id")) createuserid = Column(Integer,ForeignKey("user.id"))
updateuserid = Column(Integer,ForeignKey("user.id")) updateuserid = Column(Integer,ForeignKey("user.id"))
ownerid = Column(Integer,ForeignKey("user.id"))
createuser = relationship('User',foreign_keys=[createuserid]) createuser = relationship('User',foreign_keys=[createuserid])
updateuser = relationship('User',foreign_keys=[updateuserid]) updateuser = relationship('User',foreign_keys=[updateuserid])
owner = relationship('User',foreign_keys=[ownerid])
is_active = Column(Boolean, default=True)
class UserDomain(Base): class UserDomain(Base):
__tablename__ = "userdomain" __tablename__ = "userdomain"

6
backend/app/db/schemas.py
View File

@@ -143,13 +143,15 @@ class Flow(Base):
class ConfigDict: class ConfigDict:
orm_mode = True orm_mode = True
class DomainBase(BaseModel): class DomainIn(BaseModel):
id: int id: int
tenantid: str tenantid: str
name: str name: str
url: str url: str
kintoneuser: str kintoneuser: str
kintonepwd: str kintonepwd: str
is_active: bool
ownerid:int
def encrypt_kintonepwd(self): def encrypt_kintonepwd(self):
encrypted_pwd = chacha20Encrypt(self.kintonepwd) encrypted_pwd = chacha20Encrypt(self.kintonepwd)
@@ -162,6 +164,8 @@ class Domain(Base):
url: str url: str
kintoneuser: str kintoneuser: str
kintonepwd: str kintonepwd: str
is_active: bool
owner:UserOut
class ConfigDict: class ConfigDict:
orm_mode = True orm_mode = True