williamet/cas_tt_cloud_backend
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目信息

Browse Source
This commit is contained in:
henry
2022-01-11 11:10:59 +08:00
parent 7cab0fb354
commit 8006d57506
3 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/api/website/api/basic.go
View File

@ -1,3 +1,16 @@
package api
type basic struct{}
import (
"SciencesServer/app/basic/api"
"SciencesServer/app/session"
"github.com/gin-gonic/gin"
)
func getSession(c *gin.Context) *session.Enterprise {
value := api.GetSession()(c)
if value != "" {
return session.NewEnterprise()
}
return value.(*session.Enterprise)
}

14
app/api/website/api/service.go
View File

@ -3,14 +3,13 @@ package api
import (
"SciencesServer/app/api/website/controller/service"
"SciencesServer/app/basic/api"
"SciencesServer/app/session"
"github.com/gin-gonic/gin"
)
type Service struct{}
func (*Service) SolutionCase(c *gin.Context) {
data, err := service.NewSolutionCase()(nil, 0).Instance()
data, err := service.NewSolutionCase()(getSession(c), api.GetTenantID()(c).(uint64)).Instance()
api.APIResponse(err, data)(c)
}
@ -23,7 +22,7 @@ func (*Service) SolutionCaseList(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := service.NewSolutionCase()(nil, 0).List((&api.IDStringForm{ID: form.KindID}).Convert(),
data, err := service.NewSolutionCase()(getSession(c), api.GetTenantID()(c).(uint64)).List((&api.IDStringForm{ID: form.KindID}).Convert(),
form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
@ -35,8 +34,7 @@ func (*Service) SolutionCaseDetail(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := service.NewSolutionCase()(api.GetSession()(c).(*session.Enterprise),
api.GetTenantID()(c).(uint64)).Detail(form.Convert())
data, err := service.NewSolutionCase()(getSession(c), api.GetTenantID()(c).(uint64)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}
@ -50,13 +48,13 @@ func (*Service) Innovate(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := service.NewInnovate()(nil, 0).Instance((&api.IDStringForm{ID: form.KindID}).Convert(),
data, err := service.NewInnovate()(getSession(c), api.GetTenantID()(c).(uint64)).Instance((&api.IDStringForm{ID: form.KindID}).Convert(),
form.Title, form.Page, form.PageSize)
api.APIResponse(err, data)(c)
}
func (*Service) InnovateKind(c *gin.Context) {
data, err := service.NewInnovate()(nil, 0).Kind()
data, err := service.NewInnovate()(getSession(c), api.GetTenantID()(c).(uint64)).Kind()
api.APIResponse(err, data)(c)
}
@ -67,6 +65,6 @@ func (*Service) InnovateDetail(c *gin.Context) {
api.APIFailure(err.(error))(c)
return
}
data, err := service.NewInnovate()(nil, 0).Detail(form.Convert())
data, err := service.NewInnovate()(getSession(c), api.GetTenantID()(c).(uint64)).Detail(form.Convert())
api.APIResponse(err, data)(c)
}

6
app/basic/api/base.go
View File

@ -32,12 +32,12 @@ func GetSession() ApiHandle {
func GetTenantID() ApiHandle {
return func(c *gin.Context) interface{} {
value, isExist := c.Get(config.ContentForTenantID)
value := c.GetHeader(config.ContentForTenantID)
if !isExist {
if value == "" {
return 0
}
return utils.StringToUnit64(value.(string))
return utils.StringToUnit64(value)
}
}