fix:谷歌登录

src/main/java/cn/com/poc/user/builder/GoogleLoginChannel.java

@@ -72,7 +72,7 @@ public class GoogleLoginChannel implements LoginChannelService {
             MemberInfoEntity result = bizMemberInfoService.getMemberEntityByAccount(email);
             if (result == null) {
                 CheckMemberInfoQueryCondition condition = new CheckMemberInfoQueryCondition();
-                condition.setEmail(memberLoginRequest.getAccount());
+                condition.setEmail(email);
                 List<CheckMemberInfoQueryItem> checkMemberInfoQueryItems = bizMemberInfoService.checkMemberInfoIsExist(condition);
                 if (CollectionUtils.isEmpty(checkMemberInfoQueryItems)) {//用户没有注册过 需要注册
                     result = register(email, name, pictureUrl);

src/test/java/cn/com/poc/user/builder/LoginChannelTest.java

@@ -125,7 +125,7 @@ public class LoginChannelTest {
 
     @Test
     public void testGoogleLogin_idTokenVerify() throws GeneralSecurityException, IOException {
-        String idTokenString = "eyJhbGciOiJSUzI1NiIsImtpZCI6ImFiODYxNGZmNjI4OTNiYWRjZTVhYTc5YTc3MDNiNTk2NjY1ZDI0NzgiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI2OTg3NzQ5NTc0NjEtYjNzMWw5OG03cWp2NWlscGh2bG81N2dqaGJzN2ZuZm0uYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI2OTg3NzQ5NTc0NjEtYjNzMWw5OG03cWp2NWlscGh2bG81N2dqaGJzN2ZuZm0uYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMTY0NTU4OTc5OTYyNzQ1NDk4MjEiLCJlbWFpbCI6InRlcnJ5bGFud0BnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwibmJmIjoxNzM1Mjc5OTM3LCJuYW1lIjoidGVycnkgbGFuIiwicGljdHVyZSI6Imh0dHBzOi8vbGgzLmdvb2dsZXVzZXJjb250ZW50LmNvbS9hL0FDZzhvY0p2azFpOEFYZkJza3Q5d3JzamJNdVZDOHhqWlJ3NXVFWlE5elFveXJRWVFZUUJaQT1zOTYtYyIsImdpdmVuX25hbWUiOiJ0ZXJyeSIsImZhbWlseV9uYW1lIjoibGFuIiwiaWF0IjoxNzM1MjgwMjM3LCJleHAiOjE3MzUyODM4MzcsImp0aSI6IjlkZDAyYTJmNzc2ZjA0NjkxYmFkY2JiZDg5ZDRmNThiZmMxZWM3NzcifQ.ccc5cHGceXaqOmt6l3itLHmysA2SDoNWQ-s-fUs6fLnViToxyheyayuIzVSntfxtplRcrTuTXNnKrGp_EjIHUT0RKb4NyaDNpCeIXYXOjJaphArkUXNDUPodDxbPuCWZZ5D2b1cm2IzTtw-44Z4bj7PBN-5q00cEtXujlAb4QidAnOyOMibY2R7nU1P5qs7jL2zgdoyn1jG4Xoo2kg12uxeX0IhWp0Y_WwBPMpndtmg-NZm-Av1rVNEeR_82nTWsGBVKdtwwycVCMoK4p0D_J7KNGqz_dXwGxCwde0rIDp5XuJYhorp6dQUFirG0-sE9wcoiTiYuxvaf_3OkT0V9ew";
+        String idTokenString = "eyJhbGciOiJSUzI1NiIsImtpZCI6ImFiODYxNGZmNjI4OTNiYWRjZTVhYTc5YTc3MDNiNTk2NjY1ZDI0NzgiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI4Njc5ODUwMTY3NTktbjlxajAwazE3NG45YmlicnRycW5ndnQ4OXZibW5qcnAuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI4Njc5ODUwMTY3NTktbjlxajAwazE3NG45YmlicnRycW5ndnQ4OXZibW5qcnAuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMDQwNzE2MTExMDgxOTEzMDA4NTAiLCJlbWFpbCI6Inlhb3NoYW5nanVuMjRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsIm5iZiI6MTczNTUyNTYzMCwibmFtZSI6InNoYW5nanVuIHlhbyIsInBpY3R1cmUiOiJodHRwczovL2xoMy5nb29nbGV1c2VyY29udGVudC5jb20vYS9BQ2c4b2NKYmNzdWs0bFkxYzludm43cHlvWVZxUlp5YkdOQkVkT3JEeTZqNDBETzVYNER6OS1nPXM5Ni1jIiwiZ2l2ZW5fbmFtZSI6InNoYW5nanVuIiwiZmFtaWx5X25hbWUiOiJ5YW8iLCJpYXQiOjE3MzU1MjU5MzAsImV4cCI6MTczNTUyOTUzMCwianRpIjoiNGU1MTM3OGYwZTA3NjcyY2NlYWYxNmQxNTM2MGFkZTA5MWFjZDNiMSJ9.RRzy_Q6UkCSHtQfC8UkWEeVa58ouwqpSIaaP7cMZdOdzRHqtAEk055PcravyfxPQBakCxkskXjYdBtErSitOBvbCNnc3lWGjUZu4D2jqCJDfbkMPMatOW5i56VhCr9_hnN4LHtfEIaOotYijf2U1cjSMGqXxYf6aSfHLzHAfYJFkaac9fvdHKWqgPk5VnrWedPW49UZYTAAxQM-L4357RNnguTZzKqDngf3fhSF-66tkFDKrLbuGv595INA_vPUftPUUJby-2mXhV04feoTfehWwsbCfex98q24G0bKonF3tspnlhtP_10umDt3fmKQJTPXgySJFygkNqN5VZJ9E0Q";
         String CLIENT_ID = Config.get("google.client.id");
         HttpTransport transport = new ApacheHttpTransport();
         JsonFactory jsonFactory = new GsonFactory();
@@ -133,9 +133,20 @@ public class LoginChannelTest {
         builder.setPublicCertsEncodedUrl("https://google-api.gsstcloud.com/oauth2/v1/certs");
         GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(builder.build())
                 .setAudience(Collections.singletonList(CLIENT_ID))
+                .setIssuer("https://accounts.google.com")
                 .build();
         GoogleIdToken idToken = verifier.verify(idTokenString);
         System.out.println(idToken);
 
     }
+
+    @Resource
+    private GoogleLoginChannel googleLoginChannel;
+
+    @Test
+    public void testGoogleLogin() throws Exception {
+        MemberLoginRequestDto memberLoginRequest = new MemberLoginRequestDto();
+        memberLoginRequest.setAuthCode("eyJhbGciOiJSUzI1NiIsImtpZCI6ImFiODYxNGZmNjI4OTNiYWRjZTVhYTc5YTc3MDNiNTk2NjY1ZDI0NzgiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI4Njc5ODUwMTY3NTktbjlxajAwazE3NG45YmlicnRycW5ndnQ4OXZibW5qcnAuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI4Njc5ODUwMTY3NTktbjlxajAwazE3NG45YmlicnRycW5ndnQ4OXZibW5qcnAuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMDQwNzE2MTExMDgxOTEzMDA4NTAiLCJlbWFpbCI6Inlhb3NoYW5nanVuMjRAZ21haWwuY29tIiwiZW1haWxfdmVyaWZpZWQiOnRydWUsIm5iZiI6MTczNTUyNTYzMCwibmFtZSI6InNoYW5nanVuIHlhbyIsInBpY3R1cmUiOiJodHRwczovL2xoMy5nb29nbGV1c2VyY29udGVudC5jb20vYS9BQ2c4b2NKYmNzdWs0bFkxYzludm43cHlvWVZxUlp5YkdOQkVkT3JEeTZqNDBETzVYNER6OS1nPXM5Ni1jIiwiZ2l2ZW5fbmFtZSI6InNoYW5nanVuIiwiZmFtaWx5X25hbWUiOiJ5YW8iLCJpYXQiOjE3MzU1MjU5MzAsImV4cCI6MTczNTUyOTUzMCwianRpIjoiNGU1MTM3OGYwZTA3NjcyY2NlYWYxNmQxNTM2MGFkZTA5MWFjZDNiMSJ9.RRzy_Q6UkCSHtQfC8UkWEeVa58ouwqpSIaaP7cMZdOdzRHqtAEk055PcravyfxPQBakCxkskXjYdBtErSitOBvbCNnc3lWGjUZu4D2jqCJDfbkMPMatOW5i56VhCr9_hnN4LHtfEIaOotYijf2U1cjSMGqXxYf6aSfHLzHAfYJFkaac9fvdHKWqgPk5VnrWedPW49UZYTAAxQM-L4357RNnguTZzKqDngf3fhSF-66tkFDKrLbuGv595INA_vPUftPUUJby-2mXhV04feoTfehWwsbCfex98q24G0bKonF3tspnlhtP_10umDt3fmKQJTPXgySJFygkNqN5VZJ9E0Q");
+        googleLoginChannel.doLogin(memberLoginRequest);
+    }
 }