返回gic域名

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/LoginController.java

@@ -29,6 +29,7 @@ import com.gic.clerk.api.dto.PowerClerkDTO;
 import com.gic.clerk.api.service.ClerkService;
 import com.gic.clerk.api.service.RightService;
 import com.gic.clerk.api.service.UserService;
+import com.gic.commons.util.GlobalVar;
 import com.gic.commons.util.ToolUtil;
 import com.gic.enterprise.api.dto.EnterpriseDTO;
 import com.gic.enterprise.api.service.EnterpriseService;
@@ -312,10 +313,17 @@ public class LoginController extends WebBaseController {
      * 获取登录信息
      */
     @RequestMapping("get-login-info")
+    @IgnoreLogin
     public HaobanResponse getLoginInfo() {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        logger.info("当前登录信息={}", JSON.toJSON(loginUser));
-        WebLoginVO vo = EntityUtil.changeEntityByOrika(WebLoginVO.class, loginUser);
+        WebLoginVO vo =  new WebLoginVO() ;
+        if(null != loginUser) {
+            logger.info("当前登录信息={}", JSON.toJSON(loginUser));
+            vo = EntityUtil.changeEntityByOrika(WebLoginVO.class, loginUser);
+        }
+        String gicHost = GlobalVar.ctxPropertiesMap.get("gicweb_service_host");
+        gicHost = gicHost.replace("gicweb", "").replace("https://", "http://").replace("http://", "https://");
+        vo.setGicHost(gicHost);
         return this.success(vo);
     }
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/WebLoginVO.java

@@ -19,6 +19,15 @@ public class WebLoginVO implements Serializable {
     private String headImg ;
     private String hanbaoUserId;
     private String roleId ;
+    private String gicHost ;
+
+    public String getGicHost() {
+        return gicHost;
+    }
+
+    public void setGicHost(String gicHost) {
+        this.gicHost = gicHost;
+    }
 
     public String getRoleId() {
         return roleId;