From 2d64aa8eb51f20d0e1840c0dfbc459466fd3a13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?= <2847127106@qq.com> Date: Mon, 23 Sep 2024 22:36:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/pom.xml | 63 ++-- .../com/muyu/auth/CloudAuthApplication.java | 12 +- .../muyu/auth/controller/TokenController.java | 6 +- .../muyu/auth/service/SysLoginService.java | 33 +- .../muyu/auth/service/SysPasswordService.java | 6 +- .../auth/service/SysRecordLogService.java | 4 +- .../core/constant/ServiceNameConstants.java | 2 + .../com/muyu/common/log/aspect/LogAspect.java | 4 +- .../common/log/service/AsyncLogService.java | 4 +- .../rabbit/RabbitListenerConfigurer.java | 4 +- .../common/redis/service/RedisService.java | 4 +- .../many/datasource/ManyDataSource.java | 19 +- .../datasource/role/DynamicDataSource.java | 10 +- .../saas/interceptor/WebMvcSaaSConfig.java | 2 +- .../common/security/service/TokenService.java | 4 +- .../system/remote/RemoteEntService.java | 23 -- .../system/remote/RemoteSaasService.java | 32 ++ .../system/remote/RemoteUserService.java | 31 +- ...ry.java => RemoteSaasFallbackFactory.java} | 16 +- .../factory/RemoteUserFallbackFactory.java | 16 +- ...ot.autoconfigure.AutoConfiguration.imports | 2 +- .../config/RouterFunctionConfiguration.java | 4 +- .../com/muyu/gateway/filter/AuthFilter.java | 6 +- .../gateway/filter/ValidateCodeFilter.java | 6 +- .../com/muyu/gateway/filter/XssFilter.java | 4 +- .../gateway/handler/ValidateCodeHandler.java | 4 +- .../service/impl/ValidateCodeServiceImpl.java | 6 +- .../file/controller/SysFileController.java | 4 +- .../file/service/MinioSysFileServiceImpl.java | 6 +- .../cloud-modules-system-saas/pom.xml | 12 +- .../saas/controller/SysUserController.java | 45 +++ .../system/saas/mapper/SysUserMapper.java | 22 ++ .../system/saas/service/SysUserService.java | 18 ++ .../saas/service/impl/SysUserServiceImpl.java | 33 ++ .../resources/mapper/saas/SysUserMapper.xml | 287 ++++++++++++++++++ .../controller/SysConfigController.java | 4 +- .../system/controller/SysDeptController.java | 4 +- .../controller/SysDictDataController.java | 6 +- .../controller/SysDictTypeController.java | 4 +- .../controller/SysLogininforController.java | 6 +- .../system/controller/SysMenuController.java | 4 +- .../controller/SysNoticeController.java | 4 +- .../controller/SysOperlogController.java | 4 +- .../controller/SysPermissionController.java | 55 ++++ .../system/controller/SysPostController.java | 4 +- .../controller/SysProfileController.java | 6 +- .../system/controller/SysRoleController.java | 8 +- .../system/controller/SysUserController.java | 14 +- .../controller/SysUserOnlineController.java | 6 +- .../com/muyu/system/rabbit/RabbitTest.java | 4 +- .../muyu/system/service/SysUserService.java | 2 +- .../service/impl/SysConfigServiceImpl.java | 4 +- .../service/impl/SysDeptServiceImpl.java | 6 +- .../service/impl/SysDictDataServiceImpl.java | 4 +- .../service/impl/SysDictTypeServiceImpl.java | 6 +- .../impl/SysLogininforServiceImpl.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 8 +- .../service/impl/SysNoticeServiceImpl.java | 4 +- .../service/impl/SysOperLogServiceImpl.java | 4 +- .../impl/SysPermissionServiceImpl.java | 6 +- .../service/impl/SysPostServiceImpl.java | 6 +- 61 files changed, 738 insertions(+), 203 deletions(-) delete mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java create mode 100644 cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaasService.java rename cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/{RemoteEntFallbackFactory.java => RemoteSaasFallbackFactory.java} (53%) create mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java create mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java create mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java create mode 100644 cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java create mode 100644 cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml create mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPermissionController.java diff --git a/cloud-auth/pom.xml b/cloud-auth/pom.xml index 0a76aae..3921e2a 100644 --- a/cloud-auth/pom.xml +++ b/cloud-auth/pom.xml @@ -16,23 +16,10 @@ - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - + + + + @@ -58,6 +45,48 @@ cloud-common-api-doc + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + diff --git a/cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java b/cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java index e6ea4fd..404413f 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java +++ b/cloud-auth/src/main/java/com/muyu/auth/CloudAuthApplication.java @@ -1,5 +1,8 @@ package com.muyu.auth; +import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; +import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; +import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -10,8 +13,15 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * * @author muyu */ +@EnableCustomConfig @EnableMyFeignClients -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@SpringBootApplication( + exclude = { + DataSourceAutoConfiguration.class, + DruidDataSourceAutoConfigure.class, + DynamicDataSourceAutoConfiguration.class + } +) public class CloudAuthApplication { public static void main (String[] args) { SpringApplication.run(CloudAuthApplication.class, args); diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index b4a964d..8c84466 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -10,7 +10,7 @@ import com.muyu.common.security.auth.AuthUtil; import com.muyu.common.security.service.TokenService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -25,10 +25,10 @@ import jakarta.servlet.http.HttpServletRequest; */ @RestController public class TokenController { - @Autowired + @Resource private TokenService tokenService; - @Autowired + @Resource private SysLoginService sysLoginService; @PostMapping("login") diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index 328646b..6cfe874 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -13,12 +13,16 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.remote.RemoteSaasService; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.LoginUser; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Component; +import java.util.Set; + + /** * 登录校验方法 * @@ -26,18 +30,21 @@ import org.springframework.stereotype.Component; */ @Component public class SysLoginService { - @Autowired + @Resource private RemoteUserService remoteUserService; - @Autowired + @Resource private SysPasswordService passwordService; - @Autowired + @Resource private SysRecordLogService recordLogService; - @Autowired + @Resource private RedisService redisService; + @Resource + private RemoteSaasService remoteSaasService; + /** * 登录 */ @@ -69,7 +76,7 @@ public class SysLoginService { throw new ServiceException("很遗憾，访问IP已被列入系统黑名单"); } // 查询用户信息 - Result userResult = remoteUserService.getUserInfo(firmCode, username, SecurityConstants.INNER); + Result userResult = remoteSaasService.getUserInfo(firmCode, username, SecurityConstants.INNER); if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在"); @@ -80,8 +87,7 @@ public class SysLoginService { throw new ServiceException(userResult.getMsg()); } - LoginUser userInfo = userResult.getData(); - SysUser user = userResult.getData().getSysUser(); + SysUser user = userResult.getData(); if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除"); throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); @@ -92,7 +98,16 @@ public class SysLoginService { } passwordService.validate(user, password); recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); - return userInfo; + + // 角色集合 + Set roles = remoteUserService.getRolePermission(user); + // 权限集合 + Set permissions = remoteUserService.getMenuPermission(user); + LoginUser sysUserVo = new LoginUser(); + sysUserVo.setSysUser(user); + sysUserVo.setRoles(roles); + sysUserVo.setPermissions(permissions); + return sysUserVo; } public void logout (String loginName) { diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java index 5f3c126..3303738 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysPasswordService.java @@ -6,7 +6,7 @@ import com.muyu.common.core.exception.ServiceException; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysUser; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; @@ -18,14 +18,14 @@ import java.util.concurrent.TimeUnit; */ @Component public class SysPasswordService { - @Autowired + @Resource private RedisService redisService; private int maxRetryCount = CacheConstants.PASSWORD_MAX_RETRY_COUNT; private Long lockTime = CacheConstants.PASSWORD_LOCK_TIME; - @Autowired + @Resource private SysRecordLogService recordLogService; /** diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java index 2d4de80..c4ae5e1 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysRecordLogService.java @@ -6,7 +6,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.ip.IpUtils; import com.muyu.common.system.remote.RemoteLogService; import com.muyu.common.system.domain.SysLogininfor; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Component; /** @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; */ @Component public class SysRecordLogService { - @Autowired + @Resource private RemoteLogService remoteLogService; /** diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index 6095cbf..fee414d 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -27,4 +27,6 @@ public class ServiceNameConstants { public static final String SMART_SERVICE = "cloud-smart-car"; public static final String ENT_SERVICE = "cloud-ent"; + + public static final String SAAS_SERVICE = "cloud-system-saas"; } diff --git a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java index f82ffab..b8cabc4 100644 --- a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java +++ b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/aspect/LogAspect.java @@ -18,7 +18,7 @@ import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.core.NamedThreadLocal; import org.springframework.http.HttpMethod; import org.springframework.stereotype.Component; @@ -48,7 +48,7 @@ public class LogAspect { */ private static final ThreadLocal TIME_THREADLOCAL = new NamedThreadLocal("Cost Time"); - @Autowired + @Resource private AsyncLogService asyncLogService; /** diff --git a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java index 46e1cdf..ab2d064 100644 --- a/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java +++ b/cloud-common/cloud-common-log/src/main/java/com/muyu/common/log/service/AsyncLogService.java @@ -3,7 +3,7 @@ package com.muyu.common.log.service; import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.system.remote.RemoteLogService; import com.muyu.common.system.domain.SysOperLog; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -14,7 +14,7 @@ import org.springframework.stereotype.Service; */ @Service public class AsyncLogService { - @Autowired + @Resource private RemoteLogService remoteLogService; /** diff --git a/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java b/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java index 51cb359..af09bfd 100644 --- a/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java +++ b/cloud-common/cloud-common-rabbit/src/main/java/com/muyu/common/rabbit/RabbitListenerConfigurer.java @@ -2,7 +2,7 @@ package com.muyu.common.rabbit; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistrar; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.messaging.converter.MappingJackson2MessageConverter; @@ -16,7 +16,7 @@ public class RabbitListenerConfigurer implements org.springframework.amqp.rabbit } //以下配置RabbitMQ消息服务 - @Autowired + @Resource public ConnectionFactory connectionFactory; diff --git a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java index db90c1e..cbd59db 100644 --- a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java @@ -1,6 +1,6 @@ package com.muyu.common.redis.service; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.data.redis.core.BoundSetOperations; import org.springframework.data.redis.core.HashOperations; import org.springframework.data.redis.core.RedisTemplate; @@ -18,7 +18,7 @@ import java.util.concurrent.TimeUnit; @SuppressWarnings(value = {"unchecked", "rawtypes"}) @Component public class RedisService { - @Autowired + @Resource public RedisTemplate redisTemplate; /** diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 7c4fda3..ce887d6 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -1,10 +1,8 @@ package com.muyu.cloud.common.many.datasource; -import cn.hutool.json.JSONObject; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; -import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; import com.muyu.cloud.common.saas.domain.model.EntInfo; import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory; import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo; @@ -12,30 +10,17 @@ import com.muyu.cloud.common.many.datasource.role.DynamicDataSource; import com.muyu.cloud.common.saas.exception.SaaSException; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.system.domain.SysEnt; -import com.muyu.common.system.domain.SysFirmUser; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.remote.RemoteEntService; import com.muyu.common.system.remote.RemoteUserService; import lombok.extern.log4j.Log4j2; -import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.boot.autoconfigure.MybatisAutoConfiguration; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @Author: DongZeLiang @@ -83,7 +68,7 @@ public class ManyDataSource implements ApplicationRunner{ public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { // 企业列表 企业CODE，端口，IP Map dataSourceMap = new HashMap<>(); - dataSourceInfoList() + Objects.requireNonNull(dataSourceInfoList()) .stream() .map(DataSourceInfo::hostAndPortBuild) .forEach(dataSourceInfo -> { diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/role/DynamicDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/role/DynamicDataSource.java index 694bb41..6bc47c4 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/role/DynamicDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/role/DynamicDataSource.java @@ -6,6 +6,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.jdbc.datasource.lookup.AbstractRoutingDataSource; import java.util.List; @@ -19,6 +20,7 @@ import java.util.Map; */ @EqualsAndHashCode(callSuper = true) @Data +@Slf4j @AllArgsConstructor @NoArgsConstructor public class DynamicDataSource extends AbstractRoutingDataSource { @@ -42,8 +44,12 @@ public class DynamicDataSource extends AbstractRoutingDataSource { * @param value 数据源 */ public void put(String key, DruidDataSource value) { - defineTargetDataSources.put(key, value); - this.afterPropertiesSet(); + if (value!=null) { + defineTargetDataSources.put(key, value); + this.afterPropertiesSet(); + }else{ + log.warn("Key为 {} 的数据源为空!",key); + } } /** diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java index ec72e6e..f1dac5a 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java @@ -12,7 +12,7 @@ public class WebMvcSaaSConfig implements WebMvcConfigurer { /** * 不需要拦截的地址 */ - public static final String[] EXCLUDE_URLS = {"/dept/**", "/login", "/logout", "/refresh"}; + public static final String[] EXCLUDE_URLS = {"/user/info", "/login", "/logout", "/refresh"}; @Override public void addInterceptors (InterceptorRegistry registry) { diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java index 30d2af7..1161caa 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java @@ -12,7 +12,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Component; import jakarta.servlet.http.HttpServletRequest; @@ -34,7 +34,7 @@ public class TokenService { private final static long expireTime = CacheConstants.EXPIRATION; private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY; - @Autowired + @Resource private RedisService redisService; /** diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java deleted file mode 100644 index ba0bf52..0000000 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteEntService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.common.system.remote; - -import com.muyu.common.core.constant.ServiceNameConstants; -import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysEnt; -import com.muyu.common.system.remote.factory.RemoteEntFallbackFactory; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; - -import java.util.List; - -/** - * 文件服务 - * - * @author muyu - */ -@FeignClient(contextId = "remoteEntService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteEntFallbackFactory.class) -public interface RemoteEntService { - - -} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaasService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaasService.java new file mode 100644 index 0000000..9f2d7a1 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteSaasService.java @@ -0,0 +1,32 @@ +package com.muyu.common.system.remote; + +import com.muyu.common.core.constant.SecurityConstants; +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.factory.RemoteSaasFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestHeader; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * 文件服务 + * + * @author muyu + */ +@FeignClient(contextId = "remoteSaasService", value = ServiceNameConstants.SAAS_SERVICE, fallbackFactory = RemoteSaasFallbackFactory.class) +public interface RemoteSaasService { + + /** + * 通过用户名查询用户信息 + * + * @param firmCode + * @param username 用户名 + * @param source 请求来源 + * @return 结果 + */ + @GetMapping("/user/info") + public Result getUserInfo (@RequestParam("firmCode") String firmCode, @RequestParam("userName") String userName, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + +} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index 5a1936e..5f5e545 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -13,6 +13,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Set; /** * 用户服务 @@ -21,16 +22,6 @@ import java.util.List; */ @FeignClient(contextId = "remoteUserService", value = ServiceNameConstants.SYSTEM_SERVICE, fallbackFactory = RemoteUserFallbackFactory.class) public interface RemoteUserService { - /** - * 通过用户名查询用户信息 - * - * @param username 用户名 - * @param source 请求来源 - * - * @return 结果 - */ - @GetMapping("/user/info") - public Result getUserInfo (@RequestParam("firmCode") String firmCode,@RequestParam("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 注册用户信息 @@ -48,4 +39,24 @@ public interface RemoteUserService { @PostMapping("/ent/list") public Result> list (@RequestBody SysEnt sysEnt); + + /** + * 获取角色数据权限 + * + * @param user 用户 + * + * @return 角色权限信息 + */ + @PostMapping("/permission/getRole") + public Set getRolePermission (@RequestBody SysUser user); + + /** + * 获取菜单数据权限 + * + * @param user 用户 + * + * @return 菜单权限信息 + */ + @PostMapping("/permission/getMenu") + public Set getMenuPermission (@RequestBody SysUser user); } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaasFallbackFactory.java similarity index 53% rename from cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java rename to cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaasFallbackFactory.java index c733432..39dc4de 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteEntFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteSaasFallbackFactory.java @@ -9,13 +9,11 @@ package com.muyu.common.system.remote.factory; import com.muyu.common.core.domain.Result; -import com.muyu.common.system.domain.SysEnt; -import com.muyu.common.system.remote.RemoteEntService; +import com.muyu.common.system.domain.SysUser; +import com.muyu.common.system.remote.RemoteSaasService; import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; -import java.util.List; - /** * @Author: 胡杨 * @Name: RemoteEntFallbackFactory @@ -24,11 +22,15 @@ import java.util.List; * @FilePath: com.muyu.common.system.remote */ @Component -public class RemoteEntFallbackFactory implements FallbackFactory { +public class RemoteSaasFallbackFactory implements FallbackFactory { @Override - public RemoteEntService create(Throwable cause) { - return new RemoteEntService() { + public RemoteSaasService create(Throwable cause) { + return new RemoteSaasService() { + @Override + public Result getUserInfo(String firmCode, String username, String source) { + return Result.error("获取用户失败:" + cause.getMessage()); + } }; } } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 0d219ea..6f52a69 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -13,6 +13,7 @@ import org.springframework.cloud.openfeign.FallbackFactory; import org.springframework.stereotype.Component; import java.util.List; +import java.util.Set; /** * 用户服务降级处理 @@ -28,11 +29,6 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfo(String firmCode, String username, String source) { - return Result.error("获取用户失败:" + throwable.getMessage()); - } - @Override public Result registerUserInfo (SysUser sysUser, String source) { return Result.error("注册用户失败:" + throwable.getMessage()); @@ -48,6 +44,16 @@ public class RemoteUserFallbackFactory implements FallbackFactory getRolePermission(SysUser user) { + return Set.of(); + } + + @Override + public Set getMenuPermission(SysUser user) { + return Set.of(); + } + }; } } diff --git a/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index b1c8d8c..6076e55 100644 --- a/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,4 +1,4 @@ com.muyu.common.system.remote.factory.RemoteUserFallbackFactory com.muyu.common.system.remote.factory.RemoteLogFallbackFactory com.muyu.common.system.remote.factory.RemoteFileFallbackFactory -com.muyu.common.system.remote.factory.RemoteEntFallbackFactory +com.muyu.common.system.remote.factory.RemoteSaasFallbackFactory diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java b/cloud-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java index 41b8e47..cc95d0a 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/config/RouterFunctionConfiguration.java @@ -1,7 +1,7 @@ package com.muyu.gateway.config; import com.muyu.gateway.handler.ValidateCodeHandler; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; @@ -16,7 +16,7 @@ import org.springframework.web.reactive.function.server.RouterFunctions; */ @Configuration public class RouterFunctionConfiguration { - @Autowired + @Resource private ValidateCodeHandler validateCodeHandler; @SuppressWarnings("rawtypes") diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java index bda6f2f..965c63b 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java @@ -12,7 +12,7 @@ import com.muyu.gateway.config.properties.IgnoreWhiteProperties; import io.jsonwebtoken.Claims; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; import org.springframework.core.Ordered; @@ -31,10 +31,10 @@ public class AuthFilter implements GlobalFilter, Ordered { private static final Logger log = LoggerFactory.getLogger(AuthFilter.class); // 排除过滤的 uri 地址，nacos自行添加 - @Autowired + @Resource private IgnoreWhiteProperties ignoreWhite; - @Autowired + @Resource private RedisService redisService; diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java index c19c944..ea94b85 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/ValidateCodeFilter.java @@ -6,7 +6,7 @@ import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.StringUtils; import com.muyu.gateway.config.properties.CaptchaProperties; import com.muyu.gateway.service.ValidateCodeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.cloud.gateway.filter.GatewayFilter; import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory; import org.springframework.core.io.buffer.DataBuffer; @@ -29,9 +29,9 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory { private final static String[] VALIDATE_URL = new String[]{"/auth/login", "/auth/register"}; private static final String CODE = "code"; private static final String UUID = "uuid"; - @Autowired + @Resource private ValidateCodeService validateCodeService; - @Autowired + @Resource private CaptchaProperties captchaProperties; @Override diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java index 4316d84..719dd4d 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/XssFilter.java @@ -4,7 +4,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.html.EscapeUtil; import com.muyu.gateway.config.properties.XssProperties; import io.netty.buffer.ByteBufAllocator; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.cloud.gateway.filter.GatewayFilterChain; import org.springframework.cloud.gateway.filter.GlobalFilter; @@ -31,7 +31,7 @@ import java.nio.charset.StandardCharsets; @ConditionalOnProperty(value = "security.xss.enabled", havingValue = "true") public class XssFilter implements GlobalFilter, Ordered { // 跨站脚本的 xss 配置，nacos自行添加 - @Autowired + @Resource private XssProperties xss; @Override diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java b/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java index f3b3206..3daceb5 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/handler/ValidateCodeHandler.java @@ -3,7 +3,7 @@ package com.muyu.gateway.handler; import com.muyu.common.core.exception.CaptchaException; import com.muyu.common.core.domain.Result; import com.muyu.gateway.service.ValidateCodeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Component; import org.springframework.web.reactive.function.BodyInserters; @@ -21,7 +21,7 @@ import java.io.IOException; */ @Component public class ValidateCodeHandler implements HandlerFunction { - @Autowired + @Resource private ValidateCodeService validateCodeService; @Override diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java index 978a3b4..8e00059 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/service/impl/ValidateCodeServiceImpl.java @@ -12,7 +12,7 @@ import com.muyu.common.redis.service.RedisService; import com.muyu.gateway.config.properties.CaptchaProperties; import com.muyu.gateway.model.resp.CaptchaCodeResp; import com.muyu.gateway.service.ValidateCodeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.util.FastByteArrayOutputStream; @@ -35,10 +35,10 @@ public class ValidateCodeServiceImpl implements ValidateCodeService { @Resource(name = "captchaProducerMath") private Producer captchaProducerMath; - @Autowired + @Resource private RedisService redisService; - @Autowired + @Resource private CaptchaProperties captchaProperties; /** diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java index ed04d11..fa9ff45 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/controller/SysFileController.java @@ -6,7 +6,7 @@ import com.muyu.file.service.ISysFileService; import com.muyu.common.system.domain.SysFile; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.annotation.RestController; @@ -21,7 +21,7 @@ import org.springframework.web.multipart.MultipartFile; public class SysFileController { private static final Logger log = LoggerFactory.getLogger(SysFileController.class); - @Autowired + @Resource private ISysFileService sysFileService; /** diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java index 9a50de4..29dfe17 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/service/MinioSysFileServiceImpl.java @@ -5,7 +5,7 @@ import com.muyu.file.config.MinioConfig; import com.muyu.file.utils.FileUploadUtils; import io.minio.MinioClient; import io.minio.PutObjectArgs; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -18,10 +18,10 @@ import java.io.InputStream; */ @Service public class MinioSysFileServiceImpl implements ISysFileService { - @Autowired + @Resource private MinioConfig minioConfig; - @Autowired + @Resource private MinioClient client; /** diff --git a/cloud-modules/cloud-modules-system-saas/pom.xml b/cloud-modules/cloud-modules-system-saas/pom.xml index 42a5e88..b9983d0 100644 --- a/cloud-modules/cloud-modules-system-saas/pom.xml +++ b/cloud-modules/cloud-modules-system-saas/pom.xml @@ -22,6 +22,12 @@ com.muyu cloud-common-saas + + + com.muyu + cloud-common-system + + com.alibaba.cloud @@ -76,12 +82,6 @@ cloud-common-api-doc - - - com.muyu - cloud-common-xxl - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java new file mode 100644 index 0000000..7ecba35 --- /dev/null +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java @@ -0,0 +1,45 @@ +package com.muyu.system.saas.controller; + +import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.security.annotation.InnerAuth; +import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.system.saas.service.SysUserService; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import lombok.extern.slf4j.Slf4j; + +/** + * @Author: 胡杨 + * @Name: SysUser + * @Description: + * @CreatedDate: 2024/9/23 下午8:55 + * @FilePath: com.muyu.system.saas.controller + */ +@Slf4j +@RestController +@RequestMapping("/user") +public class SysUserController { + @Resource + private SysUserService userService; + + @InnerAuth + @GetMapping("/info") + public Result info ( + @RequestParam("firmCode") String firmCode, + @RequestParam("userName") String userName) { + DynamicDataSourceHolder.setDynamicDataSourceKey(firmCode); + SysUser sysUser = userService.selectUserByUserName(userName); + if (StringUtils.isNull(sysUser)) { + return Result.error("用户名或密码错误"); + } + return Result.success(sysUser); + } +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java new file mode 100644 index 0000000..a835961 --- /dev/null +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java @@ -0,0 +1,22 @@ +package com.muyu.system.saas.mapper; + +import com.muyu.common.system.domain.SysUser; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Author: 胡杨 + * @Name: SysUser + * @Description: + * @CreatedDate: 2024/9/23 下午8:53 + * @FilePath: com.muyu.system.saas.mapper + */ + + +@Repository +@Mapper +public interface SysUserMapper extends BaseMapper { + SysUser selectUserByUserName(@Param("userName") String userName); +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java new file mode 100644 index 0000000..8397088 --- /dev/null +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java @@ -0,0 +1,18 @@ +package com.muyu.system.saas.service; + + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.system.domain.SysUser; + + +/** + * @Author: 胡杨 + * @Name: SysUser + * @Description: + * @CreatedDate: 2024/9/23 下午8:55 + * @FilePath: com.muyu.system.saas.service.impl + */ + +public interface SysUserService extends IService { + SysUser selectUserByUserName(String userName); +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java new file mode 100644 index 0000000..f2422a4 --- /dev/null +++ b/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java @@ -0,0 +1,33 @@ +package com.muyu.system.saas.service.impl; + + +import javax.annotation.Resource; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.common.system.domain.SysUser; +import org.springframework.stereotype.Service; +import lombok.extern.slf4j.Slf4j; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.system.saas.mapper.SysUserMapper; +import com.muyu.system.saas.service.SysUserService; + +/** + * @Author: 胡杨 + * @Name: SysUser + * @Description: + * @CreatedDate: 2024/9/23 下午8:55 + * @FilePath: com.muyu.system.saas.service.impl + */ + +@Slf4j +@Service +public class SysUserServiceImpl extends ServiceImpl + implements SysUserService { + @Resource + private SysUserMapper userMapper; + + @Override + public SysUser selectUserByUserName(String userName) { + return userMapper.selectUserByUserName(userName); + } +} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml new file mode 100644 index 0000000..514206d --- /dev/null +++ b/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select u.user_id, + u.is_admin, + u.dept_id, + u.firm_code, + u.user_name, + u.nick_name, + u.email, + u.avatar, + u.phonenumber, + u.password, + u.sex, + u.status, + u.del_flag, + u.login_ip, + u.login_date, + u.create_by, + u.create_time, + u.remark, + d.dept_id, + d.parent_id, + d.ancestors, + d.dept_name, + d.order_num, + d.leader, + d.status as dept_status, + r.role_id, + r.role_name, + r.role_key, + r.role_sort, + r.data_scope, + r.status as role_status + from sys_user u + left join sys_dept d on u.dept_id = d.dept_id + left join sys_user_role ur on u.user_id = ur.user_id + left join sys_role r on r.role_id = ur.role_id + + + + + + + + + + + + + + + + + + + + + + insert into sys_user( + user_id, + dept_id, + is_admin, + user_name, + firm_code, + nick_name, + email, + avatar, + phonenumber, + sex, + password, + status, + create_by, + remark, + create_time + )values( + #{userId}, + #{deptId}, + #{isAdmin}, + #{userName}, + #{firmCode}, + #{nickName}, + #{email}, + #{avatar}, + #{phonenumber}, + #{sex}, + #{password}, + #{status}, + #{createBy}, + #{remark}, + sysdate() + ) + + + + update sys_user + + dept_id = #{deptId}, + user_name = #{userName}, + firm_code = #{firmCode}, + nick_name = #{nickName}, + email = #{email}, + phonenumber = #{phonenumber}, + sex = #{sex}, + avatar = #{avatar}, + password = #{password}, + status = #{status}, + login_ip = #{loginIp}, + login_date = #{loginDate}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where user_id = #{userId} + + + + update sys_user + set status = #{status} + where user_id = #{userId} + + + + update sys_user + set avatar = #{avatar} + where user_name = #{userName} + + + + update sys_user + set password = #{password} + where user_name = #{userName} + + + + update sys_user + set del_flag = '2' + where user_id = #{userId} + + + + update sys_user set del_flag = '2' where user_id in + + #{userId} + + + + diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index 3bced52..f1b9dad 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -13,7 +13,7 @@ import com.muyu.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,7 +30,7 @@ import java.util.List; @Tag(name = "SysConfigController", description = "系统参数配置") public class SysConfigController extends BaseController { - @Autowired + @Resource private SysConfigService configService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 3818d11..aad1892 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -11,7 +11,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.system.service.SysDeptService; import org.apache.commons.lang3.ArrayUtils; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -26,7 +26,7 @@ import java.util.List; @RequestMapping("/dept") public class SysDeptController extends BaseController { - @Autowired + @Resource private SysDeptService deptService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index f9862d9..23e080a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -12,7 +12,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.system.service.SysDictDataService; import com.muyu.system.service.SysDictTypeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -28,10 +28,10 @@ import java.util.List; @RestController @RequestMapping("/dict/data") public class SysDictDataController extends BaseController { - @Autowired + @Resource private SysDictDataService dictDataService; - @Autowired + @Resource private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index c4a7b9f..6a042bb 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -10,7 +10,7 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictType; import com.muyu.system.service.SysDictTypeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RestController @RequestMapping("/dict/type") public class SysDictTypeController extends BaseController { - @Autowired + @Resource private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index c1e92b7..320b66e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -12,7 +12,7 @@ import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.service.SysLogininforService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse; @@ -26,10 +26,10 @@ import java.util.List; @RestController @RequestMapping("/logininfor") public class SysLogininforController extends BaseController { - @Autowired + @Resource private SysLogininforService logininforService; - @Autowired + @Resource private RedisService redisService; @RequiresPermissions("system:logininfor:list") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index e5ae348..2149ace 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -11,7 +11,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysMenu; import com.muyu.system.domain.resp.RoleMenuTreeResp; import com.muyu.system.service.SysMenuService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RestController @RequestMapping("/menu") public class SysMenuController extends BaseController { - @Autowired + @Resource private SysMenuService menuService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index e6b9ede..8314744 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -9,7 +9,7 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysNotice; import com.muyu.system.service.SysNoticeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -23,7 +23,7 @@ import java.util.List; @RestController @RequestMapping("/notice") public class SysNoticeController extends BaseController { - @Autowired + @Resource private SysNoticeService noticeService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index bb00d1d..6afe0fa 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -10,7 +10,7 @@ import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysOperLog; import com.muyu.system.service.SysOperLogService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.*; import jakarta.servlet.http.HttpServletResponse; @@ -24,7 +24,7 @@ import java.util.List; @RestController @RequestMapping("/operlog") public class SysOperlogController extends BaseController { - @Autowired + @Resource private SysOperLogService operLogService; @RequiresPermissions("system:operlog:list") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPermissionController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPermissionController.java new file mode 100644 index 0000000..a35427f --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPermissionController.java @@ -0,0 +1,55 @@ +package com.muyu.system.controller; + +import com.muyu.common.system.domain.SysUser; +import com.muyu.system.service.SysPermissionService; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import lombok.extern.slf4j.Slf4j; + +import java.util.HashSet; +import java.util.Set; + +/** + * @Author: 胡杨 + * @Name: SysPermission + * @Description: + * @CreatedDate: 2024/9/23 下午8:58 + * @FilePath: com.muyu.system.controller + */ +@Slf4j +@RestController +@RequestMapping("/permission") +public class SysPermissionController { + @Resource + private SysPermissionService permissionService; + + + /** + * 获取角色数据权限 + * + * @param user 用户 + * + * @return 角色权限信息 + */ + @PostMapping("/getRole") + public Set getRolePermission (@RequestBody SysUser user) { + return permissionService.getRolePermission(user); + } + + /** + * 获取菜单数据权限 + * + * @param user 用户 + * + * @return 菜单权限信息 + */ + @PostMapping("/getMenu") + public Set getMenuPermission (@RequestBody SysUser user) { + return permissionService.getMenuPermission(user); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 79f3f47..af9d64e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -10,7 +10,7 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysPost; import com.muyu.system.service.SysPostService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -25,7 +25,7 @@ import java.util.List; @RestController @RequestMapping("/post") public class SysPostController extends BaseController { - @Autowired + @Resource private SysPostService postService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java index a82c63c..3decd3f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -17,7 +17,7 @@ import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.resp.ProfileResp; import com.muyu.system.service.SysUserService; import jakarta.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -32,10 +32,10 @@ import java.util.Arrays; @RestController @RequestMapping("/user/profile") public class SysProfileController extends BaseController { - @Autowired + @Resource private SysUserService userService; - @Autowired + @Resource private TokenService tokenService; @Resource diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index 069c2e5..47f7432 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -16,7 +16,7 @@ import com.muyu.system.domain.resp.DeptTreeResp; import com.muyu.system.service.SysDeptService; import com.muyu.system.service.SysRoleService; import com.muyu.system.service.SysUserService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -31,13 +31,13 @@ import java.util.List; @RestController @RequestMapping("/role") public class SysRoleController extends BaseController { - @Autowired + @Resource private SysRoleService roleService; - @Autowired + @Resource private SysUserService userService; - @Autowired + @Resource private SysDeptService deptService; @RequiresPermissions("system:role:list") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index c98bea3..bec830c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -20,7 +20,7 @@ import com.muyu.system.domain.resp.UserInfoResp; import com.muyu.system.service.*; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -39,22 +39,22 @@ import java.util.stream.Collectors; @RestController @RequestMapping("/user") public class SysUserController extends BaseController { - @Autowired + @Resource private SysUserService userService; - @Autowired + @Resource private SysRoleService roleService; - @Autowired + @Resource private SysDeptService deptService; - @Autowired + @Resource private SysPostService postService; - @Autowired + @Resource private SysPermissionService permissionService; - @Autowired + @Resource private SysConfigService configService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 5b78721..b87594f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -12,7 +12,7 @@ import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.LoginUser; import com.muyu.system.domain.SysUserOnline; import com.muyu.system.service.SysUserOnlineService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; @@ -28,10 +28,10 @@ import java.util.List; @RestController @RequestMapping("/online") public class SysUserOnlineController extends BaseController { - @Autowired + @Resource private SysUserOnlineService userOnlineService; - @Autowired + @Resource private RedisService redisService; @RequiresPermissions("monitor:online:list") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java index 82c1c25..21ae678 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java @@ -8,7 +8,7 @@ //import org.springframework.amqp.rabbit.annotation.RabbitHandler; //import org.springframework.amqp.rabbit.annotation.RabbitListener; //import org.springframework.amqp.rabbit.core.RabbitTemplate; -//import org.springframework.beans.factory.annotation.Autowired; +//import javax.annotation.Resource; //import org.springframework.context.annotation.Bean; //import org.springframework.web.bind.annotation.RequestMapping; //import org.springframework.web.bind.annotation.RestController; @@ -18,7 +18,7 @@ //@RequestMapping("/rabbit/test") //public class RabbitTest { // -// @Autowired +// @Resource // private RabbitTemplate rabbitTemplate; // // @Bean diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index 6bdff41..d22f393 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -47,6 +47,7 @@ public interface SysUserService extends IService { */ public SysUser selectUserByUserName (String firmCode, String userName); + /** * 通过用户ID查询用户 * @@ -227,5 +228,4 @@ public interface SysUserService extends IService { public String importUser (List userList, Boolean isUpdateSupport, String operName); List selectCompanyList(); - } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index bc07cc8..fbfbe6c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -8,7 +8,7 @@ import com.muyu.common.redis.service.RedisService; import com.muyu.system.domain.SysConfig; import com.muyu.system.mapper.SysConfigMapper; import com.muyu.system.service.SysConfigService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -26,7 +26,7 @@ import java.util.Objects; public class SysConfigServiceImpl extends ServiceImpl implements SysConfigService { - @Autowired + @Resource private RedisService redisService; @Override diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index 7c1a980..00d97f4 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -15,7 +15,7 @@ import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.mapper.SysDeptMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.service.SysDeptService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,10 +31,10 @@ import java.util.stream.Collectors; */ @Service public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { - @Autowired + @Resource private SysDeptMapper deptMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java index 777ffbd..a2a30d2 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java @@ -5,7 +5,7 @@ import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.service.SysDictDataService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; */ @Service public class SysDictDataServiceImpl extends ServiceImpl implements SysDictDataService { - @Autowired + @Resource private SysDictDataMapper dictDataMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java index 4117411..a9af78c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java @@ -10,7 +10,7 @@ import com.muyu.common.system.domain.SysDictType; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.mapper.SysDictTypeMapper; import com.muyu.system.service.SysDictTypeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,10 +27,10 @@ import java.util.stream.Collectors; */ @Service public class SysDictTypeServiceImpl extends ServiceImpl implements SysDictTypeService { - @Autowired + @Resource private SysDictTypeMapper dictTypeMapper; - @Autowired + @Resource private SysDictDataMapper dictDataMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index 1a7c7a0..15dffed 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.mapper.SysLogininforMapper; import com.muyu.system.service.SysLogininforService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -17,7 +17,7 @@ import java.util.List; @Service public class SysLogininforServiceImpl extends ServiceImpl implements SysLogininforService { - @Autowired + @Resource private SysLogininforMapper logininforMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index d23ecdb..0a17000 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -15,7 +15,7 @@ import com.muyu.system.mapper.SysMenuMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; import com.muyu.system.service.SysMenuService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.*; @@ -30,13 +30,13 @@ import java.util.stream.Collectors; public class SysMenuServiceImpl extends ServiceImpl implements SysMenuService { public static final String PREMISSION_STRING = "perms[\"{0}\"]"; - @Autowired + @Resource private SysMenuMapper menuMapper; - @Autowired + @Resource private SysRoleMapper roleMapper; - @Autowired + @Resource private SysRoleMenuMapper roleMenuMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index 8c0c8d5..61b6df9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.system.domain.SysNotice; import com.muyu.system.mapper.SysNoticeMapper; import com.muyu.system.service.SysNoticeService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; */ @Service public class SysNoticeServiceImpl extends ServiceImpl implements SysNoticeService { - @Autowired + @Resource private SysNoticeMapper noticeMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java index 24e7d39..56487ca 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysOperLog; import com.muyu.system.mapper.SysOperLogMapper; import com.muyu.system.service.SysOperLogService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -16,7 +16,7 @@ import java.util.List; */ @Service public class SysOperLogServiceImpl extends ServiceImpl implements SysOperLogService { - @Autowired + @Resource private SysOperLogMapper operLogMapper; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java index bcc2afb..98e6692 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java @@ -6,7 +6,7 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.system.service.SysMenuService; import com.muyu.system.service.SysPermissionService; import com.muyu.system.service.SysRoleService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -21,10 +21,10 @@ import java.util.Set; */ @Service public class SysPermissionServiceImpl implements SysPermissionService { - @Autowired + @Resource private SysRoleService roleService; - @Autowired + @Resource private SysMenuService menuService; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 457ac5a..4ee6ffe 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -8,7 +8,7 @@ import com.muyu.system.domain.SysPost; import com.muyu.system.mapper.SysPostMapper; import com.muyu.system.mapper.SysUserPostMapper; import com.muyu.system.service.SysPostService; -import org.springframework.beans.factory.annotation.Autowired; +import javax.annotation.Resource; import org.springframework.stereotype.Service; import java.util.List; @@ -20,10 +20,10 @@ import java.util.List; */ @Service public class SysPostServiceImpl extends ServiceImpl implements SysPostService { - @Autowired + @Resource private SysPostMapper postMapper; - @Autowired + @Resource private SysUserPostMapper userPostMapper; /**