Merge remote-tracking branch 'origin/master'

projects/src/main/java/com/rtrh/projects/web/controller/passport/api/SwitchApiController.java

@@ -41,7 +41,7 @@ public class SwitchApiController extends BaseController {
         String url = resourceBundle.getString("app.fgw.url");
         // 拼接 B 系统的 URL
         // 获取B系统的登录token
-        String targetUrl = url+"/projects/outApi/auth/fgwLogin?token=" + token;
+        String targetUrl = url+"/outApi/auth/fgwLogin?token=" + token;
 
         // 创建一个HttpClient实例
         // 创建一个HttpClient实例

projects/src/main/resources/config.properties

@@ -1,4 +1,4 @@
 flow_vedio_path=/home/data/file/flew_hami.mp4
 flow_img_path=/home/data/file/flow.svg
 
-app.fgw.url=http://localhost:8089
+app.fgw.url=http://localhost:8089/projects

projects/src/main/webapp/vmodules/top.jsp

@@ -131,7 +131,7 @@
                 App.postJson("/app/switch/toFgw", {}, function (res) {
                     console.log(res);
                     if(res.code ===200){
-                        var targetUrl = res.msg+"/projects/index";
+                        var targetUrl = res.msg+"/index";
                         var cookiesToSend = "rememberMe="+res.data.token;
                         // 将需要携带的cookie通过URL参数的形式附加到目标URL上
                         targetUrl += "?cookies=" + encodeURIComponent(cookiesToSend);