feat: Add Google login

hichina-main-back/build.gradle

@@ -19,7 +19,6 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-data-redis
 	implementation 'org.springframework.boot:spring-boot-starter-data-redis:3.0.0'
 	implementation 'org.projectlombok:lombok:1.18.20'
-	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	// https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-security
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
@@ -68,6 +67,15 @@ dependencies {
 	// https://mvnrepository.com/artifact/org.jsoup/jsoup
 	implementation 'org.jsoup:jsoup:1.16.1'
 
+	implementation 'com.google.api-client:google-api-client:2.0.0'
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testImplementation 'org.springframework.security:spring-security-test'
+	testImplementation 'de.flapdoodle.embed:de.flapdoodle.embed.mongo.spring3x:4.12.2'
+	testImplementation 'com.h2database:h2'
+	testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.1'
+	testImplementation 'org.liquibase:liquibase-core:4.19.0'
 }
 
 tasks.named('test') {

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/auth/AuthType.java

@@ -0,0 +1,18 @@
+package com.hichina.main.back.hichinamainback.auth;
+
+public enum AuthType {
+    REGULAR("regular"),
+    FACEBOOK("facebook"),
+    GOOGLE("google");
+
+
+    private final String type;
+
+    AuthType(String type) {
+        this.type = type;
+    }
+
+    public String getType() {
+        return type;
+    }
+}

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/auth/AuthUserInfo.java

@@ -0,0 +1,20 @@
+package com.hichina.main.back.hichinamainback.auth;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AuthUserInfo {
+
+    private String userId;
+
+    private String username;
+
+    private String email;
+
+    private String profileImageUrl;
+
+}

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/auth/GoogleAuthenticator.java

@@ -0,0 +1,64 @@
+package com.hichina.main.back.hichinamainback.auth;
+
+import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
+import com.google.api.client.googleapis.auth.oauth2.GoogleIdTokenVerifier;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
+import com.hichina.main.back.hichinamainback.utils.ProxyUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.authentication.InternalAuthenticationServiceException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.stereotype.Component;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.Collections;
+
+@Component
+public class GoogleAuthenticator {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(GoogleAuthenticator.class);
+
+    static {
+        System.setProperty("https.protocols", "TLSv1.2");
+    }
+
+    @Value("${google.authenticator.clientId}")
+    private String clientId;
+
+    public AuthUserInfo verify(String token) throws AuthenticationException {
+
+        GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(
+                new NetHttpTransport.Builder().setProxy(ProxyUtils.defaultProxy()).build(),
+                new GsonFactory())
+                // Specify the CLIENT_ID of the app that accesses the backend:
+                .setAudience(Collections.singletonList(clientId))
+                .build();
+
+        try {
+            GoogleIdToken idToken = verifier.verify(token);
+            if (idToken != null) {
+                GoogleIdToken.Payload payload = idToken.getPayload();
+
+                String userId = payload.getSubject();
+
+                // Get profile information from payload
+                String email = payload.getEmail();
+                String name = (String) payload.get("name");
+                String pictureUrl = (String) payload.get("picture");
+
+                return new AuthUserInfo(userId, name, email, pictureUrl);
+            } else {
+                LOGGER.error("Invalid Google ID token: {}", token);
+                throw new BadCredentialsException("Invalid ID token.");
+            }
+        } catch (GeneralSecurityException | IOException e) {
+            LOGGER.error("Google auth internal Error: {}", e.getMessage(), e);
+            throw new InternalAuthenticationServiceException("Internal Error", e);
+        }
+    }
+
+}

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/config/CustomAuthenticationProvider.java

@@ -1,5 +1,7 @@
 package com.hichina.main.back.hichinamainback.config;
 
+import com.hichina.main.back.hichinamainback.auth.AuthType;
+import com.hichina.main.back.hichinamainback.auth.GoogleAuthenticator;
 import com.hichina.main.back.hichinamainback.mapper.UserMapper;
 import com.hichina.main.back.hichinamainback.model.User;
 import com.hichina.main.back.hichinamainback.utils.FacebookAccessTokenValidator;
@@ -32,6 +34,9 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
     @Autowired
     private FacebookAccessTokenValidator facebookAccessTokenValidator;
 
+    @Autowired
+    private GoogleAuthenticator googleAuthenticator;
+
 
     /**
      * the assumption for this method is, register already happens for this user, otherwise login fails
@@ -116,7 +121,13 @@ public class CustomAuthenticationProvider implements AuthenticationProvider {
             }
         }else if(Constants.FACEBOOK_LOGIN.equals(loginType)){
             return facebookAccessTokenValidator.validateAccessToken(password);
-        }else{
+        } else if (AuthType.GOOGLE.getType().equals(loginType)) {
+            try {
+                return googleAuthenticator.verify(password) != null;
+            } catch (Exception e) {
+                return false;
+            }
+        } else{
             return false;
         }
     }

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/controller/PublicLoginController.java

@@ -1,26 +1,33 @@
 package com.hichina.main.back.hichinamainback.controller;
 
-import com.google.gson.JsonObject;
-import com.hichina.main.back.hichinamainback.config.Constants;
+import com.hichina.main.back.hichinamainback.auth.AuthType;
+import com.hichina.main.back.hichinamainback.auth.AuthUserInfo;
+import com.hichina.main.back.hichinamainback.auth.GoogleAuthenticator;
 import com.hichina.main.back.hichinamainback.config.CustomAuthenticationProvider;
 import com.hichina.main.back.hichinamainback.mapper.UserMapper;
-import com.hichina.main.back.hichinamainback.model.DTO.HichinaResponse;
-import com.hichina.main.back.hichinamainback.model.DTO.PreregisterFacebookReqDTO;
-import com.hichina.main.back.hichinamainback.model.DTO.UpdateLoginTypeRequestDTO;
+import com.hichina.main.back.hichinamainback.model.DTO.*;
 import com.hichina.main.back.hichinamainback.model.User;
 import com.hichina.main.back.hichinamainback.utils.FacebookAccessTokenValidator;
 import com.hichina.main.back.hichinamainback.utils.HttpUtils;
 import com.hichina.main.back.hichinamainback.utils.UserUtil;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.Valid;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
+import java.util.function.Consumer;
 
 @RestController
 @RequestMapping("/api/public/login")
 public class PublicLoginController {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(PublicLoginController.class);
+
     private static final String GRAPH_API_URL = "https://graph.facebook.com/v14.0/me?access_token=";
 
     @Autowired
@@ -29,19 +36,27 @@ public class PublicLoginController {
     @Autowired
     private FacebookAccessTokenValidator facebookAccessTokenValidator;
 
+    @Autowired
+    private GoogleAuthenticator googleAuthenticator;
+
 
     @Autowired
     private Environment env;
 
     @PostMapping("/prereg-facebook")
-    public HichinaResponse preRegisterFacebook(@RequestBody PreregisterFacebookReqDTO request){
+    public HichinaResponse preRegisterFacebook(@RequestBody PreregisterFacebookReqDTO request) {
         HichinaResponse ret = new HichinaResponse();
-        if(facebookAccessTokenValidator.validateAccessToken(request.getAccessToken())){
+        if (facebookAccessTokenValidator.validateAccessToken(request.getAccessToken())) {
             // if already exist, just update some property, otherwise, register one and set corresponding login type to facebook
-            generateOrUpdateUser(request.getFacebookId(), request.getName(), request.getEmail(), request.getProfileImageUrl());
+            generateOrUpdateUser(request.getEmail(), (user -> {
+                user.setFacebookId(request.getFacebookId());
+                user.setUsername(request.getName());
+                user.setProfileImageUrl(request.getProfileImageUrl());
+                user.setLoginType(AuthType.FACEBOOK.getType());
+            }));
             ret.setOk(true);
             ret.setMessage("Succeed pre register or update facebook user");
-        }else{
+        } else {
             ret.setOk(false);
             ret.setMessage("Access token not valid for facebook login");
         }
@@ -49,13 +64,13 @@ public class PublicLoginController {
     }
 
     @PutMapping("/type")
-    public HichinaResponse updateLoginType(@RequestBody UpdateLoginTypeRequestDTO request){
+    public HichinaResponse updateLoginType(@RequestBody UpdateLoginTypeRequestDTO request) {
         HichinaResponse ret = new HichinaResponse();
         User user = UserUtil.getUserByEmail(userMapper, request.getEmail());
-        if(user==null){
+        if (user == null) {
             ret.setOk(false);
             ret.setMessage(String.format("User does not exist for email: %s", request.getEmail()));
-        }else{
+        } else {
             user.setLoginType(request.getLoginType());
             userMapper.update(user);
             ret.setOk(true);
@@ -64,28 +79,46 @@ public class PublicLoginController {
         return ret;
     }
 
-    private User generateOrUpdateUser(String fbId, String name, String email, String profileImageUrl){
+    @PostMapping("/google")
+    public ResponseEntity<HiChinaResult<AuthResultDTO>> googleAuth(HttpServletRequest request) {
+        String idToken = HttpUtils.parseBearerToken(request);
+        if (idToken == null) {
+            return ResponseEntity.badRequest().body(HiChinaResult.error("Invalid token"));
+        }
+
+        try {
+            AuthUserInfo authUserInfo = googleAuthenticator.verify(idToken);
+            String email = authUserInfo.getEmail();
+            generateOrUpdateUser(email, (user -> {
+                user.setGoogleId(authUserInfo.getUserId());
+                user.setUsername(authUserInfo.getUsername());
+                user.setProfileImageUrl(authUserInfo.getProfileImageUrl());
+                user.setLoginType(AuthType.GOOGLE.getType());
+            }));
+
+            return ResponseEntity.ok(HiChinaResult.ok(AuthResultDTO.of(authUserInfo.getEmail())));
+        } catch (Exception e) {
+            LOGGER.error("google auth failed: {}", e.getMessage(), e);
+            return ResponseEntity.badRequest().body(HiChinaResult.error("Google auth failed"));
+        }
+
+    }
+
+    private User generateOrUpdateUser(String email, Consumer<User> userSetter) {
         User user = UserUtil.getUserByEmail(userMapper, email);
-        if(user==null){
+        if (user == null) {
             //register new user
             user = new User();
             user.setCreatedTime(new Date());
             user.setSalt(CustomAuthenticationProvider.generateSalt());
-            user.setUsername(name);
             user.setPassword("");
             user.setEmail(email);
-            user.setFacebookId(fbId);
-            user.setProfileImageUrl(profileImageUrl);
             user.setPwdCode(-1);
             user.setUserId(java.util.UUID.randomUUID().toString());
-            user.setLoginType(Constants.FACEBOOK_LOGIN);
+            userSetter.accept(user);
             userMapper.insert(user);
-        }else{
-            // update user with facebook info
-            user.setFacebookId(fbId);
-            user.setUsername(name);
-            user.setProfileImageUrl(profileImageUrl);
-            user.setLoginType(Constants.FACEBOOK_LOGIN);
+        } else {
+            userSetter.accept(user);
             userMapper.update(user);
         }
         return user;

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/mapper/UserMapper.java

@@ -13,12 +13,12 @@ import java.util.List;
 @Component(value = "userMapper")
 public interface UserMapper {
 
-    @Select("select * from user where email=#{account}")
+    @Select("select * from `user` where email=#{account}")
     List<User> findByEmail(String account);
 
-    @Update("update user SET salt=#{salt},password=#{password},created_time=#{createdTime},email=#{email},facebook_id=#{facebookId},google_id=#{googleId},wx_id=#{wxId},phone=#{phone},username=#{username},gender=#{gender},birth_date=#{birthDate},nationality=#{nationality},license_type=#{licenseType},license_number=#{licenseNumber},license_sign_date=#{licenseSignDate},license_expire_date=#{licenseExpireDate},signature=#{signature},profile_image_url=#{profileImageUrl},passport_image_url=#{passportImageUrl},pwd_code=#{pwdCode},login_type=#{loginType} where user_id=#{userId}")
+    @Update("update `user` SET salt=#{salt},password=#{password},created_time=#{createdTime},email=#{email},facebook_id=#{facebookId},google_id=#{googleId},wx_id=#{wxId},phone=#{phone},username=#{username},gender=#{gender},birth_date=#{birthDate},nationality=#{nationality},license_type=#{licenseType},license_number=#{licenseNumber},license_sign_date=#{licenseSignDate},license_expire_date=#{licenseExpireDate},signature=#{signature},profile_image_url=#{profileImageUrl},passport_image_url=#{passportImageUrl},pwd_code=#{pwdCode},login_type=#{loginType} where user_id=#{userId}")
     void update(User user);
 
-    @Insert("insert into user(user_id, salt, password, created_time, email, facebook_id, google_id, wx_id, phone, username, gender, birth_date, nationality, license_type, license_number, license_sign_date, license_expire_date, signature, profile_image_url, passport_image_url, pwd_code, login_type) VALUES(#{userId}, #{salt}, #{password}, #{createdTime}, #{email}, #{facebookId}, #{googleId}, #{wxId}, #{phone}, #{username}, #{gender}, #{birthDate}, #{nationality}, #{licenseType}, #{licenseNumber}, #{licenseSignDate}, #{licenseExpireDate}, #{signature}, #{profileImageUrl}, #{passportImageUrl}, #{pwdCode}, #{loginType})")
+    @Insert("insert into `user`(user_id, salt, password, created_time, email, facebook_id, google_id, wx_id, phone, username, gender, birth_date, nationality, license_type, license_number, license_sign_date, license_expire_date, signature, profile_image_url, passport_image_url, pwd_code, login_type) VALUES(#{userId}, #{salt}, #{password}, #{createdTime}, #{email}, #{facebookId}, #{googleId}, #{wxId}, #{phone}, #{username}, #{gender}, #{birthDate}, #{nationality}, #{licenseType}, #{licenseNumber}, #{licenseSignDate}, #{licenseExpireDate}, #{signature}, #{profileImageUrl}, #{passportImageUrl}, #{pwdCode}, #{loginType})")
     void insert(User user);
 }

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/model/DTO/AuthResultDTO.java

@@ -0,0 +1,18 @@
+package com.hichina.main.back.hichinamainback.model.DTO;
+
+import lombok.Data;
+
+/**
+ * 第三方登录验证结果
+ */
+@Data
+public class AuthResultDTO {
+
+    private String email;
+
+    public static AuthResultDTO of(String email) {
+        AuthResultDTO ret = new AuthResultDTO();
+        ret.setEmail(email);
+        return ret;
+    }
+}

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/model/DTO/HiChinaResult.java

@@ -0,0 +1,45 @@
+package com.hichina.main.back.hichinamainback.model.DTO;
+
+import lombok.Data;
+
+@Data
+public class HiChinaResult<T> {
+
+    private boolean ok;
+
+    private String message;
+
+    private T data;
+
+    public static <T> HiChinaResult<T> ok(T data) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = true;
+        result.message = "ok";
+        result.data = data;
+        return result;
+    }
+
+    public static <T> HiChinaResult<T> ok(String message, T data) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = true;
+        result.message = message;
+        result.data = data;
+        return result;
+    }
+
+    public static <T> HiChinaResult<T> error(String message) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = false;
+        result.message = message;
+        result.data = null;
+        return result;
+    }
+
+    public static <T> HiChinaResult<T> error(String message, T data) {
+        HiChinaResult<T> result = new HiChinaResult<>();
+        result.ok = false;
+        result.message = message;
+        result.data = data;
+        return result;
+    }
+}

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/utils/HttpUtils.java

@@ -2,6 +2,7 @@ package com.hichina.main.back.hichinamainback.utils;
 
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import jakarta.servlet.http.HttpServletRequest;
 import okhttp3.*;
 import org.apache.http.client.ClientProtocolException;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -20,6 +21,7 @@ import org.apache.http.ssl.SSLContexts;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -29,14 +31,18 @@ import java.util.Map;
 public class HttpUtils {
     private static final Logger LOG = LoggerFactory.getLogger(HttpUtils.class);
 
+    private static final String TOKEN_HEADER = "Authorization";
+    private static final String TOKEN_PREFIX = "Bearer ";
+
     /**
      * this is the tricky code with socks 5 proxy, can use as a template
+     *
      * @param url
      * @param proxyHost
      * @param proxyPort
      * @return
      */
-    public static JsonObject sendToWithProxyV2(String url, String proxyHost, Integer proxyPort){
+    public static JsonObject sendToWithProxyV2(String url, String proxyHost, Integer proxyPort) {
         InetSocketAddress proxyAddr = new InetSocketAddress(proxyHost, proxyPort);
         Proxy proxy = new Proxy(Proxy.Type.SOCKS, proxyAddr);
 
@@ -50,12 +56,12 @@ public class HttpUtils {
         Call call = client.newCall(request);
         try {
             Response response = call.execute();
-            LOG.info("===ok client response code: "+response.code());
+            LOG.info("===ok client response code: " + response.code());
             Gson gson = new Gson();
             JsonObject entity = gson.fromJson(response.body().string(), JsonObject.class);
             return entity;
         } catch (IOException e) {
-            LOG.error("===okclient exception: "+ e.getMessage());
+            LOG.error("===okclient exception: " + e.getMessage());
             return null;
         }
     }
@@ -107,12 +113,12 @@ public class HttpUtils {
         return input;
     }
 
-    public static JsonObject postUrlWithParams(String url, Map<String, String> params){
+    public static JsonObject postUrlWithParams(String url, Map<String, String> params) {
         System.setProperty("https.protocols", "TLSv1.2");
 
         FormBody.Builder builder = new FormBody.Builder();
 
-        for(String key : params.keySet()){
+        for (String key : params.keySet()) {
             builder.add(key, params.get(key));
         }
 
@@ -127,17 +133,17 @@ public class HttpUtils {
         Call call = client.newCall(request);
         try {
             Response response = call.execute();
-            LOG.info("===ok client response code with post: "+response.code());
+            LOG.info("===ok client response code with post: " + response.code());
             Gson gson = new Gson();
             JsonObject entity = gson.fromJson(response.body().string(), JsonObject.class);
             return entity;
         } catch (IOException e) {
-            LOG.error("===okclient exception in postUrlWithParams: "+ e.getMessage());
+            LOG.error("===okclient exception in postUrlWithParams: " + e.getMessage());
             return null;
         }
     }
 
-    public static JsonObject getUrlWithParams(String url, Map<String, String> params){
+    public static JsonObject getUrlWithParams(String url, Map<String, String> params) {
         System.setProperty("https.protocols", "TLSv1.2");
 
         url = getUrlWithQueryString(url, params);
@@ -151,12 +157,12 @@ public class HttpUtils {
         Call call = client.newCall(request);
         try {
             Response response = call.execute();
-            LOG.info("===ok client response code: "+response.code());
+            LOG.info("===ok client response code: " + response.code());
             Gson gson = new Gson();
             JsonObject entity = gson.fromJson(response.body().string(), JsonObject.class);
             return entity;
         } catch (IOException e) {
-            LOG.error("===okclient exception in getUrlWithParams: "+ e.getMessage());
+            LOG.error("===okclient exception in getUrlWithParams: " + e.getMessage());
             return null;
         }
     }
@@ -183,14 +189,14 @@ public class HttpUtils {
             } finally {
                 response.close();
             }
-        }catch (ClientProtocolException e) {
+        } catch (ClientProtocolException e) {
             LOG.error("===" + e.getMessage());
         } catch (IOException e) {
             LOG.error("===" + e.getMessage());
         } finally {
             httpclient.close();
         }
-            return null;
+        return null;
     }
 
     static class MyConnectionSocketFactory extends SSLConnectionSocketFactory {
@@ -207,4 +213,12 @@ public class HttpUtils {
             return new Socket(proxy);
         }
     }
+
+    public static String parseBearerToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader(TOKEN_HEADER);
+        if (bearerToken != null && bearerToken.startsWith(TOKEN_PREFIX)) {
+            return bearerToken.substring(TOKEN_PREFIX.length());
+        }
+        return null;
+    }
 }

hichina-main-back/src/main/java/com/hichina/main/back/hichinamainback/utils/ProxyUtils.java

@@ -0,0 +1,32 @@
+package com.hichina.main.back.hichinamainback.utils;
+
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+
+@Component
+public class ProxyUtils implements InitializingBean {
+
+    private static Proxy defaultProxy;
+
+    @Value("${gfw.proxy.host:127.0.0.1}")
+    private String proxyHost;
+
+    @Value("${gfw.proxy.port}")
+    private Integer proxyPort;
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+        InetSocketAddress proxyAddr = new InetSocketAddress(proxyHost, proxyPort);
+
+        defaultProxy = new Proxy(Proxy.Type.SOCKS, proxyAddr);
+    }
+
+    public static Proxy defaultProxy() {
+        return defaultProxy;
+    }
+
+}

hichina-main-back/src/main/resources/application-dev.properties

@@ -66,4 +66,6 @@ hichina.mail.host=smtp.qiye.aliyun.com
 gfw.proxy.port=1083
 
 baidu.appId=20171207000102933
-baidu.securityKey=wF1ETdaKHUUUijlmS7OA
+baidu.securityKey=wF1ETdaKHUUUijlmS7OA
+
+google.authenticator.clientId=711997598050-fpnvegbu297250l1shnuhqc64nchdl0d.apps.googleusercontent.com

hichina-main-back/src/main/resources/logback.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
-  <springProfile name="dev">
+  <springProfile name="dev, test">
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
       <!-- Log message format -->
       <encoder>

hichina-main-back/src/test/java/com/hichina/main/back/hichinamainback/controller/PublicLoginControllerTests.java

@@ -0,0 +1,86 @@
+package com.hichina.main.back.hichinamainback.controller;
+
+import com.hichina.main.back.hichinamainback.auth.AuthUserInfo;
+import com.hichina.main.back.hichinamainback.auth.GoogleAuthenticator;
+import com.hichina.main.back.hichinamainback.mapper.UserMapper;
+import com.hichina.main.back.hichinamainback.model.User;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+import org.mybatis.spring.boot.test.autoconfigure.AutoConfigureMybatis;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestComponent;
+import org.springframework.boot.test.context.TestConfiguration;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.http.MediaType;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.web.servlet.MockMvc;
+
+import java.util.List;
+
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@SpringBootTest
+@ActiveProfiles("test")
+@AutoConfigureMockMvc
+@AutoConfigureDataMongo
+@AutoConfigureMybatis
+public class PublicLoginControllerTests {
+
+    @MockBean
+    private GoogleAuthenticator googleAuthenticator;
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @Autowired
+    private UserMapper userMapper;
+
+    @Test
+    public void should_auth_google_user() throws Exception {
+        // given:
+        Mockito.when(googleAuthenticator.verify(Mockito.anyString()))
+                .thenReturn(new AuthUserInfo("xxx-yy", "test", "test@gmail.com", "https://example.com/pic.jpg"));
+
+        // when
+        mockMvc.perform(post("/api/public/login/google")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content("{\"accessToken\":\"fasfnen2e2rt\"}"))
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.ok").value(true))
+                .andExpect(jsonPath("$.data.email").value("test@gmail.com"));
+
+        // then:
+        List<User> userList = userMapper.findByEmail("test@gmail.com");
+        Assertions.assertEquals(1, userList.size());
+
+        User user = userList.get(0);
+        Assertions.assertEquals("xxx-yy", user.getGoogleId());
+        Assertions.assertEquals("test", user.getUsername());
+        Assertions.assertEquals("https://example.com/pic.jpg", user.getProfileImageUrl());
+        Assertions.assertEquals(-1, user.getPwdCode());
+    }
+
+    @Test
+    public void should_not_auth_google_user_if_access_token_invalid() throws Exception {
+
+        // given:
+        Mockito.when(googleAuthenticator.verify(Mockito.anyString())).thenThrow(new BadCredentialsException(""));
+
+        // when
+        mockMvc.perform(post("/api/public/login/google")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content("{\"accessToken\":\"fasfnen2e2rt\"}"))
+                .andExpect(status().isBadRequest())
+                .andExpect(jsonPath("$.ok").value(true));
+    }
+
+
+}

hichina-main-back/src/test/resources/application-test.yaml

@@ -0,0 +1,119 @@
+spring:
+  jackson:
+    date-format: yyyy-MM-dd HH:mm:ss
+    time-zone: Asia/Shanghai
+  servlet:
+    multipart:
+      max-file-size: 13MB
+      max-request-size: 13MB
+  datasource:
+    url: jdbc:h2:mem:db;DB_CLOSE_DELAY=-1;MODE=Mysql;IGNORECASE=TRUE;DATABASE_TO_UPPER=FALSE
+    username: root
+    password: Passw0rd
+    driver-class-name: org.h2.Driver
+    tomcat:
+      max-wait: 20000
+      max-active: 50
+      max-idle: 20
+      min-idle: 15
+  liquibase:
+    # change-log file db/changelog/liquibase-changeLog.xml has problems,
+    # so if db change, we need generate changelog from db for refresh version
+    change-log: classpath:liquibase-changeLog.xml
+    enabled: true
+    drop-first: false
+  data:
+    mongodb:
+      uri: mongodb://localhost:27017/unified_hichina
+      database: unified_hichina
+    redis:
+      database: 0
+      host: 127.0.0.1
+      port: 6379
+      password: c68d47c3
+      connect-timeout: 30000ms
+      lettuce:
+        pool:
+          min-idle: 0
+          max-active: 8
+          max-idle: 8
+          max-wait: -1ms
+
+de:
+  flapdoodle:
+    mongodb:
+      embedded:
+        version: 4.0.2
+
+aliyun:
+  blog:
+    bucket: newblogimages
+  oss:
+    endpoint:
+      domain: oss-cn-nanjing.aliyuncs.com
+    root:
+      access:
+        key:
+          secret: OtmgF0YE74gVSa2TFcQsoWa6RujSgb
+          id: LTAI5tHiFqvcRHbZYcKZ7Ksm
+
+mybatis:
+  configuration:
+    map-underscore-to-camel-case: true
+
+frontend:
+  url: http://localhost:9053
+  mobilefirst:
+    url: http://localhost:9583
+backend:
+  servicebase:
+    url: http://localhost:9052
+
+logging:
+  level:
+    org:
+      springframework:
+        web: DEBUG
+      hibernate: ERROR
+
+alipay:
+  api:
+    url: https://openapi.alipaydev.com/gateway.do
+  return:
+    url: http://localhost:9053/finishpay
+  notify:
+    url: http://localhost:9053/api/public/pay/alipaycallback
+  public:
+    key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuF5cY/o6Ay7dOjjKKwHnzBmOk3PIvv0CsBYlgdV0jk3hVIhSLDzaYkGeeGxZn+uysnva30jv/NWimJefAP75GQxJ3SUfsyYcJDMwruf9dK+UuO7RRBcY3e72KiCwvJEiFpTFMtcnWFaNbjNQcGA3AzJc8j8SrPRatLVPBUuMB4LIhvwuMecwWBft0Dl7xBmxgT67TZWklh3ub074rYPXt6mRz12ibWMq+1jA4mtkbQ1n4gfF8L+YRJbMRCTfNLWCdJNmX4WOiLGwiyoJ17QQ1McKawWdhyLPnGyVckhTMxFz8DjMWHxqrqC7YEvOwkLpk6Abu/udi3fdOt2szboywQIDAQAB
+  appid: 2021000122682568
+  private:
+    key: none
+
+wechatpay:
+  appId: wx1204cecf3665f841
+  mchId: 1485417932
+  apiKey: TLpPDQHDBX7gfkEpUjWBFVXrasNI9U4t
+  certPath: /Users/xiefengchang/Movies/do_not_delete/1485417932_20230426_cert/apiclient_cert.pem
+  privateKeyPath: /Users/xiefengchang/Movies/do_not_delete/1485417932_20230426_cert/apiclient_key.pem
+  certSerialNo: 42B9A7C72CD775DFCE2EA7E2A5130770C0604954
+  notify:
+    url: http://localhost:9053/api/public/pay/wechatpaycallback
+
+hichina:
+  email:
+    sender: register@hichinatrip.com
+    authcode: none
+  mail:
+    host: smtp.qiye.aliyun.com
+
+gfw:
+  proxy:
+    port: 1083
+
+baidu:
+  appId: 20171207000102933
+  securityKey: wF1ETdaKHUUUijlmS7OA
+
+google:
+  authenticator:
+    clientId: fpnvegbu297250l1shnuhqc64nchdl0d.apps.googleusercontent.com

hichina-main-back/src/test/resources/liquibase-changeLog.xml

@@ -0,0 +1,420 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="dsm (generated)" id="1710759291530-1">
+        <createTable tableName="admin_user">
+            <column name="username" type="VARCHAR(100)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="password" type="VARCHAR(100)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_time" type="timestamp"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-2">
+        <createTable tableName="blog">
+            <column name="blog_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_time" type="timestamp"/>
+            <column name="last_update_time" type="timestamp"/>
+            <column name="title" type="VARCHAR(200)"/>
+            <column name="head_image_url" type="VARCHAR(500)"/>
+            <column name="language" type="VARCHAR(50)"/>
+            <column name="content" type="LONGTEXT"/>
+            <column defaultValue="0" name="draft" type="BIT(1)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-3">
+        <createTable tableName="comment">
+            <column name="comment_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="blog_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_time" type="timestamp"/>
+            <column name="respond_to" type="VARCHAR(50)"/>
+            <column name="comment_content" type="TEXT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-4">
+        <createTable tableName="destination">
+            <column name="destination_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="destination_name" type="VARCHAR(500)"/>
+            <column name="level" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="parent_id" type="VARCHAR(50)"/>
+            <column name="description" type="TEXT"/>
+            <column name="created_date" type="timestamp"/>
+            <column name="destination_profile_image" type="VARCHAR(500)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-5">
+        <createTable tableName="guidebook">
+            <column name="guide_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="download_url" type="VARCHAR(500)"/>
+            <column name="cover_image_url" type="VARCHAR(500)"/>
+            <column name="short_description" type="VARCHAR(300)"/>
+            <column name="destination_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-6">
+        <createTable tableName="hichina_line">
+            <column autoIncrement="true" name="id" type="BIGINT">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="public_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="name" type="VARCHAR(300)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+            <column name="icon_path" type="VARCHAR(300)"/>
+            <column name="range_in_days" type="INT"/>
+            <column name="base_price" type="FLOAT(12)"/>
+            <column name="description" type="TEXT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-7">
+        <createTable tableName="hichina_product">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="sku_group_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="product_name" type="VARCHAR(500)"/>
+            <column name="product_content" type="TEXT"/>
+            <column name="created_time" type="timestamp"/>
+            <column name="created_by" type="VARCHAR(100)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-8">
+        <createTable tableName="hichina_product_type">
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="product_type_name" type="VARCHAR(50)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="product_type_description" type="VARCHAR(100)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-9">
+        <createTable tableName="order">
+            <column name="order_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="product_sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_time" type="timestamp">
+                <constraints nullable="false"/>
+            </column>
+            <column name="last_update_time" type="timestamp"/>
+            <column name="meta" type="TEXT"/>
+            <column name="status" type="VARCHAR(50)"/>
+            <column name="paying_info" type="VARCHAR(500)"/>
+            <column name="price" type="INT"/>
+            <column name="remark" type="VARCHAR(500)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-10">
+        <createTable tableName="product_attribute">
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="attribute_name" type="VARCHAR(50)">
+                <constraints nullable="false" unique="true"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-11">
+        <createTable tableName="product_sku_group">
+            <column name="sku_group_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="sku_group_name" type="VARCHAR(500)"/>
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="timestamp"/>
+            <column defaultValue="0" name="enabled" type="BIT(1)"/>
+            <column name="image_url" type="VARCHAR(500)"/>
+            <column name="min_price" type="INT"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-12">
+        <createTable tableName="product_sku_group_destination_mapping">
+            <column name="product_sku_group_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="destination_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-13">
+        <createTable tableName="product_sku_int_attribute_mapping">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)"/>
+            <column name="attribute_value" type="INT"/>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-14">
+        <createTable tableName="product_sku_timestamp_attribute_mapping">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)"/>
+            <column name="attribute_value" type="timestamp"/>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-15">
+        <createTable tableName="product_sku_varchar_attribute_mapping">
+            <column name="sku_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="data_type" type="VARCHAR(20)"/>
+            <column name="attribute_value" type="TEXT"/>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-16">
+        <createTable tableName="product_type_attribute_mapping">
+            <column name="product_type_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="attribute_id" type="VARCHAR(50)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="sequence" type="BIGINT">
+                <constraints nullable="false"/>
+            </column>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-17">
+        <createTable tableName="user">
+            <column name="user_id" type="VARCHAR(50)">
+                <constraints nullable="false" primaryKey="true"/>
+            </column>
+            <column name="salt" type="VARCHAR(100)">
+                <constraints nullable="false"/>
+            </column>
+            <column name="password" type="VARCHAR(500)">
+                <constraints nullable="false"/>
+            </column>
+            <column defaultValueComputed="CURRENT_TIMESTAMP" name="created_time" type="timestamp">
+                <constraints nullable="false"/>
+            </column>
+            <column name="email" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="facebook_id" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="google_id" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="wx_id" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="phone" type="VARCHAR(100)">
+                <constraints unique="true"/>
+            </column>
+            <column name="username" type="VARCHAR(100)"/>
+            <column name="gender" type="INT"/>
+            <column name="birth_date" type="timestamp"/>
+            <column name="nationality" type="VARCHAR(100)"/>
+            <column name="license_type" type="VARCHAR(50)"/>
+            <column name="license_number" type="VARCHAR(100)"/>
+            <column name="license_sign_date" type="timestamp"/>
+            <column name="license_expire_date" type="timestamp"/>
+            <column name="signature" type="VARCHAR(200)"/>
+            <column name="profile_image_url" type="VARCHAR(500)"/>
+            <column name="passport_image_url" type="VARCHAR(500)"/>
+            <column name="pwd_code" type="INT"/>
+            <column name="login_type" type="VARCHAR(100)"/>
+        </createTable>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-18">
+        <addUniqueConstraint columnNames="guide_id, destination_id" constraintName="guidebookanddestinationoneonemapping" tableName="guidebook"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-19">
+        <addUniqueConstraint columnNames="product_type_id, attribute_id" constraintName="product_type_attribute_binding_unique" tableName="product_type_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-20">
+        <addUniqueConstraint columnNames="sku_id, attribute_id" constraintName="sku_id_single_attribute_int_value" tableName="product_sku_int_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-21">
+        <addUniqueConstraint columnNames="sku_id, attribute_id" constraintName="sku_id_single_attribute_timestamp_value" tableName="product_sku_timestamp_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-22">
+        <addUniqueConstraint columnNames="sku_id, attribute_id" constraintName="sku_id_single_attribute_varchar_value" tableName="product_sku_varchar_attribute_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-23">
+        <addUniqueConstraint columnNames="sku_group_name, product_type_id" constraintName="unique_sku_group_name_within_same_product_type" tableName="product_sku_group"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-24">
+        <addUniqueConstraint columnNames="product_sku_group_id, destination_id" constraintName="uniquebindingofskugroupidanddestinationid" tableName="product_sku_group_destination_mapping"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-25">
+        <createIndex associatedWith="" indexName="fk_blog_to_user_id" tableName="blog">
+            <column name="user_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-26">
+        <createIndex associatedWith="" indexName="fk_comment_to_blog_id" tableName="comment">
+            <column name="blog_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-27">
+        <createIndex associatedWith="" indexName="fk_comment_to_comment_id" tableName="comment">
+            <column name="respond_to"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-28">
+        <createIndex associatedWith="" indexName="fk_comment_to_user_id" tableName="comment">
+            <column name="user_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-29">
+        <createIndex associatedWith="" indexName="fk_destination_to_destination_id" tableName="destination">
+            <column name="parent_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-30">
+        <createIndex associatedWith="" indexName="fk_guidebook_to_destination_id" tableName="guidebook">
+            <column name="destination_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-31">
+        <createIndex associatedWith="" indexName="fk_order_to_product_sku_id" tableName="order">
+            <column name="product_sku_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-32">
+        <createIndex associatedWith="" indexName="fk_order_to_user_id" tableName="order">
+            <column name="user_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-33">
+        <createIndex associatedWith="" indexName="fk_prd_att_mapping_to_attr_id" tableName="product_type_attribute_mapping">
+            <column name="attribute_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-34">
+        <createIndex associatedWith="" indexName="fk_prd_att_mapping_to_product_type_id" tableName="product_type_attribute_mapping">
+            <column name="product_type_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-35">
+        <createIndex associatedWith="" indexName="fk_product_to_sku_group_group_id" tableName="hichina_product">
+            <column name="sku_group_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-36">
+        <createIndex associatedWith="" indexName="fk_product_to_type_type_id" tableName="hichina_product">
+            <column name="product_type_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-37">
+        <createIndex associatedWith="" indexName="fk_sku_group_to_product_type_id" tableName="product_sku_group">
+            <column name="product_type_id"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-38">
+        <createIndex associatedWith="" indexName="index_publicid" tableName="hichina_line">
+            <column name="public_id"/>
+            <column name="name"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-39">
+        <createIndex associatedWith="" indexName="indexblogcreatetime" tableName="blog">
+            <column name="created_time"/>
+        </createIndex>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-40">
+        <addForeignKeyConstraint baseColumnNames="user_id" baseTableName="blog" constraintName="fk_blog_to_user_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="user_id" referencedTableName="user" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-41">
+        <addForeignKeyConstraint baseColumnNames="blog_id" baseTableName="comment" constraintName="fk_comment_to_blog_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="blog_id" referencedTableName="blog" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-42">
+        <addForeignKeyConstraint baseColumnNames="respond_to" baseTableName="comment" constraintName="fk_comment_to_comment_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="comment_id" referencedTableName="comment" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-43">
+        <addForeignKeyConstraint baseColumnNames="user_id" baseTableName="comment" constraintName="fk_comment_to_user_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="user_id" referencedTableName="user" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-44">
+        <addForeignKeyConstraint baseColumnNames="parent_id" baseTableName="destination" constraintName="fk_destination_to_destination_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="destination_id" referencedTableName="destination" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-45">
+        <addForeignKeyConstraint baseColumnNames="destination_id" baseTableName="guidebook" constraintName="fk_guidebook_to_destination_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="destination_id" referencedTableName="destination" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-46">
+        <addForeignKeyConstraint baseColumnNames="product_sku_id" baseTableName="order" constraintName="fk_order_to_product_sku_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-47">
+        <addForeignKeyConstraint baseColumnNames="user_id" baseTableName="order" constraintName="fk_order_to_user_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="user_id" referencedTableName="user" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-48">
+        <addForeignKeyConstraint baseColumnNames="attribute_id" baseTableName="product_type_attribute_mapping" constraintName="fk_prd_att_mapping_to_attr_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="attribute_id" referencedTableName="product_attribute" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-49">
+        <addForeignKeyConstraint baseColumnNames="product_type_id" baseTableName="product_type_attribute_mapping" constraintName="fk_prd_att_mapping_to_product_type_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="product_type_id" referencedTableName="hichina_product_type" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-50">
+        <addForeignKeyConstraint baseColumnNames="sku_group_id" baseTableName="hichina_product" constraintName="fk_product_to_sku_group_group_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_group_id" referencedTableName="product_sku_group" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-51">
+        <addForeignKeyConstraint baseColumnNames="product_type_id" baseTableName="hichina_product" constraintName="fk_product_to_type_type_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="product_type_id" referencedTableName="hichina_product_type" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-52">
+        <addForeignKeyConstraint baseColumnNames="product_type_id" baseTableName="product_sku_group" constraintName="fk_sku_group_to_product_type_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="product_type_id" referencedTableName="hichina_product_type" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-53">
+        <addForeignKeyConstraint baseColumnNames="sku_id" baseTableName="product_sku_int_attribute_mapping" constraintName="fk_skuintattrmapping_to_product_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-54">
+        <addForeignKeyConstraint baseColumnNames="sku_id" baseTableName="product_sku_timestamp_attribute_mapping" constraintName="fk_skutimestampattrmapping_to_product_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+    <changeSet author="dsm (generated)" id="1710759291530-55">
+        <addForeignKeyConstraint baseColumnNames="sku_id" baseTableName="product_sku_varchar_attribute_mapping" constraintName="fk_skuvarcharattrmapping_to_product_id" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="sku_id" referencedTableName="hichina_product" validate="true"/>
+    </changeSet>
+</databaseChangeLog>

hichina-main-front-mobile-first/package.json

@@ -28,6 +28,7 @@
     "vue-json-pretty": "^2.2.4",
     "vue-router": "^4.0.0",
     "vue3-country-region-select": "^1.0.0",
+    "vue3-google-login": "^2.0.26",
     "vuejs3-datepicker": "^1.0.19"
   },
   "devDependencies": {

hichina-main-front-mobile-first/quasar.config.js

@@ -24,7 +24,7 @@ module.exports = configure(function (ctx) {
     // app boot file (/src/boot)
     // --> boot files are part of "main.js"
     // https://v2.quasar.dev/quasar-cli-webpack/boot-files
-    boot: ["i18n", "axios", "globalMixin"],
+    boot: ["i18n", "axios", "globalMixin", "googlelogin"],
 
     // https://v2.quasar.dev/quasar-cli-webpack/quasar-config-js#Property%3A-css
     css: ["app.scss"],

hichina-main-front-mobile-first/src/pages/LoginPage.vue

@@ -48,16 +48,24 @@
         <div
           style="border-top: 1px solid rgb(202, 202, 202); margin: 20px"
         ></div>
-        <div class="col-12 q-pa-md d-flex text-center">
+        <div class="col-12 q-pa-xs d-flex text-center">
           <q-btn
             align="between"
             class="btn-fixed-width"
+            size="md"
             color="primary"
             label="Continue with Facebook"
             icon="facebook"
             @click="goToFacebookLogin"
           />
         </div>
+        <div class="col-12 q-pa-xs d-flex text-center">
+          <GoogleLogin
+            :callback="googleCallback"
+            prompt
+            :buttonConfig="googleButtonConfig"
+          />
+        </div>
       </div>
     </div>
   </q-page>
@@ -69,15 +77,22 @@ import { useQuasar } from "quasar";
 import { useI18n } from "vue-i18n";
 import { api } from "boot/axios";
 import Qs from "qs";
+import GoogleLogin from "vue3-google-login";
+
 export default {
   name: "LoginPage",
   setup() {
-    const { locale, $t } = useI18n();
+    const { locale, $t } = useI18n({ useScope: "global" });
     const instance = getCurrentInstance();
     const app = getCurrentInstance().appContext.app;
     const gp = app.config.globalProperties;
     const $q = useQuasar();
 
+    const googleButtonConfig = ref({
+      locale: $q.lang.isoName,
+      text: "continue_with",
+    });
+
     const username = ref("");
     const password = ref("");
 
@@ -227,7 +242,7 @@ export default {
             appId: "854574772677522",
             autoLogAppEvents: true,
             xfbml: true,
-            version: "v13.0",
+            version: "v17.0",
           });
           resolve();
         };
@@ -266,9 +281,50 @@ export default {
       initFacebookSDK();
     });
 
+    function googleCallback(response) {
+      const credential = response.credential;
+      api
+        .post(
+          "/api/public/login/google",
+          {},
+          {
+            headers: { Authorization: `Bearer ${credential}` },
+          }
+        )
+        .then((res) => {
+          const email = res.data.data.email;
+
+          const data = {
+            username: email,
+            password: credential,
+          };
+          api
+            .post("/login", Qs.stringify(data), {
+              headers: {
+                "Content-Type": "application/x-www-form-urlencoded",
+              },
+            })
+            .then((response) => {
+              gp.$hideLoading($q);
+              location.reload();
+            })
+            .catch((e) => {
+              gp.$hideLoading($q);
+              gp.$generalNotify($q, false, "Error message: " + e);
+            });
+          console.log("google login response");
+          console.log(res);
+        })
+        .catch((err) => {
+          console.error(`google login failed: ${err.message}`, e);
+        });
+    }
+
     return {
       login,
       goToFacebookLogin,
+      googleCallback,
+      googleButtonConfig,
       username,
       password,
     };

hichina-main-front-mobile-first/yarn.lock

@@ -6221,6 +6221,11 @@ vue3-country-region-select@^1.0.0:
     vue "^3.0.0"
     vue-i18n "^9.0.0"
 
+vue3-google-login@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/vue3-google-login/-/vue3-google-login-2.0.26.tgz#0e55dbb3c6cbb78872dee0de800624c749d07882"
+  integrity sha512-BuTSIeSjINNHNPs+BDF4COnjWvff27IfCBDxK6JPRqvm57lF8iK4B3+zcG8ud6BXfZdyuiDlxletbEDgg4/RFA==
+
 vue@^3.0.0:
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/vue/-/vue-3.3.4.tgz#8ed945d3873667df1d0fcf3b2463ada028f88bd6"