Commit 44421f0d authored by vicotor's avatar vicotor

fix bug

parent 464dc2bf
...@@ -3,6 +3,7 @@ package run ...@@ -3,6 +3,7 @@ package run
import ( import (
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/xueqianlu/caddyproxy/caddy"
"github.com/xueqianlu/caddyproxy/openapi" "github.com/xueqianlu/caddyproxy/openapi"
"os" "os"
) )
...@@ -90,11 +91,13 @@ func runCommand(cmd *cobra.Command, _ []string) { ...@@ -90,11 +91,13 @@ func runCommand(cmd *cobra.Command, _ []string) {
} }
}() }()
capi := caddy.NewCaddyAPI(params.caddyUrl, params.caddyRoot)
api := openapi.NewOpenAPI(&openapi.Config{ api := openapi.NewOpenAPI(&openapi.Config{
Host: params.host, Host: params.host,
Port: params.port, Port: params.port,
TempDir: params.downloadDir, TempDir: params.downloadDir,
}) }, capi)
if err := api.Run(); err != nil { if err := api.Run(); err != nil {
log.WithError(err).Error("api service exit") log.WithError(err).Error("api service exit")
} }
......
...@@ -4,14 +4,16 @@ import ( ...@@ -4,14 +4,16 @@ import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/xueqianlu/caddyproxy/caddy"
) )
type OpenAPI struct { type OpenAPI struct {
conf *Config conf *Config
caddyapi *caddy.CaddyAPI
} }
func NewOpenAPI(conf *Config) *OpenAPI { func NewOpenAPI(conf *Config, capi *caddy.CaddyAPI) *OpenAPI {
return &OpenAPI{conf: conf} return &OpenAPI{conf: conf, caddyapi: capi}
} }
func (s *OpenAPI) Run() error { func (s *OpenAPI) Run() error {
...@@ -25,8 +27,8 @@ func (s *OpenAPI) startHttp(address string) error { ...@@ -25,8 +27,8 @@ func (s *OpenAPI) startHttp(address string) error {
// 创建v1组 // 创建v1组
v1 := router.Group("/v1") v1 := router.Group("/v1")
{ {
v1.POST("/create-website", apiHandler{}.CreateWebsite) v1.POST("/create-website", apiHandler{conf: s.conf, backend: s.caddyapi}.CreateWebsite)
v1.POST("/forward-website", apiHandler{}.ForwardWebsite) v1.POST("/forward-website", apiHandler{conf: s.conf, backend: s.caddyapi}.ForwardWebsite)
} }
return router.Run(address) return router.Run(address)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment