Kaynağa Gözat

获取capid时同时返回capurl

huangyan 9 ay önce
ebeveyn
işleme
2f64295aef

+ 8 - 1
app/model/applyCap.go

@@ -17,7 +17,7 @@ type ApplyCap struct {
 	PcIsShow     int    `gorm:"type:int;" json:"pc_is_show"`     // 是否pc端显示 1 显示 2 不显示
 	MobileIsShow int    `gorm:"type:int;" json:"mobile_is_show"` // 是否移动端显示 1 显示 2 不显示
 	Sort         int    `gorm:"type:int;" json:"sort"`           // 排序
-
+	CapUrl       string `gorm:"-" json:"cap_url"`
 }
 
 // DeleteApplyCAp 删除应用能力
@@ -120,6 +120,13 @@ func (a ApplyCap) ApplyCapList(appid string) ([]ApplyCap, error) {
 		}
 	}
 	if tx.RowsAffected > 0 {
+		for i, _ := range applycap {
+			var capability Capabilities
+			tx := global.DBLink.Model(&Capabilities{}).Where("cap_id = ?", applycap[i].CapId).First(&capability)
+			if tx.Error == nil {
+				applycap[i].CapUrl = capability.CapUrl
+			}
+		}
 		return applycap, nil
 	}
 	return applycap, errors.New(e.FINDFAIL.GetMsg())

+ 1 - 0
app/router.go

@@ -13,6 +13,7 @@ func InitRouter() error {
 	routers.QiniuRouter(engine)
 	routers.UserRouter(engine)
 	//第三方用户登录
+
 	engine.Use(middlewares.LogonMiddeware())
 	routers.AppUserRouter(engine)
 	routers.ClientApply(engine)

+ 4 - 0
app/routers/appUser.go

@@ -14,4 +14,8 @@ func AppUserRouter(r *gin.Engine) {
 	group.DELETE("/appuser", controller.DeleteAppUserByID)
 	group.POST("/accountlogin", controller.LoginAppUser)
 	group.POST("/codelogin", controller.LoginAppUserByCode)
+	// 根据appid获取应用详情
+	group.GET("/apply", controller.GetApplyByAPPID)
+	// 根据应用名称获取应用详情
+	group.GET("/apply/cap", controller.GetApplyCapList)
 }

+ 0 - 1
app/routers/apply.go

@@ -11,6 +11,5 @@ func ApplyRouter(r *gin.Engine) {
 	group.POST("/applyall", controller.GetApplyList)
 	group.POST("/applystate", controller.GetApplyState)
 	group.PUT("/apply", controller.UserUpdateApply)
-	group.GET("/apply", controller.GetApplyByAPPID)
 	group.PUT("/applycap", controller.ApplyAddCap)
 }

+ 0 - 1
app/routers/applyCap.go

@@ -8,7 +8,6 @@ import (
 func ApplyCapRouter(r *gin.Engine) {
 	group := r.Group("/api")
 	group.POST("/apply/addcap", controller.ApplyAddCap)
-	group.GET("/apply/cap", controller.GetApplyCapList)
 	group.PUT("/apply/cap", controller.UpDateApplyCap)
 	group.PUT("/apply/sort", controller.UpDateApplyCapSort)
 	group.DELETE("/apply/cap", controller.DeleteApplyCap)

+ 1 - 1
configs/config.yaml

@@ -35,7 +35,7 @@ subMail:
   appid: "97173"
   signature: "f639a60e41ee0554921d89884f5ff87e"
 redis:
-  addr: "192.168.11.33:6379"
+  addr: "192.168.11.17:6379"
   password: ""
   db: 0
 nats: