Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

conf/log.conf

@@ -1,4 +1,4 @@
 [common]
-filename="E:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
+filename="D:\\GoProjects\\src\\spaceofcheng\\services\\log\\common.log"
 # log level "emergency", "alert", "critical", "error", "warning", "notice", "info", "debug"
 level="debug"

controllers/book/book.go

@@ -25,7 +25,7 @@ func (c *BookController) Constructor() {
 
 // GetRecommendList 获取精选
 func (c *BookController) GetRecommendList() {
-	caseid := c.GetString(":caseid")
+	caseid := c.GetString("caseid")
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
 	if page < 0 {
@@ -47,7 +47,7 @@ func (c *BookController) GetRecommendList() {
 // GetBookList 获取图书列表
 func (c *BookController) GetBookList() {
 	caseIDs := c.GetString("caseid")
-	if caseIDs == "" {
+	if caseIDs == "" && c.Context.Get("cases") != nil {
 		cases := c.Context.Get("cases").([]model.SysUserCase)
 		caseIDs = c.GetCaseIDs(cases)
 	}
@@ -284,3 +284,21 @@ func (c *BookController) DeleteBook() {
 	c.ResponseJSON("删除成功")
 
 }
+func (c *BookController) GetBookById() {
+	bookId := c.GetString(":bookId")
+	list, err := c.serv.GetBookById(bookId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(list)
+}
+
+// type Kernel struct {
+// 	schedules map[string]ScheduleTask
+// }
+
+// func NewKernel() *Kernel {
+// 	return &Kernel{
+// 		schedules: make(map[string]ScheduleTask),
+// 	}
+// }

routers/common.go

@@ -351,6 +351,7 @@ func getCommonRoutes(prefix string) beego.LinkNamespace {
 		// book 图书管理
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
 		beego.NSRouter("/book/record", &book.BookController{}, "get:GetRecordList"),
+		beego.NSRouter("/book/:bookId", &book.BookController{}, "get:GetBookById"),
 		beego.NSRouter("/book/instock/:bookId", &book.BookController{}, "get:GetInStockChangeByBookId"),
 		beego.NSRouter("/book/change", &book.BookController{}, "post:AddChangeRecord"),
 		beego.NSRouter("/book", &book.BookController{}, "post:SaveBook"),

routers/wechat.go

@@ -121,8 +121,8 @@ func getWechatRoutes(prefix string) beego.LinkNamespace {
 		beego.NSRouter("/calendar/isattend/customer", &calendar.CalendarController{}, "get:IsCustomerAttend"),
 
 		// 图书管理
-		beego.NSRouter("/book/recommend/:caseid", &book.BookController{}, "get:GetRecommendList"),
-		beego.NSRouter("/booktype/:caseid", &booktype.BooktypeController{}, "get:GetList"),
+		beego.NSRouter("/book/recommend", &book.BookController{}, "get:GetRecommendList"),
+		beego.NSRouter("/booktype", &booktype.BooktypeController{}, "get:GetList"),
 		beego.NSRouter("/book", &book.BookController{}, "get:GetBookList"),
 		beego.NSRouter("/customer/book", &book.BookController{}, "get:GetMineRecord"),
 		beego.NSRouter("/book/reserve/:bookid", &book.BookController{}, "post:ReserveBook"),