|
@@ -44,7 +44,6 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import javax.servlet.http.Cookie;
|
|
import javax.servlet.http.Cookie;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
-import java.util.Collections;
|
|
|
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
|
import java.util.Optional;
|
|
import java.util.Optional;
|
|
|
|
|
|
|
@@ -439,7 +438,7 @@ public class AuthorizationController {
|
|
|
@PostMapping("/google/login")
|
|
@PostMapping("/google/login")
|
|
|
public Result<UserAuthLoginResp> googleLogin(LoginReq loginReq,String credential) throws Exception {
|
|
public Result<UserAuthLoginResp> googleLogin(LoginReq loginReq,String credential) throws Exception {
|
|
|
log.info("google loginReq:{},credential:{}", loginReq, credential);
|
|
log.info("google loginReq:{},credential:{}", loginReq, credential);
|
|
|
- String result = HttpUtil.post("https://yinhedvd.com/8083/api2/auth/google/login/inner?credential=" + credential, new HashMap<>());
|
|
|
|
|
|
|
+ String result = HttpUtil.post("https://galaxydvd.com/8081/api/auth/google/login/inner?credential=" + credential, new HashMap<>());
|
|
|
log.info("google result:{}",result);
|
|
log.info("google result:{}",result);
|
|
|
GoogleLoginRep googleLoginRep = Jsons.parseObject(Jsons.toMap(result).get("data"), GoogleLoginRep.class);
|
|
GoogleLoginRep googleLoginRep = Jsons.parseObject(Jsons.toMap(result).get("data"), GoogleLoginRep.class);
|
|
|
loginReq.setType(3);
|
|
loginReq.setType(3);
|