Browse Source

fix: 调整部分包名,修改路由

zqbao 9 months ago
parent
commit
0f7c85f832
5 changed files with 62 additions and 21 deletions
  1. 2 0
      .gitignore
  2. 0 15
      controllers/default.go
  3. 29 2
      go.mod
  4. 3 3
      main.go
  5. 28 1
      routers/router.go

+ 2 - 0
.gitignore

@@ -1 +1,3 @@
 /conf/
+/etalogs/
+*.exe

+ 0 - 15
controllers/default.go

@@ -1,15 +0,0 @@
-package controllers
-
-import (
-	beego "github.com/beego/beego/v2/server/web"
-)
-
-type MainController struct {
-	beego.Controller
-}
-
-func (c *MainController) Get() {
-	c.Data["Website"] = "beego.vip"
-	c.Data["Email"] = "astaxie@gmail.com"
-	c.TplName = "index.tpl"
-}

+ 29 - 2
go.mod

@@ -2,5 +2,32 @@ module eta/eta_mini_crm
 
 go 1.21
 
-require github.com/beego/beego/v2 v2.1.0
-require github.com/smartystreets/goconvey v1.6.4
+require (
+	github.com/beego/bee/v2 v2.1.0
+	github.com/beego/beego/v2 v2.1.0
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/go-sql-driver/mysql v1.7.0
+)
+
+require (
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/prometheus/client_golang v1.15.1 // indirect
+	github.com/prometheus/client_model v0.3.0 // indirect
+	github.com/prometheus/common v0.42.0 // indirect
+	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/rdlucklib/rdluck_tools v1.0.3 // indirect
+	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
+	golang.org/x/net v0.7.0 // indirect
+	golang.org/x/sys v0.6.0 // indirect
+	golang.org/x/text v0.7.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

+ 3 - 3
main.go

@@ -2,10 +2,10 @@ package main
 
 import (
 	_ "eta/eta_mini_crm/routers"
-	beego "github.com/beego/beego/v2/server/web"
+
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
-	beego.Run()
+	web.Run()
 }
-

+ 28 - 1
routers/router.go

@@ -2,9 +2,36 @@ package routers
 
 import (
 	"eta/eta_mini_crm/controllers"
+
 	beego "github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/filter/cors"
 )
 
 func init() {
-    beego.Router("/", &controllers.MainController{})
+	beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
+		AllowAllOrigins:  true,
+		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
+		AllowHeaders:     []string{"Origin", "Authorization", "Uuid", "Accesstoken", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
+		ExposeHeaders:    []string{"Content-Length", "Access-Control-Allow-Origin", "Access-Control-Allow-Headers", "Content-Type"},
+		AllowCredentials: true,
+	}))
+	ns := beego.NewNamespace("adminapi",
+		beego.NSNamespace("/sys_user",
+			beego.NSInclude(
+				&controllers.UserLoginController{},
+				&controllers.SysUserController{},
+			),
+		),
+		beego.NSNamespace("/department",
+			beego.NSInclude(
+				&controllers.SysDepartmentController{},
+			),
+		),
+		beego.NSNamespace("/role",
+			beego.NSInclude(
+				&controllers.SysRoleController{},
+			),
+		),
+	)
+	beego.AddNamespace(ns)
 }