lyhzzz 2 anni fa
parent
commit
da0017f6c0

+ 7 - 7
src/main/java/com/fdkankan/ucenter/common/constants/NacosProperty.java

@@ -12,13 +12,13 @@ public class NacosProperty {
     private static String mainUrl;
 
     public static String getMainUrl() {
-        if(StringUtils.isBlank(mainUrl)){
-            try {
-                return InetAddress.getLocalHost().getHostAddress();
-            } catch (UnknownHostException e) {
-                e.printStackTrace();
-            }
-        }
+//        if(StringUtils.isBlank(mainUrl)){
+//            try {
+//                return InetAddress.getLocalHost().getHostAddress() +"/";
+//            } catch (UnknownHostException e) {
+//                e.printStackTrace();
+//            }
+//        }
         return mainUrl;
     }
 

+ 11 - 6
src/main/java/com/fdkankan/ucenter/controller/app/SceneApiController.java

@@ -141,7 +141,7 @@ public class SceneApiController extends BaseController {
                     BeanUtils.copyProperties(dbUser,user);
                 }
 
-                sendResponse(user,webSite, response,sceneNum,lang,vlog);
+                sendResponse(user,webSite, request,response,sceneNum,lang,vlog);
             }
         }
 
@@ -175,30 +175,35 @@ public class SceneApiController extends BaseController {
         if(!SecurityUtil.MD5(password).equals(ssoUser.getPassword())) {
             throw new BusinessException(LoginConstant.FAILURE_CODE_3015, LoginConstant.FAILURE_MSG_3015);
         }
-        sendResponse(ssoUser,webSite, response,sceneNum,lang,vlog);
+        sendResponse(ssoUser,webSite, request,response,sceneNum,lang,vlog);
 
     }
 
-    private void sendResponse(UserVo user, String webSite,
+    private void sendResponse(UserVo user, String webSite, HttpServletRequest request,
                               HttpServletResponse response, String sceneNum, String lang, String vlog) {
         String token = loginService.redisLogin(user.getUserName(),JSONObject.toJSONString(user));
         //登录成功
+        String mainUrl = NacosProperty.getMainUrl();
+        if(StringUtils.isBlank(mainUrl)){
+            mainUrl = request.getRemoteHost();
+        }
+
         try {
             String redirect  = null;
             if(webSite.contains(sceneProUrl)){
-                 redirect = NacosProperty.getMainUrl() + sceneProUrl.replace("show", "edit").replace("PC", "Mobile") +
+                 redirect = mainUrl + sceneProUrl.replace("show", "edit").replace("PC", "Mobile") +
                         sceneNum + "&t=" +System.currentTimeMillis() + "&token=" + token + "&app" +
                         (lang == null ? "" : "&lang=" + lang) + (vlog == null ? "" : "&vlog=" + vlog);
             }
 
             if(webSite.contains(sceneProV4Url)){
-                 redirect = NacosProperty.getMainUrl() + sceneProV4Url.replace("s", "e") +
+                 redirect = mainUrl + sceneProV4Url.replace("s", "e") +
                         sceneNum + "&t=" +System.currentTimeMillis() + "&token=" + token + "&app" +
                         (lang == null ? "" : "&lang=" + lang) + (vlog == null ? "" : "&vlog=" + vlog);
             }
 
             if(webSite.contains(sceneProNewUrl)) {
-                 redirect = NacosProperty.getMainUrl() + sceneProNewUrl.replace("s", "e") +
+                 redirect = mainUrl + sceneProNewUrl.replace("s", "e") +
                         sceneNum + "&t=" + System.currentTimeMillis() + "&token=" + token + "&app" +
                         (lang == null ? "" : "&lang=" + lang) + (vlog == null ? "" : "&vlog=" + vlog);
 

+ 2 - 0
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -38,6 +38,8 @@ import com.fdkankan.ucenter.vo.response.SceneInfoVo;
 import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import com.fdkankan.ucenter.vo.response.SceneVo;
 import java.io.File;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;