1

src/main/java/com/fdkankan/ucenter/config/UcenterConfig.java

@@ -10,10 +10,16 @@ public class UcenterConfig {
 
     @Value("${4dkk.laserService.basePath}")
     private String basePath;
+
     @Value("${spring.profiles.active}")
     private String active;
+
+    @Value("${main.url}")
+    private String mainUrl;
+
     @Value("${ucenter.contactUs.callBackUrl}")
     private String contactUsCallBackUrl;
+
     @Value("${ucenter.contactUs.dfPassword}")
     private String contactUsDfPassword;
 }

src/main/java/com/fdkankan/ucenter/controller/ContactUsController.java

@@ -38,9 +38,8 @@ public class ContactUsController extends BaseController {
     }
 
     @GetMapping("/callBack/{email}")
-    public Result callBack(@PathVariable String email){
+    public void callBack(@PathVariable String email){
         contactUsService.callBack(email,response);
-        return Result.success();
     }
 
     @PostMapping("/point")

src/main/java/com/fdkankan/ucenter/service/impl/ContactUsServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -89,7 +90,7 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
 
     @Override
     public void callBack(String uuid, HttpServletResponse response) {
-
+        String redirectUrl =ucenterConfig.getMainUrl();
         String rediskey = String.format(RedisKeyUtil.CONTACT_US_KEY,uuid);
         String rediskey2 = null;
         try {
@@ -117,7 +118,7 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
                 userService.save(userEntity);
                 LoginVo login = loginService.login(userEntity);
                 response.setHeader("token", login.getToken());
-                response.sendRedirect(contactUs.getRedirectUrl());
+                redirectUrl = contactUs.getRedirectUrl();
             }
 
         }catch (Exception e){
@@ -127,6 +128,11 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
             if(rediskey2 != null){
                 redisUtil.del(rediskey2);
             }
+            try {
+                response.sendRedirect(redirectUrl);
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
         }
     }