Merge branch 'master' of http://124.70.149.18:10880/sunsheng/moutai

src/api/router.go

@@ -41,7 +41,7 @@ func RegRouters(svc *Service) {
 	// 图片管理
 	moutai.POSTJWT("/admin/image/create", CreateImage)
 	moutai.POSTJWT("/admin/image/delete/:id", DeleteImage)
-	moutai.GET("/image/list", ImageList)
+	moutai.GET("/admin/image/list", ImageList)
 	moutai.POSTJWT("/admin/image/update", UpdateImage)
 	// 上架
 	moutai.POSTJWT("/admin/image/on/:id", ImageOn)
@@ -59,7 +59,7 @@ func RegRouters(svc *Service) {
 	// 视频管理
 	moutai.POSTJWT("/admin/video/create", CreateVideo)
 	moutai.POSTJWT("/admin/video/delete/:id", DeleteVideo)
-	moutai.GET("/video/list", VideoList)
+	moutai.GET("/admin/video/list", VideoList)
 	moutai.POSTJWT("/admin/video/update", UpdateVideo)
 	// 上架
 	moutai.POSTJWT("/admin/video/on/:id", VideoOn)
@@ -69,7 +69,7 @@ func RegRouters(svc *Service) {
 	// 3d文物管理 relics
 	moutai.POSTJWT("/admin/relic/create", CreateRelic)
 	moutai.POSTJWT("/admin/relic/delete/:id", DeleteRelic)
-	moutai.GET("/relic/list", RelicList)
+	moutai.GET("/admin/relic/list", RelicList)
 	moutai.POSTJWT("/admin/relic/update", UpdateRelic)
 	// 上架
 	moutai.POSTJWT("/admin/relic/on/:id", RelicOn)
@@ -79,7 +79,7 @@ func RegRouters(svc *Service) {
 	// vr管理
 	moutai.POSTJWT("/admin/vr/create", CreateVr)
 	moutai.POSTJWT("/admin/vr/delete/:id", DeleteVr)
-	moutai.GET("/vr/list", VrList)
+	moutai.GET("/admin/vr/list", VrList)
 	moutai.POSTJWT("/admin/vr/update", UpdateVr)
 	// 上架
 	moutai.POSTJWT("/admin/vr/on/:id", VrOn)
@@ -89,7 +89,7 @@ func RegRouters(svc *Service) {
 	// ar管理
 	moutai.POSTJWT("/admin/ar/create", CreateAr)
 	moutai.POSTJWT("/admin/ar/delete/:id", DeleteAr)
-	moutai.GET("/ar/list", ArList)
+	moutai.GET("/admin/ar/list", ArList)
 	moutai.POSTJWT("/admin/ar/update", UpdateAr)
 	// 上架
 	moutai.POSTJWT("/admin/ar/on/:id", ArOn)

src/db/db.go

@@ -36,7 +36,7 @@ func (db *MongoDB) GetOrCreateDatabase(name string) *mongo.Database {
 
 func NewMongoDB(bus *comm.NatsBus) *MongoDB {
 
-	inst, err := bus.NewMongoDBFromConfigDev("moutai-mongo")
+	inst, err := bus.NewMongoDBFromConfig("moutai-mongo")
 
 	if err != nil {
 		panic(err)