diff --git a/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/constant/UserConstants.java b/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/constant/UserConstants.java index 16f67989c79182de98d27c6830208ca90ebd83fd..928bb45c8672df52591a9afbe500d5f479cf97a5 100644 --- a/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/constant/UserConstants.java +++ b/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/constant/UserConstants.java @@ -7,6 +7,16 @@ package net.mqtts.common.core.constant; */ public class UserConstants { + /** + * 平台默认超级管理员 + */ + public static final String ADMIN = "admin"; + + /** + * 平台默认管理员 + */ + public static final String MQTTS = "mqtts"; + /** * 平台内系统用户的唯一标志 */ diff --git a/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/utils/SecurityUtils.java b/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/utils/SecurityUtils.java index 3e38fea054348097df13c33bc301f59175184cbf..2b145cf63e7f32384bb03fd3f4bf49144090d457 100644 --- a/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/utils/SecurityUtils.java +++ b/mqtts-common/mqtts-common-core/src/main/java/net/mqtts/common/core/utils/SecurityUtils.java @@ -2,47 +2,46 @@ package net.mqtts.common.core.utils; import javax.servlet.http.HttpServletRequest; +import net.mqtts.common.core.constant.UserConstants; import net.mqtts.common.core.text.Convert; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import net.mqtts.common.core.constant.SecurityConstants; /** * 权限获取工具类 - * + * * @author mqtts */ -public class SecurityUtils -{ +public class SecurityUtils { /** * 获取用户 */ - public static String getUsername() - { + public static String getUsername() { String username = ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USERNAME); + if (StringUtils.isEmpty(username)) { + return UserConstants.MQTTS; + } return ServletUtils.urlDecode(username); } /** * 获取用户ID */ - public static Long getUserId() - { + public static Long getUserId() { return Convert.toLong(ServletUtils.getRequest().getHeader(SecurityConstants.DETAILS_USER_ID)); } /** * 获取请求token */ - public static String getToken() - { + public static String getToken() { return getToken(ServletUtils.getRequest()); } /** * 根据request获取请求token */ - public static String getToken(HttpServletRequest request) - { + public static String getToken(HttpServletRequest request) { String token = request.getHeader(SecurityConstants.TOKEN_AUTHENTICATION); return replaceTokenPrefix(token); } @@ -50,10 +49,8 @@ public class SecurityUtils /** * 替换token前缀 */ - public static String replaceTokenPrefix(String token) - { - if (StringUtils.isNotEmpty(token) && token.startsWith(SecurityConstants.TOKEN_PREFIX)) - { + public static String replaceTokenPrefix(String token) { + if (StringUtils.isNotEmpty(token) && token.startsWith(SecurityConstants.TOKEN_PREFIX)) { token = token.replace(SecurityConstants.TOKEN_PREFIX, ""); } return token; @@ -61,12 +58,11 @@ public class SecurityUtils /** * 是否为管理员 - * + * * @param userId 用户ID * @return 结果 */ - public static boolean isAdmin(Long userId) - { + public static boolean isAdmin(Long userId) { return userId != null && 1L == userId; } @@ -76,8 +72,7 @@ public class SecurityUtils * @param password 密码 * @return 加密字符串 */ - public static String encryptPassword(String password) - { + public static String encryptPassword(String password) { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.encode(password); } @@ -85,12 +80,11 @@ public class SecurityUtils /** * 判断密码是否相同 * - * @param rawPassword 真实密码 + * @param rawPassword 真实密码 * @param encodedPassword 加密后字符 * @return 结果 */ - public static boolean matchesPassword(String rawPassword, String encodedPassword) - { + public static boolean matchesPassword(String rawPassword, String encodedPassword) { BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder(); return passwordEncoder.matches(rawPassword, encodedPassword); } diff --git a/mqtts-ui/src/main.js b/mqtts-ui/src/main.js index 9f68e17bc14250ef51994167b0131f32268b0f85..098229806860119dd15de6ad63fa4e9e89fc877a 100644 --- a/mqtts-ui/src/main.js +++ b/mqtts-ui/src/main.js @@ -41,7 +41,7 @@ import BaiduMap from 'vue-baidu-map' // 引入高德 import AmapVue from '@amap/amap-vue'; AmapVue.config.version = '2.0'; // 默认2.0,这里可以不修改 -AmapVue.config.key = '1c26e30abecdc9022e34e0a54fdc8d71'; +AmapVue.config.key = 'e13456422e8fe93451cf2201f4db84bd'; AmapVue.config.plugins = [ 'AMap.moveAnimation', 'AMap.Geocoder',