diff --git a/backend/application/admin/admin b/backend/application/admin/admin new file mode 100755 index 0000000..dedacc2 Binary files /dev/null and b/backend/application/admin/admin differ diff --git a/backend/application/admin/conf/app.conf b/backend/application/admin/conf/app.conf index 755ed03..a54b6bf 100644 --- a/backend/application/admin/conf/app.conf +++ b/backend/application/admin/conf/app.conf @@ -1,5 +1,20 @@ -appname = backend -httpport = 8080 +appname = TechTreeAdmin +httpport = 8081 runmode = dev autorender=false -CopyRequestBody = true \ No newline at end of file +CopyRequestBody = true +SessionName = "ethcdaimn" +SessionHashKey = "ethcrteedaimn" +SessionProvider = "memory" +SessionGCMaxLifetime = 86400 +SessionCookieLifeTime = 86400 + +[mysql] +Host = "172.27.13.196" +Port = "3306" +User = "root" +Pass = "ziyao945" +Db = "tech" + +[cors] +hosts = "http://172.27.15.222:8000" diff --git a/backend/application/admin/main.go b/backend/application/admin/main.go index 6f26dee..5c542b0 100644 --- a/backend/application/admin/main.go +++ b/backend/application/admin/main.go @@ -1,12 +1,26 @@ package main import ( - "github.com/astaxie/beego" + "strings" - _ "github.com/Jsharkc/TechTree/backend/routers/user" + _ "github.com/Jsharkc/TechTree/backend/routers/admin" + "github.com/astaxie/beego/plugins/cors" + "github.com/astaxie/beego" + "github.com/Jsharkc/TechTree/backend/tidb" ) func main() { + //允许CORS + beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{ + AllowOrigins: strings.Split(beego.AppConfig.String("cors::hosts"), ","), + AllowMethods: []string{"POST", "GET"}, + AllowHeaders: []string{"Origin", "Content-Type"}, + ExposeHeaders: []string{"Content-Length"}, + AllowCredentials: true, + })) + + tidb.InitSql() + beego.Run() } diff --git a/backend/application/user/conf/app.conf b/backend/application/user/conf/app.conf index 579fe8c..7b71d34 100644 --- a/backend/application/user/conf/app.conf +++ b/backend/application/user/conf/app.conf @@ -1,4 +1,4 @@ -appname = backend +appname = TechTree httpport = 8080 runmode = dev autorender=false diff --git a/backend/application/user/glide.lock b/backend/application/user/glide.lock deleted file mode 100644 index e967c3c..0000000 --- a/backend/application/user/glide.lock +++ /dev/null @@ -1,67 +0,0 @@ -hash: 5bffaa4e7482b811fbce94ca8b54f13f41d708e7ae922634beb2e198341725d4 -updated: 2017-10-21T22:20:56.662659+08:00 -imports: -- name: github.com/astaxie/beego - version: d96289a81bf67728cff7a19b067aaecc65a62ec6 - subpackages: - - config - - context - - context/param - - grace - - logs - - plugins/cors - - session - - toolbox - - utils - - validation -- name: github.com/astaxie/session - version: 95d7fe18579cfbdd564189bd3ccc30b17aa06d35 - subpackages: - - providers/memory -- name: github.com/go-sql-driver/mysql - version: a0583e0143b1624142adab07e0e97fe106d99561 -- name: github.com/jinzhu/gorm - version: 5174cc5c242a728b435ea2be8a2f7f998e15429b -- name: github.com/jinzhu/inflection - version: 1c35d901db3da928c72a72d8458480cc9ade058f -- name: github.com/Jsharkc/TechTree - version: aed638d2b55b290eccf367c66368320156f49e40 - subpackages: - - backend/controllers - - backend/general - - backend/models - - backend/routers/user - - backend/rpc - - backend/tidb - - backend/utils - - lib/common - - lib/log - - lib/rpc -- name: github.com/satori/go.uuid - version: 879c5887cd475cd7864858769793b2ceb0d44feb -- name: go.uber.org/atomic - version: 4e336646b2ef9fc6e47be8e21594178f98e5ebcf -- name: go.uber.org/multierr - version: 3c4937480c32f4c13a875a1829af76c98ca3d40a -- name: go.uber.org/zap - version: 35aad584952c3e7020db7b839f6b102de6271f89 - subpackages: - - buffer - - internal/bufferpool - - internal/color - - internal/exit - - zapcore -- name: golang.org/x/crypto - version: eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035 - subpackages: - - bcrypt - - blowfish -- name: gopkg.in/mgo.v2 - version: 3f83fa5005286a7fe593b055f0d7771a7dce4655 - subpackages: - - bson -testImports: -- name: github.com/smartystreets/goconvey - version: 9e8dc3f972df6c8fcc0375ef492c24d0bb204857 - subpackages: - - convey diff --git a/backend/routers/admin/router.go b/backend/routers/admin/router.go index 678a5ff..dd46b7c 100644 --- a/backend/routers/admin/router.go +++ b/backend/routers/admin/router.go @@ -7,5 +7,24 @@ import ( ) func init() { - beego.Router("/", &controllers.BaseController{}) + // Admin + beego.Router("/login", &controllers.AdminController{}, "post:Login") + beego.Router("/admin/add", &controllers.AdminController{}, "post:Add") + + // Node + beego.Router("/node/add", &controllers.NodeController{}, "post:Add") + beego.Router("/node/del", &controllers.NodeController{}, "post:Delete") + beego.Router("/node/update", &controllers.NodeController{}, "post:Update") + beego.Router("/node/pass/del", &controllers.NodeController{}, "post:DelPass") + + // Question + beego.Router("/question/add", &controllers.QuestionController{}, "post:AdminAddQuestion") + beego.Router("/question/del", &controllers.QuestionController{}, "post:Delete") + + // Knowledge + beego.Router("/knowledge/add", &controllers.KnowledgeController{}, "post:AdminAddKnowledge") + beego.Router("/knowledge/del", &controllers.KnowledgeController{}, "post:Delete") + + // User added + beego.Router("/update", &controllers.UserAddedController{}, "post:UpdateUserAddStatus") } diff --git a/backend/tidb/tech.sql b/backend/tidb/tech.sql index 046a40e..f2f30c2 100644 --- a/backend/tidb/tech.sql +++ b/backend/tidb/tech.sql @@ -11,6 +11,15 @@ CREATE TABLE IF NOT EXISTS `user` ( PRIMARY KEY (`name`) )DEFAULT CHARSET=utf8 COLLATE=utf8_bin; +-- ---------------------------------------------------------- +CREATE TABLE IF NOT EXISTS `admin` ( + `name` varchar(128) NOT NULL DEFAULT '', + `pass` varchar(256) DEFAULT '', + `status` int(11) NOT NULL, + `created` datetime NOT NULL DEFAULT current_timestamp, + PRIMARY KEY (`name`) +)DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + -- ---------------------------------------------------------- CREATE TABLE IF NOT EXISTS `node` (