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

conf/log.conf

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

controllers/luckdrawlist/luckdrawlist.go

@@ -83,7 +83,7 @@ func (c *LuckdrawlistController) GetVerifyList() {
 func (c *LuckdrawlistController) VerifyLuckdraw() {
 	sysUser := c.Context.Get("user").(model.SysUser)
 	userId := sysUser.UserId
-	luckdrawId := c.GetString("luckdrawId")
+	luckdrawId := c.GetString(":luckdrawId")
 	if luckdrawId == "" {
 		c.ResponseError(errors.New("无效二维码"))
 	}

routers/common.go

@@ -190,8 +190,8 @@ func getCommonRoutes() beego.LinkNamespace {
 		//luckdrawlist 抽奖
 		beego.NSRouter("luckdrawlist", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckdrawList"),
 		beego.NSRouter("luckdrawlist/share", &luckdrawlist.LuckdrawlistController{}, "get:GetLuckShareList"),
-		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
-		beego.NSRouter("luckdrawlist/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
+		beego.NSRouter("luckdrawlist/verify/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "get:GetVerifyList"),
+		beego.NSRouter("luckdrawlist/verify/:luckdrawId", &luckdrawlist.LuckdrawlistController{}, "put:VerifyLuckdraw"),
 
 		// bodychecklist 体检列表
 		beego.NSRouter("bodychecklist", &bodychecklist.BodychecklistController{}, "get:GetBodyCheckList"),

service/sys.go

@@ -177,18 +177,21 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 		// 获取 token
 		token, err := s.getToken(gctx)
 		if err != nil {
-			// token 报错一律视为需要重新登录
-			return map[string]interface{}{
-				"code":  http.StatusUnauthorized,
-				"error": err,
-				"message": map[string]interface{}{
-					"appid": utils.GetWxAppID(s.org.OrgId),
-				},
+			tokenStr := s.ctx.Get("token").(string)
+			if tokenStr != "" {
+				// token 报错一律视为需要重新登录
+				return map[string]interface{}{
+					"code":  http.StatusUnauthorized,
+					"error": err,
+					"message": map[string]interface{}{
+						"appid": utils.GetWxAppID(s.org.OrgId),
+					},
+				}
 			}
 		}
 
 		// 未登录 或 未验证
-		if token.ID == "" {
+		if token == nil || token.ID == "" {
 			if code == "" {
 				return map[string]interface{}{
 					"code":  http.StatusUnauthorized,
@@ -216,6 +219,8 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 				}
 			}
 
+			utils.LogError("获取到微信人员: ", wxUser)
+
 			openID = wxUser.OpenID
 		} else {
 			openID = token.ID
@@ -242,7 +247,7 @@ func (s *SysServ) authWechat(gctx *context.Context) map[string]interface{} {
 	// 如果尚无人员映射信息, 代表人员初次使用本系统
 	if userMapping == nil {
 		// 如果没有微信用户信息, 代表产生了未知异常
-		if wxUser == nil || wxUser.UnionID == "" {
+		if wxUser == nil || wxUser.OpenID == "" {
 			return map[string]interface{}{
 				"code":  http.StatusInternalServerError,
 				"error": errors.New("系统异常, 请清空缓存后重试"),

utils/wechat.go

@@ -87,6 +87,10 @@ func MapToWechatUser(data map[string]interface{}) *WechatUser {
 		user.Sex = data["sex"].(float64)
 	}
 
+	if data["nickname"] != nil {
+		user.NickName = data["nickname"].(string)
+	}
+
 	if data["province"] != nil {
 		user.Province = data["province"].(string)
 	}