更改项目结构 e签宝放进common

alien_3rd_esign/__init__.py

@@ -1 +0,0 @@
-# FastAPI应用包

alien_3rd_esign/main.py

@@ -1,26 +0,0 @@
-from fastapi import FastAPI
-from alien_3rd_esign.api.router import router
-from alien_gateway.config import settings
-from fastapi.middleware.cors import CORSMiddleware
-app = FastAPI(
-    title=f"{settings.PROJECT_NAME} - Alien Esign",
-    version="1.0.0"
-)
-
-app.add_middleware(
-    CORSMiddleware,
-    allow_credentials=True,
-    allow_methods=["*"],
-    allow_headers=["*"],
-
-)
-
-app.include_router(router, prefix="/api/esign", tags=["Esign"])
-
-@app.get("/health")
-async def health():
-    return {"service": "sign", "status": "ok"}
-
-if __name__ == "__main__":
-    import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8006)

alien_3rd_esign/repositories/contract_repo.py

@@ -1,8 +0,0 @@
-from sqlalchemy.orm import Session
-from ..db.models.contract_store import ContractStore
-
-
-class ContractRepository:
-
-    def __init__(self, db: Session):
-        self.db = db

alien_3rd_esign/services/contract_server.py

@@ -1,8 +0,0 @@
-from sqlalchemy.orm import Session
-from ..repositories.contract_repo import ContractRepository
-
-
-class ContractServer:
-    def __init__(self, db: Session):
-        self.db = db
-        self.esign_repo = ContractRepository(db)

alien_gateway/config.py

@@ -16,7 +16,7 @@ class Settings(BaseSettings):
     DB_PASSWORD: str = "Alien123456"
     DB_HOST: str = "120.26.186.130"
     DB_PORT: int = 30001
-    DB_NAME: str = "alien_sit"
+    DB_NAME: str = "alien"
 
     @property
     def SQLALCHEMY_DATABASE_URI(self) -> str:

alien_gateway/main.py

@@ -17,4 +17,4 @@ async def login():
 
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run(app, host="0.0.0.0", port=8000)
+    uvicorn.run(app, host="0.0.0.0", port=8000)

alien_3rd_esign/api/deps.py → alien_store/api/deps.py

@@ -1,8 +1,7 @@
-from fastapi import Depends, HTTPException, status
+from fastapi import Depends
 from sqlalchemy.orm import Session
 from alien_database.session import get_db
-from ..services.contract_server import ContractServer
-
+from alien_store.services.contract_server import ContractServer
 
 
 def get_contract_service(db: Session = Depends(get_db)) -> ContractServer:

alien_3rd_esign/api/router.py → alien_store/api/router.py

@@ -1,5 +1,5 @@
 from fastapi import APIRouter
-from ..services.contract_server import ContractServer
+
 router = APIRouter()
 
 @router.get("/")

alien_3rd_esign/db/models/contract_store.py → alien_store/db/models/contract_store.py

@@ -3,20 +3,19 @@ from typing import Optional
 from sqlalchemy import String, DateTime, BigInteger
 from sqlalchemy.orm import Mapped, mapped_column
 
+from alien_snowflake.generator import next_id
 from alien_database.base import Base, AuditMixin
 class ContractStore(Base, AuditMixin):
     """
     店铺合同模型
     """
-    __tablename__ = "contract_store"
-
-    store_id: Mapped[int] = mapped_column(BigInteger, primary_key=True, comment="店铺id")
+    __tablename__ = "store_contract"
+    id: Mapped[int] = mapped_column(BigInteger, primary_key=True, default=next_id(), comment="主键")
+    store_id: Mapped[int] = mapped_column(BigInteger, comment="店铺id")
     business_segment: Mapped[str] = mapped_column(String(100), comment="经营板块")
     merchant_name: Mapped[str] = mapped_column(String(100), comment="商家姓名")
     contact_phone: Mapped[str] = mapped_column(String(20), comment="联系电话")
     signing_status: Mapped[str] = mapped_column(String(20), default="未签署", comment="签署状态（已签署，未签署，已到期）")
     signing_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="签署时间")
     effective_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="生效时间")
-    expiry_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="到期时间")
-
-
+    expiry_time: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True, comment="到期时间")

alien_store/main.py

@@ -1,5 +1,5 @@
 from fastapi import FastAPI
-from alien_store.router import router
+from alien_store.api.router import router
 from alien_gateway.config import settings
 
 app = FastAPI(
@@ -14,6 +14,7 @@ app.include_router(router, prefix="/api/store", tags=["Store"])
 async def health():
     return {"service": "alien_store", "status": "ok"}
 
+
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=8001)

alien_store/repositories/contract_repo.py

@@ -0,0 +1,16 @@
+from sqlalchemy.orm import Session
+from sqlalchemy import or_
+from typing import List, Optional
+from alien_store.db.models.contract_store import ContractStore
+
+class ContractRepository:
+    """合同数据访问层"""
+
+
+    def __init__(self, db: Session):
+        self.db = db
+
+    def get_by_id(self, store_id: int):
+        """根据店铺id查询所有合同"""
+        return self.db.query(ContractStore).filter(ContractStore.id == store_id).all()
+

alien_store/router.py

@@ -1,7 +0,0 @@
-from fastapi import APIRouter
-
-router = APIRouter()
-
-@router.get("/")
-async def index():
-    return {"module": "alien_store", "status": "initialized"}

alien_store/services/contract_server.py

@@ -0,0 +1,8 @@
+from sqlalchemy.orm import Session
+from alien_store.repositories.contract_repo import ContractRepository
+
+
+class ContractServer:
+    def __init__(self, db: Session):
+        self.db = db
+        self.esign_repo = ContractRepository(db)

main.py

@@ -3,7 +3,6 @@ from alien_store.router import router as store_router
 from alien_store_platform.router import router as platform_router
 from alien_second.router import router as second_router
 from alien_lawyer.router import router as lawyer_router
-from alien_3rd_esign.api.router import router as alien_3rd_esign
 from alien_gateway.config import settings
 
 
@@ -18,7 +17,6 @@ app.include_router(store_router, prefix="/api/store", tags=["Store"])
 app.include_router(platform_router, prefix="/api/platform", tags=["Platform"])
 app.include_router(second_router, prefix="/api/second", tags=["Second"])
 app.include_router(lawyer_router, prefix="/api/lawyer", tags=["Lawyer"])
-app.include_router(alien_3rd_esign, prefix="/api/alien_3rd_esign", tags=["alien_3rd_esign"])
 @app.get("/", tags=["Health Check"])
 async def root():
     return {