diff --git a/conf/app.go b/conf/app.go index 24e6d7f..20d1161 100644 --- a/conf/app.go +++ b/conf/app.go @@ -37,10 +37,10 @@ var AppConfig AppConf = AppConf{ TimeFormat: "Mon, 01 Jan 2006 15:04:05 GMT", Charset: "UTF-8", Other: Other{ - IgnoreURLs: []string{"/", "/user/login", "/user/courts", "/admin/tabnames/download", "/user/getimg"}, //免token验证路径 + IgnoreURLs: []string{"/", "/user/login", "/user/courts", "/admin/tabnames/download", "/user/getimg", "/api"}, //免token验证路径 JWTTimeout: 72000, LogLevel: "debug", Secret: "SSW_WebPlatform123456", }, - PublicRute: []string{"/sysMenu", "/user/getuserinfo", "/user/pwd", "/user/avatar", "/user/profile", "/user/getimg", "/admin/tabnames/list", "/admin/stdeftab/selectarr", "/admin/stdeftab/selectall"}, //免权限检查路径 + PublicRute: []string{"/sysMenu", "/user/getuserinfo", "/user/pwd", "/user/avatar", "/user/profile", "/user/getimg", "/admin/tabnames/list", "/admin/stdeftab/selectarr", "/admin/stdeftab/selectall", "/api"}, //免权限检查路径 } diff --git a/main.go b/main.go index d48384e..8fbcdc6 100644 --- a/main.go +++ b/main.go @@ -111,7 +111,6 @@ func imain() { //数据备份 go db.CornTime() //启动监听端口 - //app.Run(iris.Addr(":22000"), iris.WithConfiguration(parse.C)) app.Run(iris.Addr(":8096"), iris.WithConfiguration(parse.C)) //app.Run(iris.Addr(":8094"), iris.WithConfiguration(parse.C)) diff --git a/utils/wxfunc/wxApi.go b/utils/wxfunc/wxApi.go index 8a48233..0c0d9bb 100644 --- a/utils/wxfunc/wxApi.go +++ b/utils/wxfunc/wxApi.go @@ -29,7 +29,7 @@ const secret = "2bb0e3104b315def0db87c131bbc351f" func DecryptData(encryptedData string, iv string, sessionKey string) (interface{}, error) { pc := wxbizdatacrypt.WxBizDataCrypt{AppId: appId, SessionKey: sessionKey} - result, err := pc.Decrypt(encryptedData, iv, true) //第三个参数解释： 需要返回 JSON 数据类型时 使用 true, 需要返回 map 数据类型时 使用 false + result, err := pc.Decrypt(encryptedData, iv, false) //第三个参数解释： 需要返回 JSON 数据类型时 使用 true, 需要返回 map 数据类型时 使用 false if err != nil { return nil, err } diff --git a/web/controllers/wxSmall/wx_surveysheet_controller.go b/web/controllers/wxSmall/wx_surveysheet_controller.go index b3b7dac..420186b 100644 --- a/web/controllers/wxSmall/wx_surveysheet_controller.go +++ b/web/controllers/wxSmall/wx_surveysheet_controller.go @@ -73,7 +73,7 @@ func InsertWXCSurveysheetResult(ctx iris.Context) { supports.Error(ctx, iris.StatusBadRequest, "json解析错误", nil) return } - data.Lastmodifyby = "wx" + data.Lastmodifyby = utils.ValueToString(data.Uid, "") data.Createtime = utils.TimeFormat(time.Now(), "yyyyMMddHHmmss") data.Lastmodifytime = utils.TimeFormat(time.Now(), "yyyyMMddHHmmss") err := data.Add() @@ -115,7 +115,7 @@ func AddWxCacheSurveysheetResult(ctx iris.Context) { } //第二步：题目信息，插入缓存表里，有就更新，没有就插入 wxsurvey := new(wxSmall.WxCacheSurveysheetResult) - wxsurvey.Lastmodifyby = "wx" + wxsurvey.Lastmodifyby = utils.ValueToString(data.Uid,"") wxsurvey.Createtime = utils.TimeFormat(time.Now(), "yyyyMMddHHmmss") wxsurvey.Lastmodifytime = utils.TimeFormat(time.Now(), "yyyyMMddHHmmss") wxsurvey.Surveynr = data.Surveynr diff --git a/web/controllers/wxSmall/wxlogin.go b/web/controllers/wxSmall/wxlogin.go index 478756a..6fa87a2 100644 --- a/web/controllers/wxSmall/wxlogin.go +++ b/web/controllers/wxSmall/wxlogin.go @@ -3,6 +3,7 @@ package wxSmall import ( "SSW_WebPlatform/utils" "SSW_WebPlatform/utils/wxfunc" + "SSW_WebPlatform/web/middleware/glog" "SSW_WebPlatform/web/models" "SSW_WebPlatform/web/models/wxSmall" "SSW_WebPlatform/web/supports" @@ -19,18 +20,16 @@ func Wxlogin(ctx iris.Context) { supports.Error(ctx, iris.StatusBadRequest, "json解析错误", nil) return } - //code := data.Code // 获取code - // 根据code获取 openID 和 session_key - //wxLoginResp, err := wxfunc.WXLogin(code) - //if err != nil { - // supports.Error(ctx, iris.StatusBadRequest, "获取session_key失败", nil) - // return - //} - + code := data.Code // 获取code + //根据code获取 openID 和 session_key + wxLoginResp, err := wxfunc.WXLogin(code) + if err != nil { + supports.Error(ctx, iris.StatusBadRequest, "获取session_key失败", nil) + return + } //判断数据库里用户表是否存在此用户 user := new(wxSmall.WxUser) - //user.Openid = wxLoginResp.OpenId - user.Openid = "123456" + user.Openid = wxLoginResp.OpenId wxuser, err := user.SelectOneByOpenid() if err != nil { supports.Error(ctx, iris.StatusBadRequest, supports.ParseParamsFailur, nil) @@ -38,26 +37,22 @@ func Wxlogin(ctx iris.Context) { } if wxuser == nil { //添加信息 - //userInfo, err := wxfunc.DecryptData(data.EncryptedData,data.Iv,wxLoginResp.SessionKey) - //if err != nil { - // supports.Error(ctx, iris.StatusBadRequest, "数据解密失败", nil) - // return - //} - //Info := userInfo.(map[string]interface{}) - //user.Nickname = utils.ValueToString(Info["nickName"],"") - //user.Gender = utils.ValueToInt(Info["gender"],0) - //user.Avatarurl = utils.ValueToString(Info["avatarUrl"],"") - //user.Province = utils.ValueToString(Info["province"],"") - //user.City =utils.ValueToString(Info["city"],"") - //user.Country =utils.ValueToString(Info["country"],"") - //user.Sessionkey = wxLoginResp.SessionKey - //user.Openid = wxLoginResp.OpenId - //user.Unionid = wxLoginResp.UnionId - user.Gender = 1 - user.Nickname = "风云争霸" - user.Sessionkey = "123456" - user.Openid = "123456" - user.Unionid = "123456" + userInfo, err := wxfunc.DecryptData(data.EncryptedData,data.Iv,wxLoginResp.SessionKey) + if err != nil { + glog.InfoExtln("code","数据解密失败err:",err) + supports.Error(ctx, iris.StatusBadRequest, "数据解密失败", nil) + return + } + Info := userInfo.(map[string]interface{}) + user.Nickname = utils.ValueToString(Info["nickName"],"") + user.Gender = utils.ValueToInt(Info["gender"],0) + user.Avatarurl = utils.ValueToString(Info["avatarUrl"],"") + user.Province = utils.ValueToString(Info["province"],"") + user.City =utils.ValueToString(Info["city"],"") + user.Country =utils.ValueToString(Info["country"],"") + user.Sessionkey = wxLoginResp.SessionKey + user.Openid = wxLoginResp.OpenId + user.Unionid = wxLoginResp.UnionId err = user.Add() if err != nil { supports.Error(ctx, iris.StatusBadRequest, "用户信息录入失败", nil) @@ -73,8 +68,7 @@ func Wxlogin(ctx iris.Context) { if !ok { //过期，更新 user.Uid = wxuser.Uid - //user.Sessionkey = wxLoginResp.SessionKey - user.Sessionkey = "123456" + user.Sessionkey = wxLoginResp.SessionKey err = user.Update() if err != nil { supports.Error(ctx, iris.StatusBadRequest, "用户信息更新失败", nil) diff --git a/web/models/wxSmall/wx_cache_surveysheet_result.go b/web/models/wxSmall/wx_cache_surveysheet_result.go index 84325f6..1cb8608 100644 --- a/web/models/wxSmall/wx_cache_surveysheet_result.go +++ b/web/models/wxSmall/wx_cache_surveysheet_result.go @@ -92,7 +92,7 @@ func (t *WxCacheSurveysheetResult) Add(data models.CSurveysheetResult) error { surveynr := 0 if ok{ //更新 - surveynr = data.Surveynr + surveynr = cache.Surveynr }else{ snr := new(models.Snrtab) snr.Cid = data.Cid @@ -108,7 +108,7 @@ func (t *WxCacheSurveysheetResult) Add(data models.CSurveysheetResult) error { Survey.Surveysamplecount = subject.Surveysamplecount Survey.Surveyfinishedcount = subject.Surveyfinishedcount Survey.Cid = data.Cid - Survey.Cnr = data.Cnr + Survey.Cnr = data.Cid Survey.Uid = t.Uid Survey.Surveysheetid = data.Surveysheetid Survey.Buildingid = data.Buildingid @@ -152,7 +152,7 @@ func (t *WxCacheSurveysheetResult) Add(data models.CSurveysheetResult) error { //更新 subject := new(WxCacheSurveysheetResultlst) subject.Cid = data.Cid - subject.Cnr = data.Cnr + subject.Cnr = data.Cid subject.Uid = t.Uid subject.Subjectid = vv.Subjectid subject.Surveynr = surveynr @@ -175,7 +175,7 @@ func (t *WxCacheSurveysheetResult) Add(data models.CSurveysheetResult) error { }else{ subject := new(WxCacheSurveysheetResultlst) subject.Cid = data.Cid - subject.Cnr = data.Cnr + subject.Cnr = data.Cid subject.Uid = t.Uid subject.Subjectid = vv.Subjectid subject.Surveynr = surveynr