From c5c6fa800cedd37cea0e3cc3e68df78b47ee2813 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 28 八月 2023 10:37:59 +0800 Subject: [PATCH] 111 --- server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 41 insertions(+), 11 deletions(-) diff --git a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java index e289aa1..dc927b2 100644 --- a/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java +++ b/server/src/main/java/doumeemes/service/system/impl/WxLoginServiceImpl.java @@ -1,5 +1,6 @@ package doumeemes.service.system.impl; +import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; @@ -11,6 +12,7 @@ import doumeemes.core.utils.Constants; import doumeemes.core.utils.HttpsUtil; import doumeemes.core.utils.Utils; +import doumeemes.core.utils.WxMiniConfig; import doumeemes.dao.business.model.Company; import doumeemes.dao.business.model.CompanyUser; import doumeemes.dao.business.model.Department; @@ -32,6 +34,7 @@ import doumeemes.service.system.SystemLoginLogService; import doumeemes.service.system.WxLoginService; import lombok.extern.slf4j.Slf4j; +import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authc.AuthenticationException; @@ -57,7 +60,6 @@ @Autowired private SystemDictDataBiz systemDictDataBiz; - @Value("${project.version}") private String systemVersion; @@ -85,24 +87,51 @@ */ public static final String GET_USER_INFO_URL = "https://api.weixin.qq.com/sns/userinfo?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN"; + public static final String url = "https://api.weixin.qq.com/cgi-bin/user/info?access_token=ACCESS_TOKEN&openid=OPENID&lang=zh_CN"; + /** + * 娉細鍏紬鍙�-璁剧疆涓庡紑鍙�-鍩烘湰璁剧疆锛屽繀椤汇�愬凡缁戝畾鐨勫井淇″紑鏀惧钩鍙拌处鍙枫�� + * @param code + * @param request + * @return + */ @Override public WxLoginVO wxLogin(String code, HttpServletRequest request) { - WxLoginVO wxLoginVO = new WxLoginVO(); String appId = systemDictDataBiz.queryByCode(Constants.WX_CONFIG,Constants.APPID).getCode(); String appSecret = systemDictDataBiz.queryByCode(Constants.WX_CONFIG,Constants.APPSECRET).getCode(); String getTokenUrl = GET_ACCESS_TOKEN_URL.replace("CODE", code).replace("APPID", appId).replace("SECRET", appSecret); JSONObject tokenJson = JSONObject.parseObject(HttpsUtil.get(getTokenUrl,true)); - if(Objects.isNull(tokenJson.get("access_token"))){ - throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),tokenJson.getString("errmsg")); - } - String accessToken = tokenJson.getString("access_token"); String openId = tokenJson.getString("openid"); - String getUserInfoUrl = GET_USER_INFO_URL.replace("ACCESS_TOKEN", accessToken).replace("OPENID", openId); - JSONObject userInfoJson = JSONObject.parseObject(HttpsUtil.get(getUserInfoUrl,true)); + //娉細鍏紬鍙�-璁剧疆涓庡紑鍙�-鍩烘湰璁剧疆锛屽繀椤汇�愬凡缁戝畾鐨勫井淇″紑鏀惧钩鍙拌处鍙枫�� + String unionId = tokenJson.getString("unionid"); + return loginByUnionIdAndReturn(unionId,Constants.OPENID_WX+openId,request); + } + + + @Override + public WxLoginVO wxProgramLogin(String code, HttpServletRequest request) { + try { + WxMaJscode2SessionResult session = WxMiniConfig.wxMaService.getUserService().getSessionInfo(code); + String unionid = session.getUnionid(); + String openId = session.getOpenid(); + return loginByUnionIdAndReturn(unionid,Constants.OPENID_MINI+openId,request); + } catch (WxErrorException e) { + e.printStackTrace(); + } + throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"寰俊鎺堟潈澶辫触锛岃鑱旂郴绠$悊鍛�"); + + + + } + private WxLoginVO loginByUnionIdAndReturn(String unionid,String openId,HttpServletRequest request) { + WxLoginVO wxLoginVO = new WxLoginVO(); wxLoginVO.setOpenid(openId); - wxLoginVO.setUnionid(userInfoJson.getString("unionid")); - CompanyUser companyUser = companyUserExtMapper.selectOne(new QueryWrapper<CompanyUser>().eq("openid",openId).last(" limit 1 ")); + wxLoginVO.setUnionid(unionid); + CompanyUser companyUser = companyUserExtMapper.selectOne(new QueryWrapper<CompanyUser>().lambda() + .eq(CompanyUser::getUnionid,wxLoginVO.getUnionid()) + .eq(CompanyUser::getDeleted,Constants.ZERO) + .last(" limit 1 ")); +// CompanyUser companyUser = companyUserExtMapper.selectOne(new QueryWrapper<CompanyUser>().eq("openid",openId).last(" limit 1 ")); if(Objects.isNull(companyUser)){ wxLoginVO.setLoginStatus(Constants.ONE); return wxLoginVO; @@ -168,6 +197,7 @@ + @Override public String wxLoginByPassword(WxLoginDTO dto, HttpServletRequest request) { SystemLoginLog loginLog = new SystemLoginLog(); @@ -226,7 +256,7 @@ @Override public void wxLoginOut(WxLoginOutDTO wxLoginOutDTO) { - if(Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){ + if(!Objects.isNull(wxLoginOutDTO)&&!Objects.isNull(wxLoginOutDTO.getCompanyUserId())){ companyUserExtMapper.update(null,new UpdateWrapper<CompanyUser>() .set("UNIONID","").set("OPENID","") .eq("id",wxLoginOutDTO.getCompanyUserId()) -- Gitblit v1.9.3