修改

xuhy

2024-12-31 8962a6aecb9922a016155af8fa5a09d727c78c70

修改

 applet/src/main/java/com/jilongda/applet/controller/LoginController.java

@@ -54,17 +54,16 @@
    @PostMapping("openIdByJsCode")
    public ApiResult<Map<String, Object>> openIdByJsCode(@RequestBody AppletUserEncrypteData data) {
        log.info("<<<<<<<<换取openid开始<<<<<<<<:{}", data.getCode());
//        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
//        Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
//        String openid = body.getOpenid();
//        String sessionKey = body.getSessionKey();
//        if(!StringUtils.hasLength(data.getEncryptedData()) || !StringUtils.hasLength(data.getIv())){
//            return ApiResult.failed("已拒绝授权",null);
//        }
//        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
//        appletUserDecodeData.setOpenId(openid);
//        TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
        TAppUser appUser = appUserService.getById(1);
        WxAppletTools appletTools = new WxAppletTools(wxRestTemplate, wxConfig, redisAutoTemplate);
        Code2SessionRespBody body = appletTools.getOpenIdByJscode2session(new Code2SessionResqBody().build(data.getCode()));
        String openid = body.getOpenid();
        String sessionKey = body.getSessionKey();
        if(!StringUtils.hasLength(data.getEncryptedData()) || !StringUtils.hasLength(data.getIv())){
            return ApiResult.failed("已拒绝授权",null);
        }
        AppletUserDecodeData appletUserDecodeData = WxUtils.encryptedData(data.getEncryptedData(), sessionKey,  data.getIv());
        appletUserDecodeData.setOpenId(openid);
        TAppUser appUser = appUserService.wxLogin(appletUserDecodeData);
        Map<String, Object> tokenInfos = securityUtils.login(appUser.getOpenId(), appUser, authenticationManager, TAppUser.class, 3);
        return ApiResult.success(tokenInfos);
    }

 applet/src/main/java/com/jilongda/applet/utils/LoginInfoUtil.java

@@ -16,9 +16,9 @@


    public Integer getUserId(){
//        String username = JwtTokenUtils.getUsername();
//        TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
        return 1;
        String username = JwtTokenUtils.getUsername();
        TAppUser appUser = appUserService.getOne(new QueryWrapper<TAppUser>().eq("openId", username).eq("isDelete",0));
        return appUser.getId();
    }

    public TAppUser getLoginUser(){

 applet/src/main/resources/application.yml

@@ -13,7 +13,8 @@
      max-request-size: 500MB
      resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
  profiles:
    active: prod
    active: dev
  #    active: prod
  main:
    allow-bean-definition-overriding: true
#  rabbitmq:
@@ -66,8 +67,8 @@
  conf:
    # 开启或关闭，默认开启，当支付信息无效时不能正常启动项目，可设为false
    enabled: true
    appId: wxb17e909bb2b1975f
    secretId: eee8aae16bab075f1b3e51784e5dff6d
    appId: wx9368902cab914aea
    secretId: 1ec8263ae9ed9f475546c971fc702979
    templateApproveId: jAt2UR8LtaDplqwHQFmAjvaqdLY0WVo16CVYKoZtcuo #申请审批消息模板id
#OSS及短信配置
oss:

 common/src/main/java/com/jilongda/common/basic/Constant.java

@@ -124,7 +124,7 @@
            , "/api/v1/"
            , "/druid/**"
            , "/druid/**"
            , "/**"  //开发时关闭身份认证
//            , "/**"  //开发时关闭身份认证
            , "/files/**"
            , "/login"
            , "/wx/wxLoginByCodeH5" //微信h5登录

 manage/src/main/resources/application.yml

@@ -13,7 +13,8 @@
      max-request-size: 500MB
      resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
  profiles:
    active: prod
    active: dev
  #    active: prod
  main:
    allow-bean-definition-overriding: true
  #sagger文档属性配置

 optometrist/src/main/resources/application.yml

@@ -13,7 +13,8 @@
      max-request-size: 500MB
      resolve-lazily: true #设置为懒加载，不然依然会捕获不到异常
  profiles:
    active: prod
    active: dev
#    active: prod
  main:
    allow-bean-definition-overriding: true
  #sagger文档属性配置