MES/mes-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改名

Browse Source
This commit is contained in:
zc
2026-06-12 15:07:01 +08:00
parent 7ea86a123c
commit 33540f7d10
321 changed files with 1068 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -310,9 +310,9 @@
### 💥 破坏性变更 ### 💥 破坏性变更
- 适配 wms-starter 2.0.0，top.charles7c.wms.starter => top.wms.starter ([f5ab22e](https://github.com/wms-org/wms-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3)) - 适配 wms-starter 2.0.0，top.charles7c.wms.starter => top.mes.starter ([f5ab22e](https://github.com/wms-org/wms-admin/commit/f5ab22eedf594cee43592a2f29409ee9c33a88d3))
- 移除 monitor 模块 ([b6206a3](https://github.com/wms-org/wms-admin/commit/b6206a334671894306043f86ec07d7c045cd757d)) - 移除 monitor 模块 ([b6206a3](https://github.com/wms-org/wms-admin/commit/b6206a334671894306043f86ec07d7c045cd757d))
- top.charles7c.wms.admin => top.wms.admin ([08eeabc](https://github.com/wms-org/wms-admin/commit/08eeabc47d58db3cfc861a3a527e52bf89f6183b)) - top.charles7c.wms.admin => top.mes.admin ([08eeabc](https://github.com/wms-org/wms-admin/commit/08eeabc47d58db3cfc861a3a527e52bf89f6183b))
- 公告管理 Announcement => Notice ([dbe93df](https://github.com/wms-org/wms-admin/commit/dbe93df8bcec0b7dfb24fbd92f35928a3156f4e5)) - 公告管理 Announcement => Notice ([dbe93df](https://github.com/wms-org/wms-admin/commit/dbe93df8bcec0b7dfb24fbd92f35928a3156f4e5))
### 📦 依赖升级 ### 📦 依赖升级

2
README.md
View File

@@ -78,7 +78,7 @@ ContiNew Admin（Continue New Admin）持续迭代优化的前后端分离中后
1.**甄选技术栈：** ContiNew（Continue New） 项目致力于持续迭代优化，让技术不掉队。在技术选型时，进行深度广泛地调研，从流行度、成熟度和发展潜力等多方面甄选技术栈。 1.**甄选技术栈：** ContiNew（Continue New） 项目致力于持续迭代优化，让技术不掉队。在技术选型时，进行深度广泛地调研，从流行度、成熟度和发展潜力等多方面甄选技术栈。
2.**Starter 组件：** 从 v2.1.0 版本开始，抽取并封装后端基础组件及各框架集成配置到 ContiNew Starter 项目，且 **[已发布至 Maven 中央仓库](https://central.sonatype.com/search?q=wms-starter&namespace=top.wms)**，可在你的任意项目中直接引入所需依赖使用。即使你不用脚手架项目，难道能让你搭项目框架更快、更爽、更省力的 Starter 也要 Say No 吗？ 2.**Starter 组件：** 从 v2.1.0 版本开始，抽取并封装后端基础组件及各框架集成配置到 ContiNew Starter 项目，且 **[已发布至 Maven 中央仓库](https://central.sonatype.com/search?q=wms-starter&namespace=top.mes)**，可在你的任意项目中直接引入所需依赖使用。即使你不用脚手架项目，难道能让你搭项目框架更快、更爽、更省力的 Starter 也要 Say No 吗？
3.**CRUD 套件：** 封装通用增删改查套件，适配后端各分层，几分钟即可提供一套 CRUD API，包括新增、修改、批量删除、查询详情、分页列表查询、全部列表查询、树型列表查询、导出到 Excel，且 API 支持按实际所需开放或扩展。 3.**CRUD 套件：** 封装通用增删改查套件，适配后端各分层，几分钟即可提供一套 CRUD API，包括新增、修改、批量删除、查询详情、分页列表查询、全部列表查询、树型列表查询、导出到 Excel，且 API 支持按实际所需开放或扩展。

6
mes-common/pom.xml
View File

@@ -4,12 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>top.wms</groupId> <groupId>top.mes</groupId>
<artifactId>wms-admin</artifactId> <artifactId>mes-admin</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>wms-common</artifactId> <artifactId>mes-common</artifactId>
<description>公共模块（存放公共工具类，公共配置等）</description> <description>公共模块（存放公共工具类，公共配置等）</description>
<dependencies> <dependencies>

2
mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalAuthenticationCustomizer.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.doc; package top.mes.admin.common.config.doc;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;

2
mes-common/src/main/java/top/mes/admin/common/config/doc/GlobalDescriptionCustomizer.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.doc; package top.mes.admin.common.config.doc;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import io.swagger.v3.oas.models.Operation; import io.swagger.v3.oas.models.Operation;

2
mes-common/src/main/java/top/mes/admin/common/config/doc/OperationDescriptionCustomizer.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.doc; package top.mes.admin.common.config.doc;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaCheckRole;

2
mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalExceptionHandler.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.exception; package top.mes.admin.common.config.exception;
import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.FileUtil;
import cn.hutool.core.text.CharSequenceUtil; import cn.hutool.core.text.CharSequenceUtil;

2
mes-common/src/main/java/top/mes/admin/common/config/exception/GlobalSaTokenExceptionHandler.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.exception; package top.mes.admin.common.config.exception;
import cn.dev33.satoken.exception.NotLoginException; import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.exception.NotPermissionException; import cn.dev33.satoken.exception.NotPermissionException;

2
mes-common/src/main/java/top/mes/admin/common/config/mybatis/BCryptEncryptor.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.mybatis; package top.mes.admin.common.config.mybatis;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import top.continew.starter.security.crypto.encryptor.IEncryptor; import top.continew.starter.security.crypto.encryptor.IEncryptor;

2
mes-common/src/main/java/top/mes/admin/common/config/mybatis/DataPermissionMapper.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.mybatis; package top.mes.admin.common.config.mybatis;
import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;

6
mes-common/src/main/java/top/mes/admin/common/config/mybatis/DefaultDataPermissionUserContextProvider.java
View File

@@ -1,7 +1,7 @@
package top.wms.admin.common.config.mybatis; package top.mes.admin.common.config.mybatis;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import top.wms.admin.common.context.UserContextHolder; import top.mes.admin.common.context.UserContextHolder;
import top.continew.starter.extension.datapermission.enums.DataScope; import top.continew.starter.extension.datapermission.enums.DataScope;
import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider; import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider;
import top.continew.starter.extension.datapermission.model.RoleContext; import top.continew.starter.extension.datapermission.model.RoleContext;
@@ -24,7 +24,7 @@ public class DefaultDataPermissionUserContextProvider implements DataPermissionU
@Override @Override
public UserContext getUserContext() { public UserContext getUserContext() {
top.wms.admin.common.context.UserContext context = UserContextHolder.getContext(); top.mes.admin.common.context.UserContext context = UserContextHolder.getContext();
UserContext userContext = new UserContext(); UserContext userContext = new UserContext();
userContext.setUserId(Convert.toStr(context.getId())); userContext.setUserId(Convert.toStr(context.getId()));
userContext.setDeptId(Convert.toStr(context.getDeptId())); userContext.setDeptId(Convert.toStr(context.getDeptId()));

6
mes-common/src/main/java/top/mes/admin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@@ -1,10 +1,10 @@
package top.wms.admin.common.config.mybatis; package top.mes.admin.common.config.mybatis;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.apache.ibatis.reflection.MetaObject; import org.apache.ibatis.reflection.MetaObject;
import top.wms.admin.common.context.UserContextHolder; import top.mes.admin.common.context.UserContextHolder;
import top.wms.admin.common.model.entity.BaseDO; import top.mes.admin.common.model.entity.BaseDO;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
mes-common/src/main/java/top/mes/admin/common/config/mybatis/MybatisPlusConfiguration.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.mybatis; package top.mes.admin.common.config.mybatis;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;

2
mes-common/src/main/java/top/mes/admin/common/config/properties/CaptchaProperties.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.properties; package top.mes.admin.common.config.properties;
import lombok.Data; import lombok.Data;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;

2
mes-common/src/main/java/top/mes/admin/common/config/properties/RsaProperties.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.properties; package top.mes.admin.common.config.properties;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;

2
mes-common/src/main/java/top/mes/admin/common/config/websocket/WebSocketClientServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.config.websocket; package top.mes.admin.common.config.websocket;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;

2
mes-common/src/main/java/top/mes/admin/common/constant/CacheConstants.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.constant; package top.mes.admin.common.constant;
import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.constant.StringConstants;

2
mes-common/src/main/java/top/mes/admin/common/constant/Constants.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.constant; package top.mes.admin.common.constant;
/** /**
* 通用常量信息 * 通用常量信息

2
mes-common/src/main/java/top/mes/admin/common/constant/ContainerConstants.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.constant; package top.mes.admin.common.constant;
/** /**
* 数据源容器相关常量（Crane4j 数据填充组件使用） * 数据源容器相关常量（Crane4j 数据填充组件使用）

2
mes-common/src/main/java/top/mes/admin/common/constant/RegexConstants.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.constant; package top.mes.admin.common.constant;
/** /**
* 正则相关常量 * 正则相关常量

2
mes-common/src/main/java/top/mes/admin/common/constant/SysConstants.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.constant; package top.mes.admin.common.constant;
/** /**
* 系统相关常量 * 系统相关常量

2
mes-common/src/main/java/top/mes/admin/common/constant/UiConstants.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.constant; package top.mes.admin.common.constant;
/** /**
* UI 相关常量 * UI 相关常量

4
mes-common/src/main/java/top/mes/admin/common/context/RoleContext.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.common.context; package top.mes.admin.common.context;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import top.wms.admin.common.enums.DataScopeEnum; import top.mes.admin.common.enums.DataScopeEnum;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
mes-common/src/main/java/top/mes/admin/common/context/UserContext.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.common.context; package top.mes.admin.common.context;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import top.wms.admin.common.constant.SysConstants; import top.mes.admin.common.constant.SysConstants;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
mes-common/src/main/java/top/mes/admin/common/context/UserContextHolder.java
View File

@@ -1,10 +1,10 @@
package top.wms.admin.common.context; package top.mes.admin.common.context;
import cn.dev33.satoken.session.SaSession; import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import top.wms.admin.common.service.CommonUserService; import top.mes.admin.common.service.CommonUserService;
import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.ExceptionUtils;
/** /**

2
mes-common/src/main/java/top/mes/admin/common/context/UserExtraContext.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.context; package top.mes.admin.common.context;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.servlet.JakartaServletUtil;

2
mes-common/src/main/java/top/mes/admin/common/controller/BaseController.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.controller; package top.mes.admin.common.controller;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.context.SaHolder; import cn.dev33.satoken.context.SaHolder;

2
mes-common/src/main/java/top/mes/admin/common/enums/CommandTypeEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
/** /**
* DPA6024V-2T-1.0 数字控制器命令类型枚举 * DPA6024V-2T-1.0 数字控制器命令类型枚举

2
mes-common/src/main/java/top/mes/admin/common/enums/CommonExceptionEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
public enum CommonExceptionEnum { public enum CommonExceptionEnum {
RULE_ERROR(1000, "您所所在得部门所属规则未绑定设备"), REQUEST_ERROR(1001, "请求异常"), PEOPLE_ERROR(1002, "您的信息未录入"), RULE_ERROR(1000, "您所所在得部门所属规则未绑定设备"), REQUEST_ERROR(1001, "请求异常"), PEOPLE_ERROR(1002, "您的信息未录入"),

2
mes-common/src/main/java/top/mes/admin/common/enums/DataScopeEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

4
mes-common/src/main/java/top/mes/admin/common/enums/DisEnableStatusEnum.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.wms.admin.common.constant.UiConstants; import top.mes.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.enums.BaseEnum;
/** /**

2
mes-common/src/main/java/top/mes/admin/common/enums/GenderEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

4
mes-common/src/main/java/top/mes/admin/common/enums/SuccessFailureStatusEnum.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.wms.admin.common.constant.UiConstants; import top.mes.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.enums.BaseEnum;
/** /**

4
mes-common/src/main/java/top/mes/admin/common/enums/YesNoEnum.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.common.enums; package top.mes.admin.common.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.enums.BaseEnum;
import top.wms.admin.common.constant.UiConstants; import top.mes.admin.common.constant.UiConstants;
/** /**
* 成功/失败状态枚举 * 成功/失败状态枚举

2
mes-common/src/main/java/top/mes/admin/common/model/entity/BaseCreateDO.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.entity; package top.mes.admin.common.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
mes-common/src/main/java/top/mes/admin/common/model/entity/BaseDO.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.entity; package top.mes.admin.common.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

2
mes-common/src/main/java/top/mes/admin/common/model/entity/BaseStrIdDO.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.entity; package top.mes.admin.common.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;

2
mes-common/src/main/java/top/mes/admin/common/model/entity/BaseUpdateDO.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.entity; package top.mes.admin.common.model.entity;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;

4
mes-common/src/main/java/top/mes/admin/common/model/req/CommonStatusUpdateReq.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.common.model.req; package top.mes.admin.common.model.req;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import top.wms.admin.common.enums.DisEnableStatusEnum; import top.mes.admin.common.enums.DisEnableStatusEnum;
import java.io.Serializable; import java.io.Serializable;

4
mes-common/src/main/java/top/mes/admin/common/model/resp/BaseDetailResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.resp; package top.mes.admin.common.model.resp;
import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.Mapping;
@@ -7,7 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import top.wms.admin.common.constant.ContainerConstants; import top.mes.admin.common.constant.ContainerConstants;
import java.io.Serial; import java.io.Serial;
import java.time.LocalDateTime; import java.time.LocalDateTime;

4
mes-common/src/main/java/top/mes/admin/common/model/resp/BaseResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.resp; package top.mes.admin.common.model.resp;
import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.Mapping;
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import top.wms.admin.common.constant.ContainerConstants; import top.mes.admin.common.constant.ContainerConstants;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
mes-common/src/main/java/top/mes/admin/common/model/resp/BaseStrIdResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.model.resp; package top.mes.admin.common.model.resp;
import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.Mapping; import cn.crane4j.annotation.Mapping;
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import top.wms.admin.common.constant.ContainerConstants; import top.mes.admin.common.constant.ContainerConstants;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
mes-common/src/main/java/top/mes/admin/common/service/CommonUserService.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.common.service; package top.mes.admin.common.service;
import cn.crane4j.annotation.ContainerMethod; import cn.crane4j.annotation.ContainerMethod;
import cn.crane4j.annotation.MappingType; import cn.crane4j.annotation.MappingType;
import top.wms.admin.common.constant.ContainerConstants; import top.mes.admin.common.constant.ContainerConstants;
/** /**
* 公共用户业务接口 * 公共用户业务接口

2
mes-common/src/main/java/top/mes/admin/common/util/ImageToBase64Utils.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.util; package top.mes.admin.common.util;
import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.binary.Base64;

2
mes-common/src/main/java/top/mes/admin/common/util/PictureUtils.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.common.util; package top.mes.admin.common.util;
import net.coobird.thumbnailator.Thumbnails; import net.coobird.thumbnailator.Thumbnails;
import org.springframework.mock.web.MockMultipartFile; import org.springframework.mock.web.MockMultipartFile;

4
mes-common/src/main/java/top/mes/admin/common/util/SecureUtils.java
View File

@@ -1,10 +1,10 @@
package top.wms.admin.common.util; package top.mes.admin.common.util;
import cn.hutool.core.codec.Base64; import cn.hutool.core.codec.Base64;
import cn.hutool.crypto.SecureUtil; import cn.hutool.crypto.SecureUtil;
import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.KeyType;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import top.wms.admin.common.config.properties.RsaProperties; import top.mes.admin.common.config.properties.RsaProperties;
import top.continew.starter.core.exception.BusinessException; import top.continew.starter.core.exception.BusinessException;
import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.core.validation.ValidationUtils;
import top.continew.starter.security.crypto.autoconfigure.CryptoProperties; import top.continew.starter.security.crypto.autoconfigure.CryptoProperties;

6
mes-extension/mes-extension-schedule-server/pom.xml
View File

@@ -4,12 +4,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>top.wms</groupId> <groupId>top.mes</groupId>
<artifactId>wms-extension</artifactId> <artifactId>mes-extension</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>wms-extension-schedule-server</artifactId> <artifactId>mes-extension-schedule-server</artifactId>
<description>任务调度服务端</description> <description>任务调度服务端</description>
<properties> <properties>

2
mes-extension/mes-extension-schedule-server/src/main/java/top/mes/admin/extension/scheduling/ScheduleServerApplication.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.extension.scheduling; package top.mes.admin.extension.scheduling;
import cn.hutool.core.net.NetUtil; import cn.hutool.core.net.NetUtil;
import cn.hutool.core.util.URLUtil; import cn.hutool.core.util.URLUtil;

8
mes-extension/pom.xml
View File

@@ -2,16 +2,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>top.wms</groupId> <groupId>top.mes</groupId>
<artifactId>wms-admin</artifactId> <artifactId>mes-admin</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>wms-extension</artifactId> <artifactId>mes-extension</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<description>扩展模块（存放其他扩展模块）</description> <description>扩展模块（存放其他扩展模块）</description>
<modules> <modules>
<module>wms-extension-schedule-server</module> <module>mes-extension-schedule-server</module>
</modules> </modules>
</project> </project>

10
mes-module-system/pom.xml
View File

@@ -4,19 +4,19 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>top.wms</groupId> <groupId>top.mes</groupId>
<artifactId>wms-admin</artifactId> <artifactId>mes-admin</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>wms-module-system</artifactId> <artifactId>mes-module-system</artifactId>
<description>系统管理模块（存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等）</description> <description>系统管理模块（存放系统管理相关业务功能，例如：部门管理、角色管理、用户管理等）</description>
<dependencies> <dependencies>
<!-- 公共模块（存放公共工具类，公共配置等） --> <!-- 公共模块（存放公共工具类，公共配置等） -->
<dependency> <dependency>
<groupId>top.wms</groupId> <groupId>top.mes</groupId>
<artifactId>wms-common</artifactId> <artifactId>mes-common</artifactId>
</dependency> </dependency>
<dependency> <dependency>

28
mes-module-system/src/main/java/top/mes/admin/auth/AbstractLoginHandler.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth; package top.mes.admin.auth;
import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
@@ -7,18 +7,18 @@ import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.auth.model.req.LoginReq; import top.mes.admin.auth.model.req.LoginReq;
import top.wms.admin.common.context.RoleContext; import top.mes.admin.common.context.RoleContext;
import top.wms.admin.common.context.UserContext; import top.mes.admin.common.context.UserContext;
import top.wms.admin.common.context.UserContextHolder; import top.mes.admin.common.context.UserContextHolder;
import top.wms.admin.common.context.UserExtraContext; import top.mes.admin.common.context.UserExtraContext;
import top.wms.admin.common.enums.DisEnableStatusEnum; import top.mes.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.system.model.entity.UserDO; import top.mes.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
import top.wms.admin.system.service.DeptService; import top.mes.admin.system.service.DeptService;
import top.wms.admin.system.service.OptionService; import top.mes.admin.system.service.OptionService;
import top.wms.admin.system.service.RoleService; import top.mes.admin.system.service.RoleService;
import top.wms.admin.system.service.UserService; import top.mes.admin.system.service.UserService;
import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.core.validation.CheckUtils;
import top.continew.starter.core.validation.Validator; import top.continew.starter.core.validation.Validator;
import top.continew.starter.web.util.SpringWebUtils; import top.continew.starter.web.util.SpringWebUtils;
@@ -26,7 +26,7 @@ import top.continew.starter.web.util.SpringWebUtils;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import static top.wms.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS; import static top.mes.admin.system.enums.PasswordPolicyEnum.PASSWORD_EXPIRATION_DAYS;
/** /**
* 登录处理器基类 * 登录处理器基类

10
mes-module-system/src/main/java/top/mes/admin/auth/LoginHandler.java
View File

@@ -1,10 +1,10 @@
package top.wms.admin.auth; package top.mes.admin.auth;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.LoginReq; import top.mes.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
/** /**
* 登录处理器 * 登录处理器

6
mes-module-system/src/main/java/top/mes/admin/auth/LoginHandlerFactory.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.auth; package top.mes.admin.auth;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.LoginReq; import top.mes.admin.auth.model.req.LoginReq;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.List; import java.util.List;

4
mes-module-system/src/main/java/top/mes/admin/auth/enums/AuthTypeEnum.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.auth.enums; package top.mes.admin.auth.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.wms.admin.common.constant.UiConstants; import top.mes.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.enums.BaseEnum;
/** /**

22
mes-module-system/src/main/java/top/mes/admin/auth/handler/AccountLoginHandler.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.handler; package top.mes.admin.auth.handler;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.extra.servlet.JakartaServletUtil;
@@ -6,16 +6,16 @@ import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.auth.AbstractLoginHandler; import top.mes.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.AccountLoginReq; import top.mes.admin.auth.model.req.AccountLoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.CacheConstants; import top.mes.admin.common.constant.CacheConstants;
import top.wms.admin.common.constant.SysConstants; import top.mes.admin.common.constant.SysConstants;
import top.wms.admin.common.util.SecureUtils; import top.mes.admin.common.util.SecureUtils;
import top.wms.admin.system.enums.PasswordPolicyEnum; import top.mes.admin.system.enums.PasswordPolicyEnum;
import top.wms.admin.system.model.entity.UserDO; import top.mes.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.util.ExceptionUtils; import top.continew.starter.core.util.ExceptionUtils;
import top.continew.starter.core.validation.CheckUtils; import top.continew.starter.core.validation.CheckUtils;

14
mes-module-system/src/main/java/top/mes/admin/auth/handler/CardLoginHandler.java
View File

@@ -1,14 +1,14 @@
package top.wms.admin.auth.handler; package top.mes.admin.auth.handler;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.core.validation.ValidationUtils;
import top.wms.admin.auth.AbstractLoginHandler; import top.mes.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.CardLoginReq; import top.mes.admin.auth.model.req.CardLoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.system.model.entity.UserDO; import top.mes.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
@Component @Component
public class CardLoginHandler extends AbstractLoginHandler<CardLoginReq> { public class CardLoginHandler extends AbstractLoginHandler<CardLoginReq> {

16
mes-module-system/src/main/java/top/mes/admin/auth/handler/EmailLoginHandler.java
View File

@@ -1,14 +1,14 @@
package top.wms.admin.auth.handler; package top.mes.admin.auth.handler;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.auth.AbstractLoginHandler; import top.mes.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.EmailLoginReq; import top.mes.admin.auth.model.req.EmailLoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.CacheConstants; import top.mes.admin.common.constant.CacheConstants;
import top.wms.admin.system.model.entity.UserDO; import top.mes.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.core.validation.ValidationUtils;

16
mes-module-system/src/main/java/top/mes/admin/auth/handler/PhoneLoginHandler.java
View File

@@ -1,14 +1,14 @@
package top.wms.admin.auth.handler; package top.mes.admin.auth.handler;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.auth.AbstractLoginHandler; import top.mes.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.PhoneLoginReq; import top.mes.admin.auth.model.req.PhoneLoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.common.constant.CacheConstants; import top.mes.admin.common.constant.CacheConstants;
import top.wms.admin.system.model.entity.UserDO; import top.mes.admin.system.model.entity.UserDO;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
import top.continew.starter.cache.redisson.util.RedisUtils; import top.continew.starter.cache.redisson.util.RedisUtils;
import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.core.validation.ValidationUtils;

12
mes-module-system/src/main/java/top/mes/admin/auth/handler/SocialLoginHandler.java
View File

@@ -1,14 +1,14 @@
package top.wms.admin.auth.handler; package top.mes.admin.auth.handler;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.auth.AbstractLoginHandler; import top.mes.admin.auth.AbstractLoginHandler;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.SocialLoginReq; import top.mes.admin.auth.model.req.SocialLoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
import top.continew.starter.core.exception.BadRequestException; import top.continew.starter.core.exception.BadRequestException;
/** /**

2
mes-module-system/src/main/java/top/mes/admin/auth/model/query/OnlineUserQuery.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.query; package top.mes.admin.auth.model.query;
import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DatePattern;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/req/AccountLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.req; package top.mes.admin.auth.model.req;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/req/CardLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.req; package top.mes.admin.auth.model.req;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/req/EmailLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.req; package top.mes.admin.auth.model.req;
import cn.hutool.core.lang.RegexPool; import cn.hutool.core.lang.RegexPool;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

4
mes-module-system/src/main/java/top/mes/admin/auth/model/req/LoginReq.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.req; package top.mes.admin.auth.model.req;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;
import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo;
@@ -6,7 +6,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.Data; import lombok.Data;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/req/PhoneLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.req; package top.mes.admin.auth.model.req;
import cn.hutool.core.lang.RegexPool; import cn.hutool.core.lang.RegexPool;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/req/SocialLoginReq.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.req; package top.mes.admin.auth.model.req;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/resp/CaptchaResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.resp; package top.mes.admin.auth.model.resp;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder; import lombok.Builder;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/resp/LoginResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.resp; package top.mes.admin.auth.model.resp;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder; import lombok.Builder;

6
mes-module-system/src/main/java/top/mes/admin/auth/model/resp/OnlineUserResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.resp; package top.mes.admin.auth.model.resp;
import cn.crane4j.annotation.Assemble; import cn.crane4j.annotation.Assemble;
import cn.crane4j.annotation.AssembleMethod; import cn.crane4j.annotation.AssembleMethod;
@@ -6,8 +6,8 @@ import cn.crane4j.annotation.ContainerMethod;
import cn.crane4j.annotation.MappingType; import cn.crane4j.annotation.MappingType;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import top.wms.admin.auth.service.OnlineUserService; import top.mes.admin.auth.service.OnlineUserService;
import top.wms.admin.common.constant.ContainerConstants; import top.mes.admin.common.constant.ContainerConstants;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/resp/RouteResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.resp; package top.mes.admin.auth.model.resp;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;

2
mes-module-system/src/main/java/top/mes/admin/auth/model/resp/SocialAuthAuthorizeResp.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.model.resp; package top.mes.admin.auth.model.resp;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder; import lombok.Builder;

4
mes-module-system/src/main/java/top/mes/admin/auth/model/resp/UserInfoResp.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.auth.model.resp; package top.mes.admin.auth.model.resp;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import top.wms.admin.common.enums.GenderEnum; import top.mes.admin.common.enums.GenderEnum;
import top.continew.starter.security.mask.annotation.JsonMask; import top.continew.starter.security.mask.annotation.JsonMask;
import top.continew.starter.security.mask.enums.MaskType; import top.continew.starter.security.mask.enums.MaskType;

8
mes-module-system/src/main/java/top/mes/admin/auth/service/AuthService.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.auth.service; package top.mes.admin.auth.service;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import top.wms.admin.auth.model.req.LoginReq; import top.mes.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.auth.model.resp.RouteResp; import top.mes.admin.auth.model.resp.RouteResp;
import java.util.List; import java.util.List;

6
mes-module-system/src/main/java/top/mes/admin/auth/service/OnlineUserService.java
View File

@@ -1,7 +1,7 @@
package top.wms.admin.auth.service; package top.mes.admin.auth.service;
import top.wms.admin.auth.model.query.OnlineUserQuery; import top.mes.admin.auth.model.query.OnlineUserQuery;
import top.wms.admin.auth.model.resp.OnlineUserResp; import top.mes.admin.auth.model.resp.OnlineUserResp;
import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.model.resp.PageResp;

34
mes-module-system/src/main/java/top/mes/admin/auth/service/impl/AuthServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.service.impl; package top.mes.admin.auth.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
@@ -8,22 +8,22 @@ import cn.hutool.core.lang.tree.TreeUtil;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import top.wms.admin.auth.LoginHandler; import top.mes.admin.auth.LoginHandler;
import top.wms.admin.auth.LoginHandlerFactory; import top.mes.admin.auth.LoginHandlerFactory;
import top.wms.admin.auth.enums.AuthTypeEnum; import top.mes.admin.auth.enums.AuthTypeEnum;
import top.wms.admin.auth.model.req.LoginReq; import top.mes.admin.auth.model.req.LoginReq;
import top.wms.admin.auth.model.resp.LoginResp; import top.mes.admin.auth.model.resp.LoginResp;
import top.wms.admin.auth.model.resp.RouteResp; import top.mes.admin.auth.model.resp.RouteResp;
import top.wms.admin.auth.service.AuthService; import top.mes.admin.auth.service.AuthService;
import top.wms.admin.common.constant.SysConstants; import top.mes.admin.common.constant.SysConstants;
import top.wms.admin.common.context.RoleContext; import top.mes.admin.common.context.RoleContext;
import top.wms.admin.common.enums.DisEnableStatusEnum; import top.mes.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.system.enums.MenuTypeEnum; import top.mes.admin.system.enums.MenuTypeEnum;
import top.wms.admin.system.model.resp.ClientResp; import top.mes.admin.system.model.resp.ClientResp;
import top.wms.admin.system.model.resp.MenuResp; import top.mes.admin.system.model.resp.MenuResp;
import top.wms.admin.system.service.ClientService; import top.mes.admin.system.service.ClientService;
import top.wms.admin.system.service.MenuService; import top.mes.admin.system.service.MenuService;
import top.wms.admin.system.service.RoleService; import top.mes.admin.system.service.RoleService;
import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.core.validation.ValidationUtils;
import top.continew.starter.extension.crud.annotation.TreeField; import top.continew.starter.extension.crud.annotation.TreeField;
import top.continew.starter.extension.crud.autoconfigure.CrudProperties; import top.continew.starter.extension.crud.autoconfigure.CrudProperties;

14
mes-module-system/src/main/java/top/mes/admin/auth/service/impl/OnlineUserServiceImpl.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.auth.service.impl; package top.mes.admin.auth.service.impl;
import cn.crane4j.annotation.AutoOperate; import cn.crane4j.annotation.AutoOperate;
import cn.dev33.satoken.dao.SaTokenDao; import cn.dev33.satoken.dao.SaTokenDao;
@@ -10,12 +10,12 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import top.wms.admin.auth.model.query.OnlineUserQuery; import top.mes.admin.auth.model.query.OnlineUserQuery;
import top.wms.admin.auth.model.resp.OnlineUserResp; import top.mes.admin.auth.model.resp.OnlineUserResp;
import top.wms.admin.auth.service.OnlineUserService; import top.mes.admin.auth.service.OnlineUserService;
import top.wms.admin.common.context.UserContext; import top.mes.admin.common.context.UserContext;
import top.wms.admin.common.context.UserContextHolder; import top.mes.admin.common.context.UserContextHolder;
import top.wms.admin.common.context.UserExtraContext; import top.mes.admin.common.context.UserExtraContext;
import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.constant.StringConstants;
import top.continew.starter.extension.crud.model.query.PageQuery; import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.resp.PageResp; import top.continew.starter.extension.crud.model.resp.PageResp;

8
mes-module-system/src/main/java/top/mes/admin/system/config/file/FileInfoContainer.java
View File

@@ -1,11 +1,11 @@
package top.wms.admin.system.config.file; package top.mes.admin.system.config.file;
import cn.crane4j.core.container.Container; import cn.crane4j.core.container.Container;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.common.constant.ContainerConstants; import top.mes.admin.common.constant.ContainerConstants;
import top.wms.admin.system.model.entity.FileDO; import top.mes.admin.system.model.entity.FileDO;
import top.wms.admin.system.service.FileService; import top.mes.admin.system.service.FileService;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

14
mes-module-system/src/main/java/top/mes/admin/system/config/file/FileRecorderImpl.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.config.file; package top.mes.admin.system.config.file;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ClassUtil;
@@ -12,12 +12,12 @@ import org.dromara.x.file.storage.core.FileInfo;
import org.dromara.x.file.storage.core.recorder.FileRecorder; import org.dromara.x.file.storage.core.recorder.FileRecorder;
import org.dromara.x.file.storage.core.upload.FilePartInfo; import org.dromara.x.file.storage.core.upload.FilePartInfo;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.common.context.UserContextHolder; import top.mes.admin.common.context.UserContextHolder;
import top.wms.admin.system.enums.FileTypeEnum; import top.mes.admin.system.enums.FileTypeEnum;
import top.wms.admin.system.mapper.FileMapper; import top.mes.admin.system.mapper.FileMapper;
import top.wms.admin.system.mapper.StorageMapper; import top.mes.admin.system.mapper.StorageMapper;
import top.wms.admin.system.model.entity.FileDO; import top.mes.admin.system.model.entity.FileDO;
import top.wms.admin.system.model.entity.StorageDO; import top.mes.admin.system.model.entity.StorageDO;
import top.continew.starter.core.constant.StringConstants; import top.continew.starter.core.constant.StringConstants;
import java.util.Optional; import java.util.Optional;

12
mes-module-system/src/main/java/top/mes/admin/system/config/file/FileStorageConfigLoader.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.config.file; package top.mes.admin.system.config.file;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
@@ -7,11 +7,11 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner; import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.common.enums.DisEnableStatusEnum; import top.mes.admin.common.enums.DisEnableStatusEnum;
import top.wms.admin.system.model.query.StorageQuery; import top.mes.admin.system.model.query.StorageQuery;
import top.wms.admin.system.model.req.StorageReq; import top.mes.admin.system.model.req.StorageReq;
import top.wms.admin.system.model.resp.StorageResp; import top.mes.admin.system.model.resp.StorageResp;
import top.wms.admin.system.service.StorageService; import top.mes.admin.system.service.StorageService;
import java.util.List; import java.util.List;

8
mes-module-system/src/main/java/top/mes/admin/system/config/mail/MailConfigurerImpl.java
View File

@@ -1,12 +1,12 @@
package top.wms.admin.system.config.mail; package top.mes.admin.system.config.mail;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import top.wms.admin.common.constant.SysConstants; import top.mes.admin.common.constant.SysConstants;
import top.wms.admin.system.enums.OptionCategoryEnum; import top.mes.admin.system.enums.OptionCategoryEnum;
import top.wms.admin.system.service.OptionService; import top.mes.admin.system.service.OptionService;
import top.continew.starter.messaging.mail.core.MailConfig; import top.continew.starter.messaging.mail.core.MailConfig;
import top.continew.starter.messaging.mail.core.MailConfigurer; import top.continew.starter.messaging.mail.core.MailConfigurer;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/FileTypeEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import lombok.Getter; import lombok.Getter;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/ImportPolicyEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import lombok.Getter; import lombok.Getter;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/LogStatusEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/MenuTypeEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTemplateEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

4
mes-module-system/src/main/java/top/mes/admin/system/enums/MessageTypeEnum.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.wms.admin.common.constant.UiConstants; import top.mes.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.enums.BaseEnum;
/** /**

2
mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeScopeEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

4
mes-module-system/src/main/java/top/mes/admin/system/enums/NoticeStatusEnum.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.wms.admin.common.constant.UiConstants; import top.mes.admin.common.constant.UiConstants;
import top.continew.starter.core.enums.BaseEnum; import top.continew.starter.core.enums.BaseEnum;
import java.time.LocalDateTime; import java.time.LocalDateTime;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/OptionCategoryEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
/** /**
* 参数类别枚举 * 参数类别枚举

12
mes-module-system/src/main/java/top/mes/admin/system/enums/PasswordPolicyEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
@@ -8,11 +8,11 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import top.wms.admin.common.constant.RegexConstants; import top.mes.admin.common.constant.RegexConstants;
import top.wms.admin.common.constant.SysConstants; import top.mes.admin.common.constant.SysConstants;
import top.wms.admin.system.model.entity.UserDO; import top.mes.admin.system.model.entity.UserDO;
import top.wms.admin.system.service.OptionService; import top.mes.admin.system.service.OptionService;
import top.wms.admin.system.service.UserPasswordHistoryService; import top.mes.admin.system.service.UserPasswordHistoryService;
import top.continew.starter.core.validation.ValidationUtils; import top.continew.starter.core.validation.ValidationUtils;
import java.util.Map; import java.util.Map;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/SocialSourceEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

2
mes-module-system/src/main/java/top/mes/admin/system/enums/StorageTypeEnum.java
View File

@@ -1,4 +1,4 @@
package top.wms.admin.system.enums; package top.mes.admin.system.enums;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

4
mes-module-system/src/main/java/top/mes/admin/system/mapper/ClientMapper.java
View File

@@ -1,6 +1,6 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import top.wms.admin.system.model.entity.ClientDO; import top.mes.admin.system.model.entity.ClientDO;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
/** /**

4
mes-module-system/src/main/java/top/mes/admin/system/mapper/ConfigMapper.java
View File

@@ -1,7 +1,7 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
import top.wms.admin.system.model.entity.ConfigDO; import top.mes.admin.system.model.entity.ConfigDO;
/** /**
* 参数配置 Mapper * 参数配置 Mapper

4
mes-module-system/src/main/java/top/mes/admin/system/mapper/DeptMapper.java
View File

@@ -1,6 +1,6 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import top.wms.admin.system.model.entity.DeptDO; import top.mes.admin.system.model.entity.DeptDO;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
/** /**

6
mes-module-system/src/main/java/top/mes/admin/system/mapper/DictItemMapper.java
View File

@@ -1,9 +1,9 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import com.alicp.jetcache.anno.Cached; import com.alicp.jetcache.anno.Cached;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import top.wms.admin.common.constant.CacheConstants; import top.mes.admin.common.constant.CacheConstants;
import top.wms.admin.system.model.entity.DictItemDO; import top.mes.admin.system.model.entity.DictItemDO;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
import top.continew.starter.extension.crud.model.resp.LabelValueResp; import top.continew.starter.extension.crud.model.resp.LabelValueResp;

4
mes-module-system/src/main/java/top/mes/admin/system/mapper/DictMapper.java
View File

@@ -1,6 +1,6 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import top.wms.admin.system.model.entity.DictDO; import top.mes.admin.system.model.entity.DictDO;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
/** /**

6
mes-module-system/src/main/java/top/mes/admin/system/mapper/FileMapper.java
View File

@@ -1,8 +1,8 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import top.wms.admin.system.model.entity.FileDO; import top.mes.admin.system.model.entity.FileDO;
import top.wms.admin.system.model.resp.file.FileStatisticsResp; import top.mes.admin.system.model.resp.file.FileStatisticsResp;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
import java.util.List; import java.util.List;

6
mes-module-system/src/main/java/top/mes/admin/system/mapper/LogMapper.java
View File

@@ -1,12 +1,12 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.core.toolkit.Constants;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import top.wms.admin.system.model.entity.LogDO; import top.mes.admin.system.model.entity.LogDO;
import top.wms.admin.system.model.resp.log.LogResp; import top.mes.admin.system.model.resp.log.LogResp;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
import java.util.List; import java.util.List;

4
mes-module-system/src/main/java/top/mes/admin/system/mapper/MenuMapper.java
View File

@@ -1,7 +1,7 @@
package top.wms.admin.system.mapper; package top.mes.admin.system.mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import top.wms.admin.system.model.entity.MenuDO; import top.mes.admin.system.model.entity.MenuDO;
import top.continew.starter.data.mp.base.BaseMapper; import top.continew.starter.data.mp.base.BaseMapper;
import java.util.List; import java.util.List;

Some files were not shown because too many files have changed in this diff Show More