修改代码

master
bynt 2 years ago
parent cd1dd7809a
commit 38b5c3809a

@ -69,7 +69,7 @@ public enum ResultCode {
/** /**
* 11005 * 11005
*/ */
USER_DISABLED(11004, "用户被禁11005用"), USER_DISABLED(11004, "用户被禁用"),
/** /**
* *
*/ */

@ -67,10 +67,6 @@ public class CacheKey {
*/ */
public final String MENU_DETAILS = "menu_details"; public final String MENU_DETAILS = "menu_details";
/**
*
*/
public final String USER_DETAILS = "user_details";
/** /**
* *
@ -137,6 +133,12 @@ public class CacheKey {
*/ */
public final String USER_CACHE_KEY_PRE = "user::username:"; public final String USER_CACHE_KEY_PRE = "user::username:";
/**
*
*/
public final String USER_DETAILS = "user_details";
public final String ONLINE_USER = "online:user:"; public final String ONLINE_USER = "online:user:";
/** /**

@ -13,7 +13,7 @@ public final class SecurityConstants {
/** /**
* token url * token url
*/ */
public static final String AUTH_TOKEN = "//oauth/token/token"; public static final String AUTH_TOKEN = "/auth/oauth/token";
/** /**
* token url * token url

@ -5,7 +5,6 @@ import cn.hutool.core.text.CharSequenceUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.baiye.config.IgnoreClientConfiguration; import com.baiye.config.IgnoreClientConfiguration;
import com.baiye.core.constant.SecurityConstants; import com.baiye.core.constant.SecurityConstants;
import com.baiye.core.util.StringUtils;
import com.baiye.exception.CaptchaException; import com.baiye.exception.CaptchaException;
import com.baiye.service.IValidateCodeService; import com.baiye.service.IValidateCodeService;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

@ -1,8 +1,5 @@
server:
port: 80
spring: spring:
application:
name: @artifactId@
redis: redis:
#数据库索引 #数据库索引
database: 9 database: 9

@ -7,7 +7,7 @@ spring:
active: dev active: dev
security: security:
decode: decode:
private-key: MIICeQIBADANBgkqhkiG9w0BAQEFAASCAmMwggJfAgEAAoGBAKmB93JM4cIFilnvcV1gSuPc3GlFUwo3JGGbOTkL9JP0W9Vz5CsbYbVbEtU+gnw6m3//4DSmOYeqlJJzsylVLdSe4flx2MsCceXxudsE4dHKqYU6zxBvsZB+FNFRoA2kjAtSJDaBCRryP5zXYVUYtVZW16pHkco/I35NwDevkvsJAgMBAAECgYEAkb5SoO9jyOv0mgFbirrJiYQT61uU25qv6FCLcfZKk5AuCai8jSfc6g7lcX5uuRu3KeY6w2oM2w4a8pUSfb5kSR4SAzSL6A94GIKfr3FDBxhrMxB+ko5vDoOwmmDi6jLGUFhxpiwT2Dz2c/Jz2kZJVb6RetOhh8fzdh3cz8jNQoECQQDg3+rX4d7WTS8xIFf3aQ8UKSCyDYpoNCVEsh9jaCsLrhsNXHMw8IX4KTjxsMvf3djztYuNsULHtwMkywGOA1ixAkEAwPg00MkqhBH1we4N8MCnXajZ+/UWch5b40QFBZrcbvx2k/CI25xH52FccmsEvVfuv1uFPto4sPTn7zAcKOzd2QJBANNEK3tkvhkx7ItH6r0LW9pCBXCiXg0mKHlQq0KWRBK2IL49xA8PeZ27BL+0rOWGpGPahOC6z5WYMADqJGzKYhECQQC1xZjKy5QXEGv1n+7VyERfv3yHEJlyKhLYg+xPGU9n5L02IjBo3lAFLvtMdG7khP5Kl0VurVUVq70G3MTJ8EYRAkEAm2hy1mCTMTWJYSlXieWnZxJaXn0MOrv4RyRsoXUTH1tgZ6MCqm0a7YxU0byPU0h1W2kLXXZa8P+vu2finQkvCA== private-key: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDGvKLhCTMHvZq7N1eXp4czytQrHXyda4PoJIDPZ6Rb2NkwsaBhwvr4wFp68U2oCkzAn0SSm9PIotNqYQtaZgTQr5pnJmr6AKrUhwHfat+jzqE97Y5ifIG4Sdaf/MWkaP+/lYTv8i3fW51vu8RgPJO38vXN02ZF+r5gtP5bxsyKSMtKvjG4l2Qjcw/C3BfhxYbP3nMTzTNwIl2XwHrKTJw57seyeedt6YXTOOucFPn87YLSj1S1pvtH5Xt1Kz+cHigimVtNHZ5B22lOU5ZBjYYtruMEaNq5dP2eVdXXlyaz+0Ly87Y96FhqhzpvbMUlksb938xC2pSah8kq23/Hd1TPAgMBAAECggEBAI9o+DBjrwta6xlGKlMpdQsOxmQGdzIxr5IJJVqFc7lDlhbpVs61IN34EFK/ZkZoiFJHm/gfsogJ133gYYzuKXNeBJGCy5d0e9G5SsSqHo/aP8iscB7pscIGpnX0tbqaelMJ1lA/9pJDTiye1mqLzBzlmjLY5eiBtHecpCAeKONvtoB5dbYyEX7rGON/Jig0foLrGDeou9cmr4KNvHuO8pCC68qOVZW+LRE3OGIdkd0GE7fGd1VIZ5602ZsHnaFCQUTyhMpK4K0ECrjHgspFXIMV5rkAnSvhUXsy0YgB9JCAEF1z499PtviQhwpZiN6JdzrPLAbbINvBAUSInVo1+8ECgYEA50PIHs6ZXZcPZiICx5U6DFMhIeM4TQZiaA+MgtQd1MuXFFWrx/aIacza5kFYhmauhFobnoqnbqD01uSKNqkK3+2U0MMSEb960DiIuvvZqkr9d9o65Ypks9uEalrbU0pYgF2ugn1a8+F2a1ema+vPqwqnSMRHYH5utLcYKBjmG9kCgYEA2/42t5AoCJQSo6NcQqO/Yw/tC13UpfmpZ3vKDHs94ZGbV5GVPZAsSIZErbf72cuZQpoAew6zFrx7XrxRTl0FzOYz+QzfYgb5gsdEgPiID+SV3dfsqb49UYKHjvt9zzLfZ5cWd+tRk1jZCKFU092/RF/LzTuK9JY1jDR70DqZVOcCgYBeZP5EBNP4rXXtnChCSpi8+xlk+Ze7aMW179LMe8QJXWg3Npi9L9WSSbl3jmiRw0usXhMz7ShWMYB+Th5UHT+BEzpQ066Ga/+3CbxVhgLcTWuUBhFQK+LavtkXiCpJnujszFA0lvIO5ZIuUkJtfnzvNZP+UY9IxZJuVOWZSEB0UQKBgQC+Gda+mNt/TjUtIqU/ELD5sXFtOQ/gvPUeb2IRlw3KNkC+Uxdbs5IQubXvR+ViNwWg/+Mac4FeTFFvc9vuk4PHo8WVmQIPe2dxEzCnIhyxXx4CLexcYgAqx1jMvZXhzlwu7+iCh95eLZCeXIso6Z22P/Gkz6cr5AExvsifD4QgUQKBgHLGFdW0uhAXImj4RzdZb58GYegF15jgyP4MT0d3XYqPB3wjjTgjBgqQxy3ZnyhX2sKQI4Td/6yEtvK0Uy45KoAQ6bz+WVLB3Lu9FF06RnvWm25cwNKu2t8PACuhwfeq09qAwBnC/PRh26wM2ps8PDoaXGC2Qr3Xc/nM/7WWotWk

@ -91,7 +91,7 @@ public class MenuController {
@PreAuthorize("@el.check('menu:list')") @PreAuthorize("@el.check('menu:list')")
public ResponseEntity<List<MenuDto>> getSuperior(@RequestBody List<Long> ids) { public ResponseEntity<List<MenuDto>> getSuperior(@RequestBody List<Long> ids) {
Set<MenuDto> menuDtos = new LinkedHashSet<>(); Set<MenuDto> menuDtos = new LinkedHashSet<>();
if (CollectionUtil.isNotEmpty(ids)) { if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) { for (Long id : ids) {
MenuDto menuDto = this.menuMapStruct.toDto(this.menuService.getById(id)); MenuDto menuDto = this.menuMapStruct.toDto(this.menuService.getById(id));
menuDtos.addAll(this.menuService.getSuperior(menuDto, new ArrayList<>())); menuDtos.addAll(this.menuService.getSuperior(menuDto, new ArrayList<>()));

Loading…
Cancel
Save