From fee737f5e9ca0f062c3f0111e803138c64364ec1 Mon Sep 17 00:00:00 2001 From: zhaowenyuan Date: Tue, 11 Jun 2024 09:57:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4=20sysUser,sysDept,sysRo?= =?UTF-8?q?le=20=E6=89=80=E5=9C=A8=E4=BD=8D=E7=BD=AE,=20=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E6=97=B6=E7=9A=84redis=20?= =?UTF-8?q?=E8=BD=AC=E6=8D=A2Bug=202.=20=E6=B7=BB=E5=8A=A0=20task=20?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1,=203.=20todo=20=E5=BE=85=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=98=9F=E5=88=97=E8=8E=B7=E5=8F=96=E5=90=8E=E5=8F=B0=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E4=BB=A5=E5=8F=8A=E5=90=8E=E5=8F=B0=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=9A=84=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascope/aspect/DataScopeAspect.java | 4 +- .../chushang-common-security/pom.xml | 4 + .../security/entity/po}/DataScopeEntity.java | 2 +- .../chushang/security}/entity/po/SysDept.java | 7 +- .../chushang/security}/entity/po/SysRole.java | 3 +- .../chushang/security}/entity/po/SysUser.java | 3 +- .../security/entity/vo/LoginUser.java | 10 +- .../security/service/TokenService.java | 1 + .../security/utils/SecurityUtils.java | 2 +- .../auth/controller/UserController.java | 10 +- .../chushang/auth/service/UserService.java | 10 +- .../oss/controller/FileController.java | 2 +- .../chushang-module-system/pom.xml | 10 ++ .../system-feign/pom.xml | 4 - .../chushang/system/entity/vo/TreeSelect.java | 4 +- .../system/feign/RemoteUserService.java | 6 +- .../system-service/pom.xml | 1 - .../system/controller/DeptController.java | 2 +- .../system/controller/MenuController.java | 6 +- .../system/controller/PostController.java | 6 +- .../system/controller/RoleController.java | 2 +- .../system/controller/UserController.java | 10 +- .../chushang/system/mapper/SysDeptMapper.java | 2 +- .../chushang/system/mapper/SysRoleMapper.java | 2 +- .../chushang/system/mapper/SysUserMapper.java | 2 +- .../system/remote/RemoteUserController.java | 8 +- .../system/service/ISysDeptService.java | 5 +- .../system/service/ISysMenuService.java | 2 +- .../system/service/ISysPermissionService.java | 7 +- .../system/service/ISysRoleService.java | 4 +- .../system/service/ISysUserService.java | 2 +- .../service/impl/SysDeptServiceImpl.java | 4 +- .../service/impl/SysMenuServiceImpl.java | 5 +- .../impl/SysPermissionServiceImpl.java | 8 +- .../service/impl/SysRoleServiceImpl.java | 8 +- .../service/impl/SysUserServiceImpl.java | 2 +- .../main/resources/mapper/SysDeptMapper.xml | 2 +- .../main/resources/mapper/SysRoleMapper.xml | 4 +- .../main/resources/mapper/SysUserMapper.xml | 8 +- .../src/test/java/DemoTest.java | 2 +- .../chushang-module-task/.gitignore | 64 ++++++++++ chushang-modules/chushang-module-task/pom.xml | 63 ++++++++++ .../chushang-module-task/task-feign/pom.xml | 30 +++++ .../com/chushang/task/entity/TaskInfo.java | 108 ++++++++++++++++ .../chushang-module-task/task-service/pom.xml | 118 ++++++++++++++++++ .../java/com/chushang/TaskApplication.java | 48 +++++++ .../task/controller/TaskController.java | 34 +++++ .../chushang/task/mapper/TaskInfoMapper.java | 10 ++ .../task/service/TaskInfoService.java | 27 ++++ .../service/impl/TaskInfoServiceImpl.java | 38 ++++++ .../src/main/resources/application.yml | 90 +++++++++++++ .../src/main/resources/bootstrap.yml | 29 +++++ .../src/main/resources/logback-nacos.xml | 111 ++++++++++++++++ .../main/resources/mapper/TaskInfoMapper.xml | 28 +++++ chushang-modules/pom.xml | 1 + 55 files changed, 893 insertions(+), 92 deletions(-) rename chushang-common/{chushang-common-data-scope/src/main/java/com/chushang/datascope/entity => chushang-common-security/src/main/java/com/chushang/security/entity/po}/DataScopeEntity.java (94%) rename {chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system => chushang-common/chushang-common-security/src/main/java/com/chushang/security}/entity/po/SysDept.java (95%) rename {chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system => chushang-common/chushang-common-security/src/main/java/com/chushang/security}/entity/po/SysRole.java (96%) rename {chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system => chushang-common/chushang-common-security/src/main/java/com/chushang/security}/entity/po/SysUser.java (96%) create mode 100644 chushang-modules/chushang-module-task/.gitignore create mode 100644 chushang-modules/chushang-module-task/pom.xml create mode 100644 chushang-modules/chushang-module-task/task-feign/pom.xml create mode 100644 chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/entity/TaskInfo.java create mode 100644 chushang-modules/chushang-module-task/task-service/pom.xml create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/TaskApplication.java create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/mapper/TaskInfoMapper.java create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/TaskInfoService.java create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/impl/TaskInfoServiceImpl.java create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/resources/application.yml create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/resources/bootstrap.yml create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/resources/logback-nacos.xml create mode 100644 chushang-modules/chushang-module-task/task-service/src/main/resources/mapper/TaskInfoMapper.xml diff --git a/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java b/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java index 04c9852..2d16c82 100644 --- a/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java +++ b/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/aspect/DataScopeAspect.java @@ -7,7 +7,7 @@ import com.chushang.common.core.util.StringUtils; import com.chushang.common.mybatis.base.BaseEntity; import com.chushang.datascope.annotation.DataScope; import com.chushang.datascope.constants.ScopeConstants; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.datascope.enums.ScopeKeyWord; import com.chushang.common.core.context.SecurityContextHolder; import com.chushang.security.utils.SecurityUtils; @@ -42,7 +42,7 @@ public class DataScopeAspect { protected void handleDataScope(final JoinPoint joinPoint) { // 获取当前的用户 - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); if (StringUtils.isNotNull(loginUser)) { List scopes = loginUser.getScopes(); Long userId = loginUser.getUserId(); diff --git a/chushang-common/chushang-common-security/pom.xml b/chushang-common/chushang-common-security/pom.xml index 4fffe29..818d2d9 100644 --- a/chushang-common/chushang-common-security/pom.xml +++ b/chushang-common/chushang-common-security/pom.xml @@ -20,6 +20,10 @@ com.chushang chushang-common-feign + + com.chushang + chushang-common-mybatis + diff --git a/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/entity/DataScopeEntity.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/DataScopeEntity.java similarity index 94% rename from chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/entity/DataScopeEntity.java rename to chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/DataScopeEntity.java index f0e8c10..ef68665 100644 --- a/chushang-common/chushang-common-data-scope/src/main/java/com/chushang/datascope/entity/DataScopeEntity.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/DataScopeEntity.java @@ -1,4 +1,4 @@ -package com.chushang.datascope.entity; +package com.chushang.security.entity.po; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDept.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysDept.java similarity index 95% rename from chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDept.java rename to chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysDept.java index cd3653f..1db0273 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysDept.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysDept.java @@ -1,10 +1,9 @@ -package com.chushang.system.entity.po; +package com.chushang.security.entity.po; import com.baomidou.mybatisplus.annotation.*; import com.chushang.common.mybatis.base.BaseEntity; import lombok.*; import lombok.experimental.Accessors; -import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -51,7 +50,7 @@ public class SysDept extends BaseEntity /** 父部门名称 */ @TableField(exist = false) private String parentName; - + /** 子部门 */ @TableField(exist = false) private List children = new ArrayList<>(); @@ -71,4 +70,4 @@ public class SysDept extends BaseEntity ) private String updateBy; -} \ No newline at end of file +} diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysRole.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysRole.java similarity index 96% rename from chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysRole.java rename to chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysRole.java index bd627a5..f8dd809 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysRole.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysRole.java @@ -1,10 +1,9 @@ -package com.chushang.system.entity.po; +package com.chushang.security.entity.po; import com.baomidou.mybatisplus.annotation.*; import com.chushang.common.mybatis.base.BaseEntity; import lombok.*; import lombok.experimental.Accessors; -import lombok.experimental.SuperBuilder; import java.util.Set; diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysUser.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysUser.java similarity index 96% rename from chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysUser.java rename to chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysUser.java index fba64be..90e99ca 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/po/SysUser.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/po/SysUser.java @@ -1,9 +1,8 @@ -package com.chushang.system.entity.po; +package com.chushang.security.entity.po; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.annotation.*; import com.chushang.common.mybatis.base.BaseEntity; -import com.chushang.datascope.entity.DataScopeEntity; import lombok.*; import lombok.experimental.Accessors; diff --git a/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/vo/LoginUser.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/vo/LoginUser.java index 2f5bd42..042f919 100644 --- a/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/vo/LoginUser.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/entity/vo/LoginUser.java @@ -1,7 +1,10 @@ package com.chushang.security.entity.vo; +import com.chushang.security.entity.po.DataScopeEntity; +import com.chushang.security.entity.po.SysUser; import lombok.Data; +import java.io.Serial; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -11,8 +14,9 @@ import java.util.Set; * by zhaowenyuan create 2022/5/19 12:09 */ @Data -public class LoginUser implements Serializable +public class LoginUser implements Serializable { + @Serial private static final long serialVersionUID = 1L; /** @@ -56,11 +60,11 @@ public class LoginUser implements Serializable /** * 用户数据权限 */ - private List scopes; + private List scopes; /** * 用户信息 */ - private T sysUser; + private SysUser sysUser; /** * 当前用户对应的 数据权限 */ diff --git a/chushang-common/chushang-common-security/src/main/java/com/chushang/security/service/TokenService.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/service/TokenService.java index ca29614..2bffaa2 100644 --- a/chushang-common/chushang-common-security/src/main/java/com/chushang/security/service/TokenService.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/service/TokenService.java @@ -109,6 +109,7 @@ public class TokenService } catch (Exception ignored) { + log.error("",ignored); } return null; } diff --git a/chushang-common/chushang-common-security/src/main/java/com/chushang/security/utils/SecurityUtils.java b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/utils/SecurityUtils.java index 40ca9c8..fc1988f 100644 --- a/chushang-common/chushang-common-security/src/main/java/com/chushang/security/utils/SecurityUtils.java +++ b/chushang-common/chushang-common-security/src/main/java/com/chushang/security/utils/SecurityUtils.java @@ -31,7 +31,7 @@ public class SecurityUtils public static boolean isAdmin(){ Long userId = SecurityContextHolder.getUserId(); - LoginUser loginUser = getLoginUser(); + LoginUser loginUser = getLoginUser(); Set roles = loginUser.getRoles(); // 包含 admin 的账号 或者 id == 1 的就是 admin -- 必须是 admin 的才是超管权限 boolean flag = roles.contains(AuthUtil.SUPER_ADMIN); diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/controller/UserController.java b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/controller/UserController.java index 890dd1b..8c8a822 100644 --- a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/controller/UserController.java +++ b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/controller/UserController.java @@ -5,13 +5,13 @@ import com.chushang.common.core.enums.PassCodeEnum; import com.chushang.common.core.util.JwtUtils; import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.AjaxResult; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.auth.AuthUtil; import com.chushang.security.service.TokenService; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.bo.LoginBody; import com.chushang.security.entity.vo.LoginUser; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -39,7 +39,7 @@ public class UserController public AjaxResult login(@RequestBody LoginBody form) { // 用户登录 - LoginUser loginUser = userService.login(form.getUsername(), form.getPassword(), PassCodeEnum.PLATFORM.getCode()); + LoginUser loginUser = userService.login(form.getUsername(), form.getPassword(), PassCodeEnum.PLATFORM.getCode()); // 获取登录token return AjaxResult.success(tokenService.createToken(loginUser, PassCodeEnum.PLATFORM.getCode())); } @@ -51,7 +51,7 @@ public class UserController public AjaxResult appLogin(@RequestBody LoginBody form) { // 用户登录 - LoginUser loginUser = userService.login(form.getUsername(), form.getPassword(), PassCodeEnum.APP.getCode()); + LoginUser loginUser = userService.login(form.getUsername(), form.getPassword(), PassCodeEnum.APP.getCode()); // 获取登录token return AjaxResult.success(tokenService.createToken(loginUser, PassCodeEnum.APP.getCode())); } @@ -63,7 +63,7 @@ public class UserController public AjaxResult miniLogin(@RequestBody LoginBody form) { // 用户登录 - LoginUser loginUser = userService.login(form.getUsername(), form.getPassword(), PassCodeEnum.MINI.getCode()); + LoginUser loginUser = userService.login(form.getUsername(), form.getPassword(), PassCodeEnum.MINI.getCode()); // 获取登录token return AjaxResult.success(tokenService.createToken(loginUser, PassCodeEnum.MINI.getCode())); } diff --git a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/service/UserService.java b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/service/UserService.java index f7c26fc..e356f2b 100644 --- a/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/service/UserService.java +++ b/chushang-modules/chushang-module-auth/auth-service/src/main/java/com/chushang/auth/service/UserService.java @@ -6,11 +6,11 @@ import com.chushang.common.core.exception.ResultException; import com.chushang.common.core.util.IPUtils; import com.chushang.common.core.util.ServletUtils; import com.chushang.common.core.web.Result; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.enums.LoginStatusEnum; import com.chushang.system.entity.po.SysLoginInfo; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.security.entity.vo.LoginUser; import com.chushang.system.feign.RemoteLoginInfoService; import com.chushang.system.feign.RemoteUserService; @@ -35,13 +35,13 @@ public class UserService { /** * 登录 */ - public LoginUser login(String username, String password, String appCode) + public LoginUser login(String username, String password, String appCode) { PassCodeEnum pce = PassCodeEnum.getEnumByCode(appCode); if (pce.getOpenReg()) { // 查询用户信息 long start = System.currentTimeMillis(); - Result> rLoginUser = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + Result rLoginUser = remoteUserService.getUserInfo(username, SecurityConstants.INNER); long end = System.currentTimeMillis(); log.info("time : {}",end - start); if (Result.FAIL_CODE == rLoginUser.getCode()){ @@ -51,7 +51,7 @@ public class UserService { recordLoginInfo(username, LoginStatusEnum.ACCOUNT_EMPTY); throw new ResultException("登录用户：" + username + " 不存在"); } - LoginUser loginUser = rLoginUser.getData(); + LoginUser loginUser = rLoginUser.getData(); SysUser sysUser = loginUser.getSysUser(); Boolean isPlatform = sysUser.getIsPlatform(); if (!isPlatform && !PassCodeEnum.PLATFORM.equals(pce)){ diff --git a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java index ccebc4c..33d74fc 100644 --- a/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java +++ b/chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/controller/FileController.java @@ -74,7 +74,7 @@ public class FileController { } @SysLog(value = "批量文件", businessType = BusinessType.DELETE) - @DeleteMapping(value = "/del/batch") + @PostMapping(value = "/del/batch") @RequiresPermissions("system:file:del") public AjaxResult delFile(@RequestBody List fids) { fileSourceService.delFileBatch(fids); diff --git a/chushang-modules/chushang-module-system/pom.xml b/chushang-modules/chushang-module-system/pom.xml index 3aac9fc..e86488e 100644 --- a/chushang-modules/chushang-module-system/pom.xml +++ b/chushang-modules/chushang-module-system/pom.xml @@ -23,6 +23,16 @@ system-feign system-service + + + + + com.chushang + system-feign + 1.0.0 + + + diff --git a/chushang-modules/chushang-module-system/system-feign/pom.xml b/chushang-modules/chushang-module-system/system-feign/pom.xml index 970902c..a270f9f 100644 --- a/chushang-modules/chushang-module-system/system-feign/pom.xml +++ b/chushang-modules/chushang-module-system/system-feign/pom.xml @@ -25,10 +25,6 @@ com.chushang chushang-common-feign - - com.chushang - chushang-common-security - com.chushang chushang-common-excel diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/vo/TreeSelect.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/vo/TreeSelect.java index 35f0338..14271f3 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/vo/TreeSelect.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/entity/vo/TreeSelect.java @@ -1,7 +1,7 @@ package com.chushang.system.entity.vo; import com.fasterxml.jackson.annotation.JsonInclude; -import com.chushang.system.entity.po.SysDept; +import com.chushang.security.entity.po.SysDept; import com.chushang.system.entity.po.SysMenu; import lombok.Getter; import lombok.Setter; @@ -13,7 +13,7 @@ import java.util.stream.Collectors; /** * Treeselect树结构实体类 - * + * * @author ruoyi */ @Setter diff --git a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java index 112bb69..cd9602a 100644 --- a/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java +++ b/chushang-modules/chushang-module-system/system-feign/src/main/java/com/chushang/system/feign/RemoteUserService.java @@ -2,10 +2,10 @@ package com.chushang.system.feign; import com.chushang.common.core.constant.SecurityConstants; import com.chushang.common.core.web.Result; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.entity.vo.LoginUser; import com.chushang.system.constants.SystemConstants; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -28,6 +28,6 @@ public interface RemoteUserService { * @return 结果 */ @GetMapping("/info/{username}") - Result> getUserInfo(@PathVariable(value = "username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + Result getUserInfo(@PathVariable(value = "username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/chushang-modules/chushang-module-system/system-service/pom.xml b/chushang-modules/chushang-module-system/system-service/pom.xml index dd6329c..cd6d9b7 100644 --- a/chushang-modules/chushang-module-system/system-service/pom.xml +++ b/chushang-modules/chushang-module-system/system-service/pom.xml @@ -21,7 +21,6 @@ com.chushang system-feign - 1.0.0 com.chushang diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DeptController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DeptController.java index 962942d..8dc8929 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DeptController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/DeptController.java @@ -6,7 +6,7 @@ import com.chushang.common.log.enums.BusinessType; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.dto.ListDeptDTO; -import com.chushang.system.entity.po.SysDept; +import com.chushang.security.entity.po.SysDept; import com.chushang.system.service.ISysDeptService; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java index 86ab515..6db7f22 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/MenuController.java @@ -5,12 +5,12 @@ import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.dto.ListMenuDTO; import com.chushang.system.entity.po.SysMenu; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.security.entity.vo.LoginUser; import com.chushang.system.service.ISysMenuService; import org.springframework.beans.factory.annotation.Autowired; @@ -158,7 +158,7 @@ public class MenuController { @GetMapping("/getRouters") public AjaxResult getRouters() { - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser sysUser = loginUser.getSysUser(); List menus = menuService.selectMenuTreeByUserId(sysUser); return AjaxResult.success(menuService.buildMenus(menus)); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/PostController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/PostController.java index 658070d..5620c5f 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/PostController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/PostController.java @@ -7,12 +7,12 @@ import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; import com.chushang.common.mybatis.page.CommonParam; import com.chushang.common.mybatis.utils.PageResult; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.security.entity.vo.LoginUser; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.po.SysPost; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.service.ISysPostService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -82,7 +82,7 @@ public class PostController { AssertUtil.invalidate(postService.checkPostUnique(postName), "新增岗位'" + post.getPostName() + "'失败，岗位编码已存在"); post.setCreateBy(SecurityUtils.getUsername()); - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser sysUser = loginUser.getSysUser(); Long deptId = sysUser.getDeptId(); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java index 15c3573..aef59af 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/RoleController.java @@ -9,7 +9,7 @@ import com.chushang.system.entity.bo.CancelUserRole; import com.chushang.system.entity.bo.RoleUser; import com.chushang.system.entity.dto.ListRoleDTO; import com.chushang.system.entity.dto.ListUserDTO; -import com.chushang.system.entity.po.SysRole; +import com.chushang.security.entity.po.SysRole; import com.chushang.system.service.ISysRoleService; import com.chushang.system.service.ISysUserService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java index eedecb9..6898c79 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/controller/UserController.java @@ -5,15 +5,15 @@ import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.log.annotation.SysLog; import com.chushang.common.log.enums.BusinessType; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.annotation.RequiresPermissions; import com.chushang.security.service.TokenService; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.bo.PasswordForm; import com.chushang.system.entity.dto.ListUserDTO; import com.chushang.system.entity.po.SysPost; -import com.chushang.system.entity.po.SysRole; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysRole; +import com.chushang.security.entity.po.SysUser; import com.chushang.security.entity.vo.LoginUser; import com.chushang.system.service.*; import org.apache.commons.lang3.ArrayUtils; @@ -96,7 +96,7 @@ public class UserController { @PutMapping("/profile") public AjaxResult updateProfile(@RequestBody SysUser user) { - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); String username = user.getUsername(); if (!sysUserService.checkUsername(username)){ SysUser sysUser = loginUser.getSysUser(); @@ -203,7 +203,7 @@ public class UserController { public AjaxResult updatePwd(@RequestBody @Valid PasswordForm form) { // 这里没有密码 - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser sysUser = loginUser.getSysUser(); if (!SecurityUtils.matchesPassword(form.getOldPassword(), sysUser.getSalt(), sysUser.getPassword())){ throw new ResultException("原密码不正确"); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysDeptMapper.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysDeptMapper.java index 21d9873..9dfa1c0 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysDeptMapper.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysDeptMapper.java @@ -2,7 +2,7 @@ package com.chushang.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.chushang.system.entity.dto.ListDeptDTO; -import com.chushang.system.entity.po.SysDept; +import com.chushang.security.entity.po.SysDept; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysRoleMapper.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysRoleMapper.java index 9f6241d..a4d37b7 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysRoleMapper.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysRoleMapper.java @@ -3,7 +3,7 @@ package com.chushang.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chushang.system.entity.dto.ListRoleDTO; -import com.chushang.system.entity.po.SysRole; +import com.chushang.security.entity.po.SysRole; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysUserMapper.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysUserMapper.java index 8d0a745..2c34a31 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysUserMapper.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/mapper/SysUserMapper.java @@ -3,7 +3,7 @@ package com.chushang.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.chushang.system.entity.dto.ListUserDTO; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java index b2c0b84..dc2b1ff 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/remote/RemoteUserController.java @@ -2,10 +2,10 @@ package com.chushang.system.remote; import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.Result; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.annotation.InnerAuth; import com.chushang.security.entity.vo.LoginUser; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.feign.RemoteUserService; import com.chushang.system.service.*; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +33,7 @@ public class RemoteUserController implements RemoteUserService { @InnerAuth @GetMapping("/info/{username}") - public Result> getUserInfo(@PathVariable("username") String username, String source) + public Result getUserInfo(@PathVariable("username") String username, String source) { SysUser sysUser = sysUserService.selectUserByUserName(username); if (StringUtils.isNull(sysUser)) { @@ -47,7 +47,7 @@ public class RemoteUserController implements RemoteUserService { // 数据权限集合 List dataScopes = permissionService.getDataScopes(sysUser); - LoginUser sysUserVo = new LoginUser<>(); + LoginUser sysUserVo = new LoginUser(); sysUserVo.setUserId(sysUser.getUserId()); sysUserVo.setUsername(sysUser.getUsername()); sysUserVo.setSysUser(sysUser); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java index a235b4a..8207433 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysDeptService.java @@ -7,13 +7,10 @@ import com.chushang.common.core.text.Convert; import com.chushang.common.core.util.StringUtils; import com.chushang.common.mybatis.enums.Operator; import com.chushang.system.entity.dto.ListDeptDTO; -import com.chushang.system.entity.po.SysDept; +import com.chushang.security.entity.po.SysDept; import com.chushang.system.entity.vo.TreeSelect; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; /** *

diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysMenuService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysMenuService.java index d223ba1..7da0305 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysMenuService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysMenuService.java @@ -6,7 +6,7 @@ import com.chushang.common.core.util.StringUtils; import com.chushang.common.mybatis.enums.Operator; import com.chushang.system.entity.dto.ListMenuDTO; import com.chushang.system.entity.po.SysMenu; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.entity.vo.RouterVo; import com.chushang.system.entity.vo.TreeSelect; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysPermissionService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysPermissionService.java index b0717da..61ad2ad 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysPermissionService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysPermissionService.java @@ -1,13 +1,10 @@ package com.chushang.system.service; -import com.chushang.datascope.entity.DataScopeEntity; -import com.chushang.system.entity.po.SysRole; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.DataScopeEntity; +import com.chushang.security.entity.po.SysUser; -import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; /** * @author by zhaowenyuan create 2022/8/19 09:43 diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysRoleService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysRoleService.java index 8cb228b..e80635a 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysRoleService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysRoleService.java @@ -9,8 +9,8 @@ import com.chushang.common.core.web.AjaxResult; import com.chushang.common.mybatis.enums.Operator; import com.chushang.system.entity.bo.CancelUserRole; import com.chushang.system.entity.dto.ListRoleDTO; -import com.chushang.system.entity.po.SysRole; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysRole; +import com.chushang.security.entity.po.SysUser; import java.util.List; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java index a502959..839f9e9 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/ISysUserService.java @@ -7,7 +7,7 @@ import com.chushang.common.core.exception.ResultException; import com.chushang.common.core.web.AjaxResult; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.dto.ListUserDTO; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; /** *

diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDeptServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDeptServiceImpl.java index f208bd4..8243582 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDeptServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysDeptServiceImpl.java @@ -10,8 +10,8 @@ import com.chushang.system.mapper.SysDeptMapper; import com.chushang.system.service.ISysUserService; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.dto.ListDeptDTO; -import com.chushang.system.entity.po.SysDept; -import com.chushang.system.entity.po.SysRole; +import com.chushang.security.entity.po.SysDept; +import com.chushang.security.entity.po.SysRole; import com.chushang.system.entity.vo.TreeSelect; import com.chushang.system.service.ISysDeptService; import com.chushang.system.service.ISysRoleService; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java index 1130529..733967b 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysMenuServiceImpl.java @@ -5,12 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chushang.common.core.constant.Constants; import com.chushang.common.core.constant.UserConstants; import com.chushang.common.core.util.StringUtils; -import com.chushang.security.utils.SecurityUtils; import com.chushang.system.entity.dto.ListMenuDTO; import com.chushang.system.entity.enums.MenuTypeEnum; import com.chushang.system.entity.po.SysMenu; -import com.chushang.system.entity.po.SysRole; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysRole; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.entity.vo.MetaVo; import com.chushang.system.entity.vo.RouterVo; import com.chushang.system.entity.vo.TreeSelect; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysPermissionServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysPermissionServiceImpl.java index c13967d..b4a976e 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysPermissionServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysPermissionServiceImpl.java @@ -2,19 +2,17 @@ package com.chushang.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.chushang.datascope.constants.ScopeConstants; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.auth.AuthUtil; -import com.chushang.system.entity.po.SysRole; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysRole; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.service.ISysDeptService; import com.chushang.system.service.ISysMenuService; import com.chushang.system.service.ISysPermissionService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysRoleServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysRoleServiceImpl.java index ed8a2be..db3b1e5 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysRoleServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysRoleServiceImpl.java @@ -8,14 +8,14 @@ import com.chushang.common.core.util.StringUtils; import com.chushang.common.core.web.AjaxResult; import com.chushang.common.mybatis.utils.PageResult; import com.chushang.datascope.annotation.DataScope; -import com.chushang.datascope.entity.DataScopeEntity; +import com.chushang.security.entity.po.DataScopeEntity; import com.chushang.security.utils.SecurityUtils; import com.chushang.system.mapper.SysRoleMapper; import com.chushang.system.service.ISysRoleMenuService; import com.chushang.system.entity.bo.CancelUserRole; import com.chushang.system.entity.dto.ListRoleDTO; -import com.chushang.system.entity.po.SysRole; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysRole; +import com.chushang.security.entity.po.SysUser; import com.chushang.security.entity.vo.LoginUser; import com.chushang.system.service.ISysRoleDeptService; import com.chushang.system.service.ISysRoleService; @@ -106,7 +106,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override @Transactional public void saveRole(SysRole role) { - LoginUser loginUser = SecurityUtils.getLoginUser(); + LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser sysUser = loginUser.getSysUser(); Long deptId = sysUser.getDeptId(); diff --git a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java index 31902d2..d71783f 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java +++ b/chushang-modules/chushang-module-system/system-service/src/main/java/com/chushang/system/service/impl/SysUserServiceImpl.java @@ -14,7 +14,7 @@ import com.chushang.security.utils.SecurityUtils; import com.chushang.system.mapper.SysUserMapper; import com.chushang.system.service.*; import com.chushang.system.entity.dto.ListUserDTO; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.entity.po.SysUserRole; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml index 30de963..29be0cd 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysDeptMapper.xml @@ -5,7 +5,7 @@ select d.dept_id, d.parent_dept_id, d.ancestors, d.dept_name, d.order_num, d.status, d.del_state, d.create_by, d.create_time from sys_dept d - + diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml index 3a1c81b..213c03e 100644 --- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml +++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysRoleMapper.xml @@ -2,7 +2,7 @@ - + @@ -27,7 +27,7 @@ - select u.user_id, u.dept_id, u.username, u.status, u.del_state, u.create_by, u.create_time, d.dept_name from sys_user u left join sys_dept d on u.dept_id = d.dept_id diff --git a/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java b/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java index 920e0c2..9e9fbdd 100644 --- a/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java +++ b/chushang-modules/chushang-module-system/system-service/src/test/java/DemoTest.java @@ -2,7 +2,7 @@ import cn.hutool.json.JSONUtil; import com.chushang.security.service.TokenService; import com.chushang.SystemApplication; import com.chushang.system.entity.po.SysMenu; -import com.chushang.system.entity.po.SysUser; +import com.chushang.security.entity.po.SysUser; import com.chushang.system.entity.vo.RouterVo; import com.chushang.system.service.*; import lombok.extern.slf4j.Slf4j; diff --git a/chushang-modules/chushang-module-task/.gitignore b/chushang-modules/chushang-module-task/.gitignore new file mode 100644 index 0000000..8c1ecef --- /dev/null +++ b/chushang-modules/chushang-module-task/.gitignore @@ -0,0 +1,64 @@ +### gradle ### +.gradle +/build/ +!gradle/wrapper/gradle-wrapper.jar + +### STS ### +.settings/ +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +bin/ + +### IntelliJ IDEA ### +.idea/* +*.iws +*.iml +*.ipr +rebel.xml + +### NetBeans ### +nbproject/private/ +build/ +nbbuild/ +nbdist/ +.nb-gradle/ + +### maven ### +target/ +*.war +*.ear +*.zip +*.tar +*.tar.gz + +### vscode ### +.vscode + +### logs ### +/logs/ +*.log +*.log.gz + +### xxl-job log ### +/xxl-job/ + + +### temp ignore ### +*.cache +*.diff +*.patch +*.tmp +*.java~ +*.properties~ +*.xml~ + +### system ignore ### +.DS_Store +Thumbs.db +Servers +.metadata +.fastRequest diff --git a/chushang-modules/chushang-module-task/pom.xml b/chushang-modules/chushang-module-task/pom.xml new file mode 100644 index 0000000..ffaa3ca --- /dev/null +++ b/chushang-modules/chushang-module-task/pom.xml @@ -0,0 +1,63 @@ + + + + chushang-modules + com.chushang + 1.0.0 + + 4.0.0 + + chushang-module-task + pom + + task-service + task-feign + + + + 17 + 17 + + + + + + com.chushang + task-feign + 1.0.0 + + + + + + + de.codecentric + spring-boot-admin-starter-client + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + org.springframework.cloud + spring-cloud-starter-loadbalancer + + + org.springframework.cloud + spring-cloud-starter-bootstrap + + + org.springframework.boot + spring-boot-devtools + + + + diff --git a/chushang-modules/chushang-module-task/task-feign/pom.xml b/chushang-modules/chushang-module-task/task-feign/pom.xml new file mode 100644 index 0000000..4a02531 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-feign/pom.xml @@ -0,0 +1,30 @@ + + 4.0.0 + + com.chushang + chushang-module-task + 1.0.0 + + task-feign + + + + com.chushang + chushang-common-feign + + + com.chushang + chushang-common-mybatis + + + + com.chushang + chushang-common-data-scope + + + com.chushang + chushang-common-dict + + + diff --git a/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/entity/TaskInfo.java b/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/entity/TaskInfo.java new file mode 100644 index 0000000..47ac33e --- /dev/null +++ b/chushang-modules/chushang-module-task/task-feign/src/main/java/com/chushang/task/entity/TaskInfo.java @@ -0,0 +1,108 @@ +package com.chushang.task.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chushang.common.mybatis.base.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +/** + * @auther: zhao + * @date: 2024/6/7 18:18 + */ +@Data +@EqualsAndHashCode(callSuper=true) +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "tb_task_info") +public class TaskInfo extends BaseEntity { + /** + * 主键id + */ + @TableId(value = "task_id", type = IdType.ASSIGN_ID) + private Long taskId; + + /** + * 后台任务名称 + */ + @TableField(value = "task_name") + private String taskName; + + /** + * 所属服务名 + */ + @TableField(value = "application_name") + private String applicationName; + + /** + * 方法名称 + */ + @TableField(value = "method_name") + private String methodName; + + /** + * 类名 + */ + @TableField(value = "class_name") + private String className; + + /** + * 任务状态 + */ + @TableField(value = "task_status") + private Short taskStatus; + + /** + * 创建人 + */ + @TableField(value = "create_by") + private String createBy; + + /** + * 修改人 + */ + @TableField(value = "update_by") + private String updateBy; + + /** + * 后台任务执行参数 + */ + @TableField(value = "params") + private String params; + + /** + * 备注信息 + */ + @TableField(value = "remark") + private String remark; + + /** + * 导出或者下载时, 对应的返回的文件路径 + */ + @TableField(value = "down_url") + private String downUrl; + /** + * 最后一次执行时间 + */ + @TableField(value = "last_run_time") + private LocalDateTime lastRunTime; + /** + * 最后一次执行结果 + */ + @TableField("last_run_result") + private String lastRunResult; + + @TableField("error_message") + private String errorMessage; + /** + * 部门id -- 根据部门查看区分 + */ + @TableField("dept_id") + private Long deptId; +} diff --git a/chushang-modules/chushang-module-task/task-service/pom.xml b/chushang-modules/chushang-module-task/task-service/pom.xml new file mode 100644 index 0000000..d12bf8c --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/pom.xml @@ -0,0 +1,118 @@ + + + + chushang-module-task + com.chushang + 1.0.0 + + 4.0.0 + + 1.0.0 + task-service + + + 17 + 17 + + + + com.chushang + task-feign + + + com.chushang + chushang-common-redis + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + **/application.yml + **/bootstrap.yml + **/logback-nacos.xml + + + + true + + lib/ + + false + + com.chushang.TaskApplication + + + + ./config/ + + + ${project.build.directory} + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + org.springframework.boot + spring-boot-maven-plugin + + ${project.build.finalName} + + true + + + + + + repackage + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-resources + package + + copy-resources + + + + + src/main/resources + + application.yml + bootstrap.yml + logback-nacos.xml + + true + + + + + UTF-8 + ${project.build.directory}/config + + + + + + ${project.artifactId} + + + diff --git a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/TaskApplication.java b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/TaskApplication.java new file mode 100644 index 0000000..3eed661 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/TaskApplication.java @@ -0,0 +1,48 @@ +package com.chushang; + +import com.chushang.common.core.enums.AppStartType; +import com.chushang.common.feign.annotation.EnableOnnFeignClients; +import com.chushang.common.feign.annotation.EnableTransferFeign; +import com.chushang.security.annotation.EnableCustomConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.servlet.ServletComponentScan; +import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; +import org.springframework.cloud.client.discovery.EnableDiscoveryClient; +import org.springframework.transaction.annotation.EnableTransactionManagement; + +/** + * 认证授权中心 + * + * @author ruoyi + */ +@EnableDiscoveryClient +@EnableOnnFeignClients +@SpringBootApplication(scanBasePackages = {"com.chushang.**"}) +@EnableTransferFeign +@EnableCustomConfig +@EnableTransactionManagement +public class TaskApplication extends SpringBootServletInitializer +{ + private final static Logger log = LoggerFactory.getLogger(TaskApplication.class); + private final static String APP_NAME = "系统任务服务应用"; + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + log.info(AppStartType.START_FORMAT, AppStartType.web_server.type(), APP_NAME); + SpringApplicationBuilder run = application.sources(TaskApplication.class); + log.info(AppStartType.END_FORMAT, AppStartType.web_server.type(), APP_NAME); + return run; + } + + public static void main(String[] args) throws Exception { + log.info(AppStartType.START_FORMAT, AppStartType.main.type(), APP_NAME); + SpringApplication.run(TaskApplication.class, args); + log.info(AppStartType.END_FORMAT, AppStartType.main.type(), APP_NAME); + } + +} diff --git a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java new file mode 100644 index 0000000..f8546e2 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/controller/TaskController.java @@ -0,0 +1,34 @@ +package com.chushang.task.controller; + +import com.chushang.common.core.web.AjaxResult; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.security.annotation.RequiresPermissions; +import com.chushang.task.entity.TaskInfo; +import com.chushang.task.service.TaskInfoService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @auther: zhao + * @date: 2024/6/11 9:11 + */ +@RestController +@RequestMapping(value = "/") +public class TaskController { + + @Resource + TaskInfoService taskInfoService; + + @RequiresPermissions("system:task:list") + @GetMapping("/list") + public AjaxResult page(TaskInfo taskInfo){ + CommonParam commonParam = CommonParam.buildPageRequest(); + PageResult pageResult = taskInfoService.pagePostList(taskInfo, commonParam); + return AjaxResult.success(pageResult); + } + +} diff --git a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/mapper/TaskInfoMapper.java b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/mapper/TaskInfoMapper.java new file mode 100644 index 0000000..8c9a880 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/mapper/TaskInfoMapper.java @@ -0,0 +1,10 @@ +package com.chushang.task.mapper; + +import com.chushang.task.entity.TaskInfo; + +/** + * @auther: zhao + * @date: 2024/6/7 18:18 + */ +public interface TaskInfoMapper extends com.baomidou.mybatisplus.core.mapper.BaseMapper { +} diff --git a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/TaskInfoService.java b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/TaskInfoService.java new file mode 100644 index 0000000..6e34680 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/TaskInfoService.java @@ -0,0 +1,27 @@ +package com.chushang.task.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.common.mybatis.utils.PageResult; +import com.chushang.datascope.annotation.DataScope; +import com.chushang.task.entity.TaskInfo; + +/** + * @auther: zhao + * @date: 2024/6/7 18:19 + */ +public interface TaskInfoService extends IService { + + @DataScope(tableAlias = "t") + default PageResult pagePostList(TaskInfo sysPost, CommonParam commonParam){ + IPage page = this.page( + new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(commonParam.getPage(), commonParam.getLimit()), + buildWrapper(sysPost, commonParam) + ); + return new PageResult(page); + } + + Wrapper buildWrapper(TaskInfo sysPost, CommonParam commonParam); +} diff --git a/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/impl/TaskInfoServiceImpl.java b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/impl/TaskInfoServiceImpl.java new file mode 100644 index 0000000..a1e9e96 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/java/com/chushang/task/service/impl/TaskInfoServiceImpl.java @@ -0,0 +1,38 @@ +package com.chushang.task.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chushang.common.core.constant.SecurityConstants; +import com.chushang.common.mybatis.page.CommonParam; +import com.chushang.datascope.constants.ScopeConstants; +import com.chushang.task.entity.TaskInfo; +import com.chushang.task.mapper.TaskInfoMapper; +import com.chushang.task.service.TaskInfoService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +/** + * @auther: zhao + * @date: 2024/6/7 18:19 + */ +@Slf4j +@Service +public class TaskInfoServiceImpl extends ServiceImpl implements TaskInfoService { + + @Override + public Wrapper buildWrapper(TaskInfo taskInfo, CommonParam commonParam) { + return new QueryWrapper() + .orderBy(true, "asc".equals(commonParam.getIsAsc()), commonParam.getOrderBy()) + .lambda() + .eq(null != taskInfo.getTaskId(), TaskInfo::getTaskId, taskInfo.getTaskId()) + .like(StringUtils.isNotEmpty(taskInfo.getApplicationName()), TaskInfo::getApplicationName, taskInfo.getApplicationName()) + .eq(StringUtils.isNotEmpty(taskInfo.getTaskName()), TaskInfo::getTaskName, taskInfo.getTaskName()) + .eq(null != taskInfo.getTaskStatus(), TaskInfo::getTaskStatus, taskInfo.getTaskStatus()) + .like(StringUtils.isNotEmpty(taskInfo.getClassName()), TaskInfo::getClassName, taskInfo.getClassName()) + .like(StringUtils.isNotEmpty(taskInfo.getMethodName()), TaskInfo::getMethodName, taskInfo.getMethodName()) + .in(ObjectUtils.isNotEmpty(taskInfo.getSqlParam().get(ScopeConstants.DATA_SCOPE)), TaskInfo::getDeptId, taskInfo.getSqlParam().get(ScopeConstants.DATA_SCOPE)); + } +} diff --git a/chushang-modules/chushang-module-task/task-service/src/main/resources/application.yml b/chushang-modules/chushang-module-task/task-service/src/main/resources/application.yml new file mode 100644 index 0000000..9b7f77e --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/resources/application.yml @@ -0,0 +1,90 @@ +server: + #开启优雅停机 + shutdown: graceful + port: 8086 + servlet: + context-path: /task + tomcat: + uri-encoding: UTF-8 + threads: + max: 800 + min-spare: 100 +spring: + application: + name: @artifactId@ + # 如果需要使用读写分离, 此处需要改造, 有没有办法不用改? + datasource: + type: com.zaxxer.hikari.HikariDataSource + driver-class-name: com.mysql.cj.jdbc.Driver + username: ${config.jdbc.master.task.username} + password: ${config.jdbc.master.task.password} + url: jdbc:mysql://${config.jdbc.master.task.host}:${config.jdbc.master.task.port}/${config.jdbc.master.task.database}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowMultiQueries=true&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai + hikari: + # 最大线程池数量 + maximum-pool-size: 30 + # 最小线程池数量 + minimum-idle: 5 + # 检测连接 + connection-test-query: SELECT 1 + # 连接超时时间 默认30分钟 + connection-timeout: 30000 + # 连接最大生存期间, 默认30分钟 + #max-lifetime: 300000 + devtools: + restart: + enabled: true + jackson: + default-property-inclusion: ALWAYS + time-zone: GMT+8 + date-format: yyyy-MM-dd HH:mm:ss +# mybaits-plus配置 +mybatis-plus: + # 全局刷新 mapper + mapper-locations: classpath:/mapper/**/*.xml + global-config: + refresh: + enable: true + db-config: + id-type: auto + table-underline: true + logic-delete-value: 1 + logic-not-delete-value: 0 + configuration: + map-underscore-to-camel-case: true + cache-enabled: false + call-setters-on-nulls: true + jdbc-type-for-null: 'null' + default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl +# feign 配置 +feign: + sentinel: + enabled: true + okhttp: + enabled: true + httpclient: + enabled: false + client: + config: + default: + connectTimeout: 10000 + readTimeout: 10000 + compression: + request: + enabled: true + response: + enabled: true +# 暴露监控端点 +management: + endpoints: + web: + exposure: + include: "*" + endpoint: + health: + show-details: ALWAYS + +# 日志监听配置 -- 如果启用的话，需要配置 kafka 的路径 +logging: + config: classpath:logback-nacos.xml + diff --git a/chushang-modules/chushang-module-task/task-service/src/main/resources/bootstrap.yml b/chushang-modules/chushang-module-task/task-service/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..22092f1 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/resources/bootstrap.yml @@ -0,0 +1,29 @@ +spring: + config: + import: + -: "classpath:application.yml" + cloud: + loadbalancer: + cache: + enabled: false + nacos: + server-addr: ${nacos.host} + username: ${nacos.username} + password: ${nacos.password} + discovery: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: ${nacos.namespace} + group: ${nacos.group} + service: ${spring.application.name} + config: + server-addr: ${spring.cloud.nacos.server-addr} + namespace: ${spring.cloud.nacos.discovery.namespace} + group: ${spring.cloud.nacos.discovery.group} + file-extension: yaml + refresh-enabled: true + shared-configs: + - dataId: application-common.${spring.cloud.nacos.config.file-extension} + group: ${nacos.group} + refresh: ${spring.cloud.nacos.config.refresh-enabled} + profiles: + active: @profiles.active@ diff --git a/chushang-modules/chushang-module-task/task-service/src/main/resources/logback-nacos.xml b/chushang-modules/chushang-module-task/task-service/src/main/resources/logback-nacos.xml new file mode 100644 index 0000000..977c569 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/resources/logback-nacos.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + ${log.path}/info.log + + ${log.path}/info.%d{yyyy-MM-dd}-%i.log + 5 + 500MB + + + ${CONSOLE_LOG_PATTERN} + + + info + + + + + ${log.path}/debug.log + + ${log.path}/debug.%d{yyyy-MM-dd}-%i.log + 5 + 500MB + + + ${CONSOLE_LOG_PATTERN} + + + debug + + + + + ${log.path}/error.log + + ${log.path}/error.%d{yyyy-MM-dd}-%i.log + 5 + 500MB + + + ${CONSOLE_LOG_PATTERN} + + + error + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chushang-modules/chushang-module-task/task-service/src/main/resources/mapper/TaskInfoMapper.xml b/chushang-modules/chushang-module-task/task-service/src/main/resources/mapper/TaskInfoMapper.xml new file mode 100644 index 0000000..69be947 --- /dev/null +++ b/chushang-modules/chushang-module-task/task-service/src/main/resources/mapper/TaskInfoMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + id, task_name, application_name, method_name, class_name, task_status, create_by, + update_by, create_time, update_time, version, del_state, params, remark, down_url + + diff --git a/chushang-modules/pom.xml b/chushang-modules/pom.xml index cbfffb6..c187ce1 100644 --- a/chushang-modules/pom.xml +++ b/chushang-modules/pom.xml @@ -16,6 +16,7 @@ chushang-module-gateway chushang-module-system chushang-module-oss + chushang-module-task