commom

conf/db.conf

@@ -5,8 +5,8 @@ db_type      = mysql
 con_protocol = tcp
 
 ; 数据库地址，可以使用IP
-db_addr      = 192.168.0.122
-# db_addr      = localhost
+# db_addr      = 192.168.0.122
+db_addr      = localhost
 
 ; 端口
 db_port      = 3306

controllers/auth.go

@@ -38,11 +38,11 @@ func (c *BaseController) authenticate() {
 }
 
 // SetTokenExipre 设置 token 过期
-func (c *BaseController) SetTokenExipre() {
-	// token := c.Context.Get("token")
-	// if token != nil {
-	// 	c.serv.UpdateTokenExpire(token.(string))
-	// }
+func (c *BaseController) SetTokenExipre(uid string) {
+	token := c.Context.Get("token")
+	if token != nil {
+		c.serv.UpdateTokenExpire(token.(string), uid)
+	}
 
 	c.Context.Set("token", "")
 }

controllers/base.go

@@ -74,7 +74,7 @@ func (c *BaseController) ResponseData(data interface{}, msg interface{}, code in
 
 	if status == http.StatusOK {
 		// 设置旧 token 过期
-		c.SetTokenExipre()
+		// c.SetTokenExipre()
 
 		// 生成新 token
 		c.CreateNewToken()

controllers/bodychecklist/bodychecklist.go

@@ -21,7 +21,7 @@ func (c *BodychecklistController) Constructor() {
 func (c *BodychecklistController) GetBodyCheckList() {
 	caseid := c.GetString("caseid")
 	phone := c.GetString("phone")
-	customerName := c.GetString("customerName")
+	customerName := c.GetString("name")
 	page, _ := c.GetInt("page")
 	pagesize, _ := c.GetInt("pagesize")
 	if page < 0 {

controllers/cases/key.go

@@ -1,8 +1,14 @@
 package cases
 
+import "spaceofcheng/services/models/model"
+
 // GetKeyList 获取钥匙列表
 func (c *CaseController) GetKeyList() {
-	caseid := c.GetString("caseid")
+	caseids := c.GetString("caseid")
+	if caseids == "" {
+		cases := c.Context.Get("cases").([]model.SysUserCase)
+		caseids = c.GetCaseIDs(cases)
+	}
 	page, _ := c.GetInt("page")
 	pageSize, _ := c.GetInt("pagesize")
 	num := c.GetString("num")
@@ -11,7 +17,7 @@ func (c *CaseController) GetKeyList() {
 		page = 1
 	}
 
-	list, err := c.dao.GetKeysByCase(caseid, num, page, pageSize)
+	list, err := c.dao.GetKeysByCase(caseids, num, page, pageSize)
 	if err != nil {
 		c.ResponseError(err)
 	}

controllers/luckdraw/luckdraw.go

@@ -143,7 +143,7 @@ func (c *LuckDrawController) GetRecordByID() {
 		c.ResponseError(errors.New("校验奖品记录失败"))
 	}
 
-	c.ResponseJson(map[string]interface{}{
+	c.ResponseJSON(map[string]interface{}{
 		"record":      record,
 		"prize":       prize,
 		"caseAddress": caseAddress,
@@ -151,50 +151,84 @@ func (c *LuckDrawController) GetRecordByID() {
 }
 
 func (c *LuckDrawController) SaveShareRecord() {
+	errIgnore := "error-ignore"
+
 	id := c.GetString(":id")
 
 	fromID := c.GetString("from")
 	if fromID == "" {
-		c.ResponseError(errors.New("没有分享人ID"))
+		c.ResponseData(
+			errIgnore,
+			"没有分享人ID",
+			http.StatusBadRequest,
+		)
 	}
 
 	from, err := c.bodydao.GetCustomerByID(fromID)
 	if err != nil {
 		utils.LogError("获取分享人信息失败: " + err.Error())
-		c.ResponseError(errors.New("获取分享人信息失败"))
+		c.ResponseData(
+			errIgnore,
+			"获取分享人信息失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	if from == nil || from.CustomerId == "" {
 		utils.LogError("分享人信息不存在: " + err.Error())
-		c.ResponseError(errors.New("分享人信息不存在"))
+		c.ResponseData(
+			errIgnore,
+			"分享人信息不存在",
+			http.StatusBadRequest,
+		)
 	}
 
 	current = c.Context.Get("customer")
 
 	// 自己分享给自己
 	if from.CustomerId == current.CustomerId {
-		c.ResponseError(errors.New("本人分享内容无效"))
+		c.ResponseData(
+			errIgnore,
+			"本人分享内容无效",
+			http.StatusBadRequest,
+		)
 	}
 
 	luckdraw, err := c.dao.GetLuckDrawByID(id)
 	if err != nil {
 		utils.LogError("获取抽奖信息失败: " + err.Error())
-		c.ResponseError(errors.New("获取抽奖信息失败"))
+		c.ResponseData(
+			errIgnore,
+			"获取抽奖信息失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	if luckdraw == nil {
 		utils.LogError("获取抽奖信息失败: " + err.Error())
-		c.ResponseError(errors.New("没有找到 id (" + id + ") 对应的抽奖信息"))
+		c.ResponseData(
+			errIgnore,
+			"没有找到 id ("+id+") 对应的抽奖信息",
+			http.StatusBadRequest,
+		)
 	}
 
 	existsRec, err := c.dao.GetLuckDrawShareData(from.Id, current.Id, luckdraw.Id, luckdraw.CaseId)
 	if err != nil {
 		utils.LogError("获取已有分享信息失败: " + err.Error())
-		c.ResponseError(errors.New("获取已有分享信息失败"))
+		c.ResponseData(
+			errIgnore,
+			"获取已有分享信息失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	if existsRec != nil && len(existsRec) > 0 {
-		c.ResponseError(errors.New("已分享记录, 再次分享无效"))
+		c.ResponseData(
+			errIgnore,
+			"已分享记录, 再次分享无效",
+			http.StatusBadRequest,
+		)
 	}
 
 	shareDt := model.TaShareLuckyRecord{
@@ -213,7 +247,11 @@ func (c *LuckDrawController) SaveShareRecord() {
 
 	if err := c.dao.SaveLuckDrawShareData(&shareDt); err != nil {
 		utils.LogError("保存分享记录失败: " + err.Error())
-		c.ResponseError(errors.New("保存分享记录失败"))
+		c.ResponseData(
+			errIgnore,
+			"保存分享记录失败",
+			http.StatusBadRequest,
+		)
 	}
 
 	c.ResponseJSON("ok")

controllers/user/user.go

@@ -206,7 +206,10 @@ func (c *UserController) SignIn() {
 
 // SignOut 用户登出
 func (c *UserController) SignOut() {
+	user := c.Context.Get("user").(model.SysUser)
 	c.Context.Set("user", nil)
+	c.SetTokenExipre(user.UserId)
+	c.ResponseJSON("ok")
 }
 
 // GetEnvVars 获取当前用户相关

models/bodychecklist/bodychecklist.go

@@ -1,14 +1,10 @@
 package bodychecklist
 
 import (
-	"fmt"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
-	"strings"
-
-	"github.com/astaxie/beego"
 
 	"github.com/go-xorm/xorm"
 )
@@ -35,13 +31,12 @@ type BodyCheck struct {
 	Phone             string
 }
 
-func (m *BodychecklistDAO) GetBodychecklist(phone, customerName string, filters []string, limit []int) ([]BodyCheck, int64, error) {
+func (m *BodychecklistDAO) GetBodychecklist(phone, customerName, filters string, limit []int) ([]BodyCheck, int64, error) {
 	var bodycheck []BodyCheck
-	filterString := ""
-	if len(filters) > 0 {
-		filterString = strings.Join(filters, " and ")
-		filterString += " and "
-	}
+	// if len(filters) > 0 {
+	// 	filterString = strings.Join(filters, " and ")
+	// 	filterString += " and "
+	// }
 	sql := `SELECT
 	a.*,
 	b.phone,
@@ -56,7 +51,7 @@ FROM
 	ta_body_check a
 	INNER JOIN ta_customer b ON a.user_id = b.customer_id
 	INNER JOIN sys_case c ON c.case_id = a.case_id
-	where %s  a.status > ` + strconv.Itoa(models.STATUS_DEL)
+	where ` + filters + ` and  a.status > ` + strconv.Itoa(models.STATUS_DEL)
 	if phone != "" {
 		sql += ` and b.phone = '` + phone + `'`
 	}
@@ -64,8 +59,7 @@ FROM
 		sql += ` and b.customer_name like '%` + customerName + `%'`
 	}
 	sql += ` order by a.create_date desc`
-	beego.Error(sql)
-	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&bodycheck, fmt.Sprintf(sql, filterString), limit)
+	total, err := utils.NewPageNaviEngine(m.ctx).GetPageList(&bodycheck, sql, limit)
 	if err != nil {
 		return nil, 0, err
 	}

models/cases/key.go

@@ -21,7 +21,7 @@ type CaseKeyInfo struct {
 }
 
 // GetKeysByCase 根据案场获取钥匙信息
-func (m *CaseDAO) GetKeysByCase(caseid, num string, page, pageSize int) ([]CaseKeyInfo, error) {
+func (m *CaseDAO) GetKeysByCase(caseids, num string, page, pageSize int) ([]CaseKeyInfo, error) {
 	var keys []CaseKeyInfo
 	query := `
 		SELECT
@@ -31,7 +31,7 @@ func (m *CaseDAO) GetKeysByCase(caseid, num string, page, pageSize int) ([]CaseK
 			ta_case_key t
 		LEFT JOIN ta_case_key_use s ON t.key_id = s.key_id AND s.status != ?
 		WHERE
-			t.case_id = ?
+			t.case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')
 		AND t.status > ?
 	`
 
@@ -42,14 +42,14 @@ func (m *CaseDAO) GetKeysByCase(caseid, num string, page, pageSize int) ([]CaseK
 	offset := (page - 1) * pageSize
 	query += " order by lock_no asc LIMIT " + strconv.Itoa(pageSize) + " OFFSET " + strconv.Itoa(offset)
 
-	err := m.db.SQL(query, models.STATUS_NORMAL, caseid, models.STATUS_DEL).Find(&keys)
+	err := m.db.SQL(query, models.STATUS_NORMAL, models.STATUS_DEL).Find(&keys)
 	return keys, err
 }
 
 // GetKeysCountByCase 根据案场获取钥匙数量
-func (m *CaseDAO) GetKeysCountByCase(caseid, num string) (int, error) {
+func (m *CaseDAO) GetKeysCountByCase(caseids, num string) (int, error) {
 	var keys []model.TaCaseKey
-	dao := m.db.Where("case_id=?", caseid).And("status>" + strconv.Itoa(models.STATUS_DEL))
+	dao := m.db.Where(`case_id in ('` + strings.Replace(caseids, ",", "','", -1) + `')`).And("status>" + strconv.Itoa(models.STATUS_DEL))
 	if num != "" {
 		dao.And("lock_num like '%" + num + "%'")
 	}

models/luckdraw/luckdraw.go

@@ -278,7 +278,7 @@ func (m *LuckDrawDao) GetPrizeStock(luckdrawid string) ([]model.TaLuckdrawPrize,
 }
 
 // GetPrizeByID 根据id获取奖品信息
-func (m *LuckDrawDao) GetPrizeByID(id int) (model.TaLuckdrawPrize, error) {
+func (m *LuckDrawDao) GetPrizeByID(id string) (model.TaLuckdrawPrize, error) {
 	var prize = model.TaLuckdrawPrize{}
 	_, err := m.db.Where("id=?", id).Get(&prize)
 	return prize, err

models/model/sys_token_log.go

@@ -5,6 +5,7 @@ import "time"
 type SysTokenLog struct {
 	TokenId    int       `xorm:"not null pk autoincr INT(11)"`
 	Token      string    `xorm:"TEXT"`
+	Uid        string    `xorm:"VARCHAR(64)"`
 	Status     int       `xorm:"SMALLINT(6)"`
 	CreateDate time.Time `xorm:"DATETIME"`
 }

models/models.go

@@ -20,7 +20,7 @@ func NewDBEngine() *xorm.Engine {
 	dns := getMySQLDNS()
 
 	engine, err := xorm.NewEngine(dbType, dns)
-	engine.ShowSQL()
+	// engine.ShowSQL()
 
 	if err != nil {
 		panic(err)

models/statistics/other.go

@@ -53,7 +53,7 @@ func (m *StatisticsDAO) GetDashboardSetting(userID string, userTypes []string) (
 		FROM
 			ta_dashboard_setting t
 		JOIN td_statistics_comps s ON t.comp_id = s.comp_id
-		where (` + strings.Join(filters, " OR ") + ") AND status = ? order by group asc, sort_no asc"
+		where (` + strings.Join(filters, " OR ") + ") AND t.status = ? order by t.group asc, t.sort_no asc"
 
 	var settings []UserDashSetting
 	if err := m.db.SQL(sql, models.STATUS_NORMAL).Find(&settings); err != nil {

models/sys.go

@@ -136,9 +136,10 @@ func GetWeChatConfig(org, cliType string) (*model.SysWechatConf, error) {
 }
 
 // InsertToken 插入 token 生成记录
-func InsertToken(token string) error {
+func InsertToken(token, uid string) error {
 	tk := model.SysTokenLog{
 		Token:      token,
+		Uid:        uid,
 		Status:     STATUS_NORMAL,
 		CreateDate: time.Now().Local(),
 	}
@@ -151,12 +152,12 @@ func InsertToken(token string) error {
 }
 
 // UpdateTokenExpire 设置 token 过期
-func UpdateTokenExpire(token string) error {
+func UpdateTokenExpire(token, uid string) error {
 	tk := model.SysTokenLog{
 		Status: STATUS_DEL,
 	}
 
-	if _, err := DBEngine.Cols("status").Where("token=?", token).Update(&tk); err != nil {
+	if _, err := DBEngine.Cols("status").Where("token=?", token).Or("uid=?", uid).Update(&tk); err != nil {
 		return err
 	}
 

models/system/user.go

@@ -144,7 +144,7 @@ func (m *UserDAO) GetUserRole(userid string) ([]model.SysRole, error) {
 // GetUserMenu 获取用户菜单
 func (m *UserDAO) GetUserMenu(userid string) ([]model.SysMenu, error) {
 	var userMenu []model.SysMenu
-	err := m.db.In("menu_id", builder.Select("menu_id").From("sys_user_menu").Where(builder.Eq{"user_id": userid}).And(builder.Gt{"status": models.STATUS_DEL})).Find(&userMenu)
+	err := m.db.In("menu_id", builder.Select("menu_id").From("sys_user_menu").Where(builder.Eq{"user_id": userid}).And(builder.Gt{"status": models.STATUS_DEL})).Asc("order_no").Find(&userMenu)
 	return userMenu, err
 }
 

service/bodychecklist/bodychecklist.go

@@ -23,15 +23,13 @@ func NewBodychecklistServ(ctx *utils.Context) *BodychecklistServ {
 }
 
 func (s *BodychecklistServ) GetBodyCheckList(caseID, phone, customerName string, pagenavi ...int) ([]bodychecklist.BodyCheck, int64, error) {
-	filters := []string{}
+	filters := ""
 	if caseID != "" {
 		if err := utils.NewAuthEngine(s.ctx).CheckCase(caseID); err != nil {
 			return nil, 0, err
 		}
 
-		filters = []string{
-			"a.case_id='" + caseID + "'",
-		}
+		filters = "a.case_id='" + caseID + "'"
 	} else {
 		casesRaw := s.ctx.Get("cases")
 		if casesRaw == nil {
@@ -44,9 +42,7 @@ func (s *BodychecklistServ) GetBodyCheckList(caseID, phone, customerName string,
 			caseIDs = append(caseIDs, cs.CaseId)
 		}
 
-		filters = []string{
-			"a.case_id in ('" + strings.Join(caseIDs, "','") + "')",
-		}
+		filters = "a.case_id in ('" + strings.Join(caseIDs, "','") + "')"
 	}
 
 	limit := utils.GetPageNaviLimit(pagenavi...)

service/cases/key.go

@@ -11,32 +11,18 @@ import (
 )
 
 // GetKeysByCase 根据案场获取钥匙信息
-func (s *CaseServ) GetKeysByCase(caseid, num string, page, pageSize int) (map[string]interface{}, error) {
-	cases := s.ctx.Get("cases").([]model.SysUserCase)
-	isdict := false
-	if caseid != "" {
-		for _, value := range cases {
-			if caseid == value.CaseId {
-				isdict = true
-			}
-		}
-
-		if !isdict {
-			return nil, utils.LogError("您没有该案场的权限！")
-		}
-	}
-
+func (s *CaseServ) GetKeysByCase(caseids, num string, page, pageSize int) (map[string]interface{}, error) {
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
 
-	keys, err := s.dao.GetKeysByCase(caseid, num, page, pageSize)
+	keys, err := s.dao.GetKeysByCase(caseids, num, page, pageSize)
 	if err != nil {
 		utils.LogError("获取钥匙信息失败: " + err.Error())
 		return nil, errors.New("获取钥匙信息失败")
 	}
 
-	total, err := s.dao.GetKeysCountByCase(caseid, num)
+	total, err := s.dao.GetKeysCountByCase(caseids, num)
 	if err != nil {
 		utils.LogError("获取钥匙信息失败: " + err.Error())
 		return nil, errors.New("获取钥匙信息失败")

service/sys.go

@@ -111,7 +111,7 @@ func (s *SysServ) NewToken() string {
 
 	// 入库
 	if !token.Guest {
-		if err := models.InsertToken(tokenEncodeStr); err != nil {
+		if err := models.InsertToken(tokenEncodeStr, token.ID); err != nil {
 			utils.LogError("入库 Token 失败: " + err.Error())
 			return tokenEncodeStr
 		}
@@ -384,8 +384,8 @@ func (s *SysServ) getToken(gctx *context.Context) (*utils.JWTToken, error) {
 
 // UpdateTokenExpire 更新 token 为过期
 // 如果发生错误, 此处选择忽略
-func (s *SysServ) UpdateTokenExpire(token string) {
-	if err := models.UpdateTokenExpire(token); err != nil {
+func (s *SysServ) UpdateTokenExpire(token, uid string) {
+	if err := models.UpdateTokenExpire(token, uid); err != nil {
 		utils.LogError("更新 Token 过期失败: " + err.Error())
 	}
 }