From bd2984164f378a177fcd2fdf87ed4edbe0bdeb3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 28 Apr 2019 16:54:22 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E6=94=B9=E8=BF=9B=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=92=8C=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=20?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=B8=B8=E9=87=8F=E9=85=8D=E7=BD=AE=20#32?= =?UTF-8?q?=E3=80=81=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E5=BC=95=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/CacheConstants.java | 37 +++++++++++++++++++ .../common/core/constant/CommonConstants.java | 10 ----- .../core/constant/SecurityConstants.java | 4 -- .../support/RedisRouteDefinitionWriter.java | 8 ++-- .../service/PigxClientDetailsService.java | 4 +- .../service/PigxUserDetailsServiceImpl.java | 3 +- .../admin/config/DynamicRouteInitRunner.java | 6 +-- .../admin/handler/WeChatLoginHandler.java | 1 - .../service/impl/SysMenuServiceImpl.java | 7 ++-- .../SysOauthClientDetailsServiceImpl.java | 6 +-- .../service/impl/SysRoleMenuServiceImpl.java | 21 ++++++----- .../service/impl/SysRoleServiceImpl.java | 3 +- .../service/impl/SysRouteConfServiceImpl.java | 5 ++- .../impl/SysSocialDetailsServiceImpl.java | 3 +- .../service/impl/SysUserServiceImpl.java | 7 ++-- .../pigx/monitor/support/RedisEventStore.java | 4 +- .../pigx/mp/entity/WxAccountFans.java | 1 - 17 files changed, 79 insertions(+), 51 deletions(-) create mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java new file mode 100644 index 000000000..7436b23c3 --- /dev/null +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CacheConstants.java @@ -0,0 +1,37 @@ +package com.pig4cloud.pigx.common.core.constant; + +/** + * @author lengleng + * @date 2019-04-28 + *

+ * 缓存的key 常量 + */ +public interface CacheConstants { + + /** + * 用户信息缓存 + */ + String USER_DETAILS = "user_details"; + + + /** + * oauth 客户端信息 + */ + String CLIENT_DETAILS_KEY = "pigx_oauth:client:details"; + + /** + * 菜单信息缓存 + */ + String MENU_DETAILS = "menu_details"; + + /** + * spring boot admin 事件key + */ + String EVENT_KEY = "event_key"; + + /** + * 路由存放 + */ + String ROUTE_KEY = "gateway_route_key"; + +} diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java index b08e7da6d..812e942be 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java @@ -62,16 +62,6 @@ public interface CommonConstants { */ String BACK_END_PROJECT = "pigx"; - /** - * 路由存放 - */ - String ROUTE_KEY = "gateway_route_key"; - - /** - * spring boot admin 事件key - */ - String EVENT_KEY = "event_key"; - /** * 验证码前缀 */ diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java index 90b0b45ef..981246e89 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/SecurityConstants.java @@ -82,10 +82,6 @@ public interface SecurityConstants { * 自定义登录URL */ String MOBILE_TOKEN_URL = "/mobile/token/*"; - /** - * oauth 客户端信息 - */ - String CLIENT_DETAILS_KEY = "pigx_oauth:client:details"; /** * 微信获取OPENID diff --git a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/RedisRouteDefinitionWriter.java b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/RedisRouteDefinitionWriter.java index f2a5f4d1f..90cf47c56 100644 --- a/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/RedisRouteDefinitionWriter.java +++ b/pigx-common/pigx-common-gateway/src/main/java/com/pig4cloud/pigx/common/gateway/support/RedisRouteDefinitionWriter.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.common.gateway.support; -import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.gateway.vo.RouteDefinitionVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -53,7 +53,7 @@ public class RedisRouteDefinitionWriter implements RouteDefinitionRepository { BeanUtils.copyProperties(r, vo); log.info("保存路由信息{}", vo); redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.opsForHash().put(CommonConstants.ROUTE_KEY, r.getId(), vo); + redisTemplate.opsForHash().put(CacheConstants.ROUTE_KEY, r.getId(), vo); return Mono.empty(); }); } @@ -63,7 +63,7 @@ public class RedisRouteDefinitionWriter implements RouteDefinitionRepository { routeId.subscribe(id -> { log.info("删除路由信息{}", id); redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.opsForHash().delete(CommonConstants.ROUTE_KEY, id); + redisTemplate.opsForHash().delete(CacheConstants.ROUTE_KEY, id); }); return Mono.empty(); } @@ -78,7 +78,7 @@ public class RedisRouteDefinitionWriter implements RouteDefinitionRepository { public Flux getRouteDefinitions() { redisTemplate.setKeySerializer(new StringRedisSerializer()); redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(RouteDefinitionVo.class)); - List values = redisTemplate.opsForHash().values(CommonConstants.ROUTE_KEY); + List values = redisTemplate.opsForHash().values(CacheConstants.ROUTE_KEY); List definitionList = new ArrayList<>(); values.forEach(vo -> { RouteDefinition routeDefinition = new RouteDefinition(); diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsService.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsService.java index a7093f15f..01e664f50 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsService.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxClientDetailsService.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.common.security.service; -import com.pig4cloud.pigx.common.core.constant.SecurityConstants; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import org.springframework.cache.annotation.Cacheable; import org.springframework.security.oauth2.common.exceptions.InvalidClientException; import org.springframework.security.oauth2.provider.ClientDetails; @@ -45,7 +45,7 @@ public class PigxClientDetailsService extends JdbcClientDetailsService { * @throws InvalidClientException */ @Override - @Cacheable(value = SecurityConstants.CLIENT_DETAILS_KEY, key = "#clientId", unless = "#result == null") + @Cacheable(value = CacheConstants.CLIENT_DETAILS_KEY, key = "#clientId", unless = "#result == null") public ClientDetails loadClientByClientId(String clientId) { return super.loadClientByClientId(clientId); } diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java index abc4cee35..1c5fdd18a 100644 --- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java +++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/service/PigxUserDetailsServiceImpl.java @@ -22,6 +22,7 @@ import cn.hutool.core.util.StrUtil; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.feign.RemoteUserService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; @@ -63,7 +64,7 @@ public class PigxUserDetailsServiceImpl implements PigxUserDetailsService { @Override @SneakyThrows public UserDetails loadUserByUsername(String username) { - Cache cache = cacheManager.getCache("user_details"); + Cache cache = cacheManager.getCache(CacheConstants.USER_DETAILS); if (cache != null && cache.get(username) != null) { return (PigxUser) cache.get(username).get(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java index 4d9c520cb..5c8f29e16 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/DynamicRouteInitRunner.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.config; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; import com.pig4cloud.pigx.admin.service.SysRouteConfService; -import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.gateway.support.DynamicRouteInitEvent; import com.pig4cloud.pigx.common.gateway.vo.RouteDefinitionVo; import lombok.AllArgsConstructor; @@ -57,7 +57,7 @@ public class DynamicRouteInitRunner { @Order @EventListener({WebServerInitializedEvent.class, DynamicRouteInitEvent.class}) public void initRoute() { - Boolean result = pigxRedisTemplate.delete(CommonConstants.ROUTE_KEY); + Boolean result = pigxRedisTemplate.delete(CacheConstants.ROUTE_KEY); log.info("初始化网关路由 {} ", result); routeConfService.routes().forEach(route -> { @@ -74,7 +74,7 @@ public class DynamicRouteInitRunner { log.info("加载路由ID：{},{}", route.getRouteId(), vo); pigxRedisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(RouteDefinitionVo.class)); - pigxRedisTemplate.opsForHash().put(CommonConstants.ROUTE_KEY, route.getRouteId(), vo); + pigxRedisTemplate.opsForHash().put(CacheConstants.ROUTE_KEY, route.getRouteId(), vo); }); log.debug("初始化网关路由结束 "); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java index 0164967e1..9190bf657 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java @@ -31,7 +31,6 @@ import com.pig4cloud.pigx.common.core.constant.enums.LoginTypeEnum; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.springframework.web.client.RestTemplate; /** * @author lengleng diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index fb4ec98c3..2f53b5878 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -28,6 +28,7 @@ import com.pig4cloud.pigx.admin.api.vo.MenuVO; import com.pig4cloud.pigx.admin.mapper.SysMenuMapper; import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper; import com.pig4cloud.pigx.admin.service.SysMenuService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; @@ -52,14 +53,14 @@ public class SysMenuServiceImpl extends ServiceImpl impl private final SysRoleMenuMapper sysRoleMenuMapper; @Override - @Cacheable(value = "menu_details", key = "#roleId + '_menu'") + @Cacheable(value = CacheConstants.MENU_DETAILS, key = "#roleId + '_menu'") public List findMenuByRoleId(Integer roleId) { return baseMapper.listMenusByRoleId(roleId); } @Override @Transactional(rollbackFor = Exception.class) - @CacheEvict(value = "menu_details", allEntries = true) + @CacheEvict(value = CacheConstants.MENU_DETAILS, allEntries = true) public R removeMenuById(Integer id) { // 查询父节点为当前节点的节点 List menuList = this.list(Wrappers.query() @@ -79,7 +80,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } @Override - @CacheEvict(value = "menu_details", allEntries = true) + @CacheEvict(value = CacheConstants.MENU_DETAILS, allEntries = true) public Boolean updateMenuById(SysMenu sysMenu) { return this.updateById(sysMenu); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index 1d0a0c3ee..74e6432fa 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; -import com.pig4cloud.pigx.common.core.constant.SecurityConstants; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -45,7 +45,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImplquery().lambda() - .eq(SysRoleMenu::getRoleId, roleId)); + .eq(SysRoleMenu::getRoleId, roleId)); if (StrUtil.isBlank(menuIds)) { return Boolean.TRUE; } List roleMenuList = Arrays - .stream(menuIds.split(",")) - .map(menuId -> { - SysRoleMenu roleMenu = new SysRoleMenu(); - roleMenu.setRoleId(roleId); - roleMenu.setMenuId(Integer.valueOf(menuId)); - return roleMenu; - }).collect(Collectors.toList()); + .stream(menuIds.split(",")) + .map(menuId -> { + SysRoleMenu roleMenu = new SysRoleMenu(); + roleMenu.setRoleId(roleId); + roleMenu.setMenuId(Integer.valueOf(menuId)); + return roleMenu; + }).collect(Collectors.toList()); //清空userinfo - cacheManager.getCache("user_details").clear(); + cacheManager.getCache(CacheConstants.USER_DETAILS).clear(); return this.saveBatch(roleMenuList); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java index 5b0c8a634..8ec88d214 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java @@ -26,6 +26,7 @@ import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.admin.mapper.SysRoleMapper; import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper; import com.pig4cloud.pigx.admin.service.SysRoleService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; @@ -64,7 +65,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return */ @Override - @CacheEvict(value = "menu_details", allEntries = true) + @CacheEvict(value = CacheConstants.CLIENT_DETAILS_KEY, allEntries = true) @Transactional(rollbackFor = Exception.class) public Boolean removeRoleById(Integer id) { sysRoleMenuMapper.delete(Wrappers diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java index 7a944a790..904d013aa 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java @@ -25,6 +25,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; import com.pig4cloud.pigx.admin.mapper.SysRouteConfMapper; import com.pig4cloud.pigx.admin.service.SysRouteConfService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.CommonConstants; import com.pig4cloud.pigx.common.gateway.support.DynamicRouteInitEvent; import com.pig4cloud.pigx.common.gateway.vo.RouteDefinitionVo; @@ -83,7 +84,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl updateRoutes(JSONArray routes) { // 清空Redis 缓存 - Boolean result = pigxRedisTemplate.delete(CommonConstants.ROUTE_KEY); + Boolean result = pigxRedisTemplate.delete(CacheConstants.ROUTE_KEY); log.info("清空网关路由 {} ", result); // 遍历修改的routes，保存到Redis @@ -131,7 +132,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl(RouteDefinitionVo.class)); - pigxRedisTemplate.opsForHash().put(CommonConstants.ROUTE_KEY, vo.getId(), vo); + pigxRedisTemplate.opsForHash().put(CacheConstants.ROUTE_KEY, vo.getId(), vo); routeDefinitionVoList.add(vo); }); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java index 83737ad70..59bb15c08 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java @@ -26,6 +26,7 @@ import com.pig4cloud.pigx.admin.handler.LoginHandler; import com.pig4cloud.pigx.admin.mapper.SysSocialDetailsMapper; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.SysSocialDetailsService; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import com.pig4cloud.pigx.common.core.constant.enums.LoginTypeEnum; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; @@ -69,7 +70,7 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl impl * @return Boolean */ @Override - @CacheEvict(value = "user_details", key = "#sysUser.username") + @CacheEvict(value = CacheConstants.USER_DETAILS, key = "#sysUser.username") public Boolean deleteUserById(SysUser sysUser) { sysUserRoleService.deleteByUserId(sysUser.getUserId()); this.removeById(sysUser.getUserId()); @@ -160,7 +161,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - @CacheEvict(value = "user_details", key = "#userDto.username") + @CacheEvict(value = CacheConstants.USER_DETAILS, key = "#userDto.username") public R updateUserInfo(UserDTO userDto) { UserVO userVO = baseMapper.getUserVoByUsername(userDto.getUsername()); SysUser sysUser = new SysUser(); @@ -180,7 +181,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - @CacheEvict(value = "user_details", key = "#userDto.username") + @CacheEvict(value = CacheConstants.USER_DETAILS, key = "#userDto.username") public Boolean updateUser(UserDTO userDto) { SysUser sysUser = new SysUser(); BeanUtils.copyProperties(userDto, sysUser); diff --git a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java index af836b305..6142feade 100644 --- a/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java +++ b/pigx-visual/pigx-monitor/src/main/java/com/pig4cloud/pigx/monitor/support/RedisEventStore.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.monitor.support; import cn.hutool.core.util.StrUtil; -import com.pig4cloud.pigx.common.core.constant.CommonConstants; +import com.pig4cloud.pigx.common.core.constant.CacheConstants; import de.codecentric.boot.admin.server.domain.events.InstanceEvent; import de.codecentric.boot.admin.server.eventstore.InMemoryEventStore; import lombok.AllArgsConstructor; @@ -51,7 +51,7 @@ public class RedisEventStore extends InMemoryEventStore { log.info("保存实例事件的KEY：{},EVENT: {}", key, event.getType()); redisTemplate.setKeySerializer(new StringRedisSerializer()); redisTemplate.setHashValueSerializer(new Jackson2JsonRedisSerializer<>(InstanceEvent.class)); - redisTemplate.opsForHash().put(CommonConstants.EVENT_KEY, key, event); + redisTemplate.opsForHash().put(CacheConstants.EVENT_KEY, key, event); }); return super.append(events); } diff --git a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java index 6b3e2e8ab..cad319aa8 100755 --- a/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java +++ b/pigx-visual/pigx-mp-manager/src/main/java/com/pig4cloud/pigx/mp/entity/WxAccountFans.java @@ -18,7 +18,6 @@ package com.pig4cloud.pigx.mp.entity; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode;