diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 59775a1316..de5d22524a 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -80,6 +80,12 @@ 1.0.0 compile + + com.epmet + epmet-commons-tools-wx-mp + 1.0.0 + compile + com.epmet epmet-user-client @@ -160,10 +166,10 @@ - wxe73d1ecd13b5e9fb - 87c9f99e2ea5b695c79e8f5388789959 - 111 - 111 + wxcb6ce2ed0c5ae54c + c7f74941ee97fa9b2e1065772d34c397 + 12345678Yzm + jiKrJoPQsUIP9ayAwmuJQeAVPBjFOh5D1JxFDd7ZSU3 wx07674c23af51b521 a2fd0d29b007cbbcf8c8dda8c693d99b @@ -197,10 +203,10 @@ - wxe73d1ecd13b5e9fb - 87c9f99e2ea5b695c79e8f5388789959 - 111 - 111 + wxcb6ce2ed0c5ae54c + c7f74941ee97fa9b2e1065772d34c397 + 12345678Yzm + jiKrJoPQsUIP9ayAwmuJQeAVPBjFOh5D1JxFDd7ZSU3 wx07674c23af51b521 a2fd0d29b007cbbcf8c8dda8c693d99b @@ -234,10 +240,10 @@ - wxe73d1ecd13b5e9fb - 87c9f99e2ea5b695c79e8f5388789959 - 111 - 111 + wxcb6ce2ed0c5ae54c + c7f74941ee97fa9b2e1065772d34c397 + 12345678Yzm + jiKrJoPQsUIP9ayAwmuJQeAVPBjFOh5D1JxFDd7ZSU3 wx07674c23af51b521 a2fd0d29b007cbbcf8c8dda8c693d99b diff --git a/epmet-auth/src/main/java/com/epmet/controller/PaUserLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java similarity index 53% rename from epmet-auth/src/main/java/com/epmet/controller/PaUserLoginController.java rename to epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java index de8922bc18..9a48be046c 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/PaUserLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/PublicUserLoginController.java @@ -3,14 +3,15 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.PaWxCodeFormDTO; -import com.epmet.dto.result.UserTokenResultDTO; -import com.epmet.service.PaUserLoginService; +import com.epmet.service.PublicUserLoginService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.Map; + /** * 描述一下 * @@ -18,17 +19,24 @@ import org.springframework.web.bind.annotation.RestController; * @date 2020/7/8 18:29 */ @RestController -@RequestMapping("pa") -public class PaUserLoginController { +@RequestMapping("publicuser") +public class PublicUserLoginController { @Autowired - private PaUserLoginService paUserLoginService; + private PublicUserLoginService publicUserLoginService; - @PostMapping(value = "/loginbywxcode") - public Result loginByWxCode(@RequestBody PaWxCodeFormDTO formDTO) { + /** + * @return com.epmet.commons.tools.utils.Result + * @param formDTO + * @author yinzuomei + * @description 测试是否能正常解析wxcode + * @Date 2020/7/9 17:00 + **/ + @PostMapping(value = "/testwxcode") + public Result loginByWxCode(@RequestBody PaWxCodeFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, PaWxCodeFormDTO.AddUserInternalGroup.class); - UserTokenResultDTO userTokenResultDTO=paUserLoginService.loginByWxCode(formDTO); - return new Result().ok(userTokenResultDTO); + Map map = publicUserLoginService.loginByWxCode(formDTO); + return new Result().ok(map); } } diff --git a/epmet-auth/src/main/java/com/epmet/service/PaUserLoginService.java b/epmet-auth/src/main/java/com/epmet/service/PublicUserLoginService.java similarity index 51% rename from epmet-auth/src/main/java/com/epmet/service/PaUserLoginService.java rename to epmet-auth/src/main/java/com/epmet/service/PublicUserLoginService.java index bf64bbcb27..20091381c0 100644 --- a/epmet-auth/src/main/java/com/epmet/service/PaUserLoginService.java +++ b/epmet-auth/src/main/java/com/epmet/service/PublicUserLoginService.java @@ -1,7 +1,8 @@ package com.epmet.service; import com.epmet.dto.form.PaWxCodeFormDTO; -import com.epmet.dto.result.UserTokenResultDTO; + +import java.util.Map; /** * 描述一下 @@ -9,6 +10,6 @@ import com.epmet.dto.result.UserTokenResultDTO; * @author yinzuomei@elink-cn.com * @date 2020/7/8 18:31 */ -public interface PaUserLoginService { - UserTokenResultDTO loginByWxCode(PaWxCodeFormDTO formDTO); +public interface PublicUserLoginService { + Map loginByWxCode(PaWxCodeFormDTO formDTO); } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PaUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java similarity index 80% rename from epmet-auth/src/main/java/com/epmet/service/impl/PaUserLoginServiceImpl.java rename to epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java index 4f24e8ea82..580e582888 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/PaUserLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java @@ -2,8 +2,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.exception.RenException; import com.epmet.dto.form.PaWxCodeFormDTO; -import com.epmet.dto.result.UserTokenResultDTO; -import com.epmet.service.PaUserLoginService; +import com.epmet.service.PublicUserLoginService; import me.chanjar.weixin.common.error.WxErrorException; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.bean.result.WxMpOAuth2AccessToken; @@ -14,6 +13,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; + /** * 描述一下 * @@ -21,16 +23,18 @@ import org.springframework.stereotype.Service; * @date 2020/7/8 18:31 */ @Service -public class PaUserLoginServiceImpl implements PaUserLoginService { - private static final Logger logger = LoggerFactory.getLogger(PaUserLoginServiceImpl.class); +public class PublicUserLoginServiceImpl implements PublicUserLoginService { + private static final Logger logger = LoggerFactory.getLogger(PublicUserLoginServiceImpl.class); @Autowired private WxMpService wxMpService; @Override - public UserTokenResultDTO loginByWxCode(PaWxCodeFormDTO formDTO) { + public Map loginByWxCode(PaWxCodeFormDTO formDTO) { WxMpUser wxMpUser=this.getWxMpUser(formDTO.getWxCode()); - return null; + Map map =new HashMap(); + map.put("微信用户信息",wxMpUser); + return map; } private WxMpUser getWxMpUser(String wxCode) {