diff --git a/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java b/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java index 67075bc8d..65dc2b731 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/security/dto/LoginUser.java @@ -2,6 +2,8 @@ package com.genersoft.iot.vmp.conf.security.dto; import com.genersoft.iot.vmp.storager.dao.dto.Role; import com.genersoft.iot.vmp.storager.dao.dto.User; +import lombok.Getter; +import lombok.Setter; import org.springframework.security.core.CredentialsContainer; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.SpringSecurityCoreVersion; @@ -19,8 +21,13 @@ public class LoginUser implements UserDetails, CredentialsContainer { */ private User user; + @Getter + @Setter private String accessToken; + @Setter + @Getter + private String serverId; /** * 登录时间 @@ -104,11 +111,4 @@ public class LoginUser implements UserDetails, CredentialsContainer { return user.getPushKey(); } - public String getAccessToken() { - return accessToken; - } - - public void setAccessToken(String accessToken) { - this.accessToken = accessToken; - } } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index eeeb65849..30947140f 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -42,6 +42,7 @@ import oshi.hardware.HardwareAbstractionLayer; import oshi.hardware.NetworkIF; import oshi.software.os.OperatingSystem; +import javax.servlet.http.HttpServletRequest; import java.io.File; import java.text.DecimalFormat; import java.util.*; @@ -81,6 +82,7 @@ public class ServerController { @Value("${server.port}") private int serverPort; + @Autowired private IRedisCatchStorage redisCatchStorage; @@ -275,7 +277,7 @@ public class ServerController { @GetMapping(value = "/info") @ResponseBody @Operation(summary = "获取系统信息", security = @SecurityRequirement(name = JwtUtils.HEADER)) - public Map> getInfo() { + public Map> getInfo(HttpServletRequest request) { Map> result = new LinkedHashMap<>(); Map hardwareMap = new LinkedHashMap<>(); result.put("硬件信息", hardwareMap); @@ -323,6 +325,11 @@ public class ServerController { platformMap.put("GIT版本", version.getGIT_Revision_SHORT()); platformMap.put("DOCKER环境", new File("/.dockerenv").exists()?"是":"否"); + Map docmap = new LinkedHashMap<>(); + result.put("文档地址", docmap); + docmap.put("部署文档", String.format("%s://%s:%s/doc.html", request.getScheme(), request.getServerName(), request.getServerPort())); + docmap.put("接口文档", "https://doc.wvp-pro.cn"); + return result; } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java index 86a806fc2..63ede950d 100755 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/user/UserController.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.vmanager.user; +import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.exception.ControllerException; import com.genersoft.iot.vmp.conf.security.JwtUtils; import com.genersoft.iot.vmp.conf.security.SecurityUtils; @@ -42,6 +43,9 @@ public class UserController { @Autowired private IRoleService roleService; + @Autowired + private UserSetting userSetting; + @GetMapping("/login") @PostMapping("/login") @Operation(summary = "登录", description = "登录成功后返回AccessToken, 可以从返回值获取到也可以从响应头中获取到," + @@ -62,6 +66,7 @@ public class UserController { String jwt = JwtUtils.createToken(username); response.setHeader(JwtUtils.getHeader(), jwt); user.setAccessToken(jwt); + user.setServerId(userSetting.getServerId()); } return user; }