diff --git a/yshop-admin/src/main/java/co/yixiang/AppRun.java b/yshop-admin/src/main/java/co/yixiang/AppRun.java index fd875a67..cc91dbc7 100644 --- a/yshop-admin/src/main/java/co/yixiang/AppRun.java +++ b/yshop-admin/src/main/java/co/yixiang/AppRun.java @@ -10,6 +10,7 @@ package co.yixiang; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.utils.SpringContextHolder; +import com.binarywang.spring.starter.wxjava.miniapp.config.WxMaAutoConfiguration; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController; */ @EnableAsync @RestController -@SpringBootApplication +@SpringBootApplication(exclude = {WxMaAutoConfiguration.class}) @EnableTransactionManagement @MapperScan(basePackages ={"co.yixiang.modules.*.service.mapper", "co.yixiang.config"}) public class AppRun { diff --git a/yshop-app/src/main/java/co/yixiang/ApiRun.java b/yshop-app/src/main/java/co/yixiang/ApiRun.java index 49e98e9a..add8e748 100644 --- a/yshop-app/src/main/java/co/yixiang/ApiRun.java +++ b/yshop-app/src/main/java/co/yixiang/ApiRun.java @@ -1,6 +1,7 @@ package co.yixiang; import co.yixiang.utils.SpringContextHolder; +import com.binarywang.spring.starter.wxjava.miniapp.config.WxMaAutoConfiguration; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -18,7 +19,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableTransactionManagement @EnableCaching @MapperScan({"co.yixiang.modules.*.service.mapper"}) -@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class }) +@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class , WxMaAutoConfiguration.class}) public class ApiRun { public static void main(String[] args) { diff --git a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java index 5d45f6d5..621c507f 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java +++ b/yshop-app/src/main/java/co/yixiang/modules/services/AuthService.java @@ -26,6 +26,7 @@ import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.dto.WechatUserDto; import co.yixiang.modules.user.vo.OnlineUser; import co.yixiang.mp.config.WxMpConfiguration; +import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.EncryptUtils; import co.yixiang.utils.RedisUtils; import co.yixiang.utils.ShopKeyUtils; @@ -61,9 +62,7 @@ public class AuthService { private final YxUserService userService; private final RedisUtils redisUtil; - private final WxMaService wxMaService; private final RedisUtils redisUtils; - private static Integer expiredTimeIn; @@ -93,11 +92,7 @@ public class AuthService { if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) { throw new YshopException("请先配置小程序"); } - WxMaDefaultConfigImpl wxMaConfig = new WxMaDefaultConfigImpl(); - wxMaConfig.setAppid(appId); - wxMaConfig.setSecret(secret); - - wxMaService.setWxMaConfig(wxMaConfig); + WxMaService wxMaService = WxMaConfiguration.getWxMaService(); WxMaJscode2SessionResult session = wxMaService.getUserService().getSessionInfo(code); WxMaUserInfo wxMpUser = wxMaService.getUserService() .getUserInfo(session.getSessionKey(), encryptedData, iv); diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java index f415280a..1fde8de6 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java @@ -21,12 +21,15 @@ import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.wechat.rest.param.BindPhoneParam; import co.yixiang.modules.wechat.rest.param.WxPhoneParam; +import co.yixiang.mp.config.WxMpConfiguration; +import co.yixiang.tools.config.WxMaConfiguration; import co.yixiang.utils.RedisUtils; import co.yixiang.utils.ShopKeyUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.mp.api.WxMpService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; @@ -45,7 +48,6 @@ import java.util.Map; @Api(value = "微信其他", tags = "微信:微信其他", description = "微信其他") public class WxMaUserController { - private final WxMaService wxMaService; private final YxUserService userService; private final RedisUtils redisUtils; @@ -91,10 +93,7 @@ public class WxMaUserController { if (StrUtil.isBlank(appId) || StrUtil.isBlank(secret)) { throw new YshopException("请先配置小程序"); } - WxMaDefaultConfigImpl wxMaConfig = new WxMaDefaultConfigImpl(); - wxMaConfig.setAppid(appId); - wxMaConfig.setSecret(secret); - wxMaService.setWxMaConfig(wxMaConfig); + WxMaService wxMaService = WxMaConfiguration.getWxMaService(); String phone = ""; try { WxMaJscode2SessionResult session = wxMaService.getUserService()