改名
This commit is contained in:
@@ -3,11 +3,11 @@
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>top.ysoft</groupId>
|
||||
<artifactId>ysoft-admin</artifactId>
|
||||
<groupId>top.wms</groupId>
|
||||
<artifactId>wms-admin</artifactId>
|
||||
<version>3.6.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>ysoft-common</artifactId>
|
||||
<artifactId>wms-common</artifactId>
|
||||
<version>3.6.0-SNAPSHOT</version>
|
||||
<description>公共模块(存放公共工具类,公共配置等)</description>
|
||||
<licenses>
|
||||
@@ -35,9 +35,9 @@
|
||||
<version>2.2.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>software.amazon.awssdk</groupId>
|
||||
<artifactId>s3</artifactId>
|
||||
<version>2.25.0</version>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
<version>1.12.780</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.freemarker</groupId>
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
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>
|
||||
<parent>
|
||||
<groupId>top.ysoft</groupId>
|
||||
<artifactId>ysoft-admin</artifactId>
|
||||
<groupId>top.wms</groupId>
|
||||
<artifactId>wms-admin</artifactId>
|
||||
<version>${revision}</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>ysoft-common</artifactId>
|
||||
<artifactId>wms-common</artifactId>
|
||||
<description>公共模块(存放公共工具类,公共配置等)</description>
|
||||
|
||||
<dependencies>
|
||||
@@ -37,9 +37,9 @@
|
||||
</dependency>
|
||||
<!-- Amazon S3(Amazon Simple Storage Service,亚马逊简单存储服务,通用存储协议 S3,兼容主流云厂商对象存储) -->
|
||||
<dependency>
|
||||
<groupId>software.amazon.awssdk</groupId>
|
||||
<artifactId>s3</artifactId>
|
||||
<version>2.25.0</version>
|
||||
<groupId>com.amazonaws</groupId>
|
||||
<artifactId>aws-java-sdk-s3</artifactId>
|
||||
<version>1.12.780</version>
|
||||
</dependency>
|
||||
|
||||
<!-- FreeMarker(模板引擎) -->
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.doc;
|
||||
package top.wms.admin.common.config.doc;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.hutool.core.map.MapUtil;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.doc;
|
||||
package top.wms.admin.common.config.doc;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import io.swagger.v3.oas.models.Operation;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.doc;
|
||||
package top.wms.admin.common.config.doc;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaCheckPermission;
|
||||
import cn.dev33.satoken.annotation.SaCheckRole;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.exception;
|
||||
package top.wms.admin.common.config.exception;
|
||||
|
||||
import cn.hutool.core.io.FileUtil;
|
||||
import cn.hutool.core.text.CharSequenceUtil;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.exception;
|
||||
package top.wms.admin.common.config.exception;
|
||||
|
||||
import cn.dev33.satoken.exception.NotLoginException;
|
||||
import cn.dev33.satoken.exception.NotPermissionException;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.mybatis;
|
||||
package top.wms.admin.common.config.mybatis;
|
||||
|
||||
import org.springframework.security.crypto.password.PasswordEncoder;
|
||||
import top.continew.starter.security.crypto.encryptor.IEncryptor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.mybatis;
|
||||
package top.wms.admin.common.config.mybatis;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package top.ysoft.admin.common.config.mybatis;
|
||||
package top.wms.admin.common.config.mybatis;
|
||||
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
import top.continew.starter.extension.datapermission.enums.DataScope;
|
||||
import top.continew.starter.extension.datapermission.filter.DataPermissionUserContextProvider;
|
||||
import top.continew.starter.extension.datapermission.model.RoleContext;
|
||||
@@ -24,7 +24,7 @@ public class DefaultDataPermissionUserContextProvider implements DataPermissionU
|
||||
|
||||
@Override
|
||||
public UserContext getUserContext() {
|
||||
top.ysoft.admin.common.context.UserContext context = UserContextHolder.getContext();
|
||||
top.wms.admin.common.context.UserContext context = UserContextHolder.getContext();
|
||||
UserContext userContext = new UserContext();
|
||||
userContext.setUserId(Convert.toStr(context.getId()));
|
||||
userContext.setDeptId(Convert.toStr(context.getDeptId()));
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package top.ysoft.admin.common.config.mybatis;
|
||||
package top.wms.admin.common.config.mybatis;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||
import org.apache.ibatis.reflection.MetaObject;
|
||||
import top.ysoft.admin.common.context.UserContextHolder;
|
||||
import top.ysoft.admin.common.model.entity.BaseDO;
|
||||
import top.wms.admin.common.context.UserContextHolder;
|
||||
import top.wms.admin.common.model.entity.BaseDO;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.mybatis;
|
||||
package top.wms.admin.common.config.mybatis;
|
||||
|
||||
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.properties;
|
||||
package top.wms.admin.common.config.properties;
|
||||
|
||||
import lombok.Data;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.properties;
|
||||
package top.wms.admin.common.config.properties;
|
||||
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.config.websocket;
|
||||
package top.wms.admin.common.config.websocket;
|
||||
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.constant;
|
||||
package top.wms.admin.common.constant;
|
||||
|
||||
import top.continew.starter.core.constant.StringConstants;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.constant;
|
||||
package top.wms.admin.common.constant;
|
||||
|
||||
/**
|
||||
* 通用常量信息
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.constant;
|
||||
package top.wms.admin.common.constant;
|
||||
|
||||
/**
|
||||
* 数据源容器相关常量(Crane4j 数据填充组件使用)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.constant;
|
||||
package top.wms.admin.common.constant;
|
||||
|
||||
/**
|
||||
* 正则相关常量
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.constant;
|
||||
package top.wms.admin.common.constant;
|
||||
|
||||
/**
|
||||
* 系统相关常量
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.constant;
|
||||
package top.wms.admin.common.constant;
|
||||
|
||||
/**
|
||||
* UI 相关常量
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package top.ysoft.admin.common.context;
|
||||
package top.wms.admin.common.context;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import top.ysoft.admin.common.enums.DataScopeEnum;
|
||||
import top.wms.admin.common.enums.DataScopeEnum;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package top.ysoft.admin.common.context;
|
||||
package top.wms.admin.common.context;
|
||||
|
||||
import cn.hutool.core.collection.CollUtil;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import top.ysoft.admin.common.constant.SysConstants;
|
||||
import top.wms.admin.common.constant.SysConstants;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package top.ysoft.admin.common.context;
|
||||
package top.wms.admin.common.context;
|
||||
|
||||
import cn.dev33.satoken.session.SaSession;
|
||||
import cn.dev33.satoken.stp.StpUtil;
|
||||
import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
import top.ysoft.admin.common.service.CommonUserService;
|
||||
import top.wms.admin.common.service.CommonUserService;
|
||||
import top.continew.starter.core.util.ExceptionUtils;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.context;
|
||||
package top.wms.admin.common.context;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.hutool.extra.servlet.JakartaServletUtil;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.controller;
|
||||
package top.wms.admin.common.controller;
|
||||
|
||||
import cn.dev33.satoken.annotation.SaIgnore;
|
||||
import cn.dev33.satoken.context.SaHolder;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
public enum CommonExceptionEnum {
|
||||
RULE_ERROR(1000, "您所所在得部门所属规则未绑定设备"), REQUEST_ERROR(1001, "请求异常"), PEOPLE_ERROR(1002, "您的信息未录入"),
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.ysoft.admin.common.constant.UiConstants;
|
||||
import top.wms.admin.common.constant.UiConstants;
|
||||
import top.continew.starter.core.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -24,7 +24,6 @@ public enum EnableEnum implements BaseEnum<Integer> {
|
||||
*/
|
||||
ENABLE(1, "启用");
|
||||
|
||||
|
||||
private final Integer value;
|
||||
private final String description;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.ysoft.admin.common.constant.UiConstants;
|
||||
import top.wms.admin.common.constant.UiConstants;
|
||||
import top.continew.starter.core.enums.BaseEnum;
|
||||
|
||||
/**
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package top.ysoft.admin.common.enums;
|
||||
package top.wms.admin.common.enums;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import top.continew.starter.core.enums.BaseEnum;
|
||||
import top.ysoft.admin.common.constant.UiConstants;
|
||||
import top.wms.admin.common.constant.UiConstants;
|
||||
|
||||
/**
|
||||
* 成功/失败状态枚举
|
||||
@@ -31,6 +31,7 @@ public enum YesNoEnum implements BaseEnum<Integer> {
|
||||
|
||||
/**
|
||||
* 根据描述获取枚举常量
|
||||
*
|
||||
* @param description 描述
|
||||
* @return 枚举常量
|
||||
*/
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.entity;
|
||||
package top.wms.admin.common.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.entity;
|
||||
package top.wms.admin.common.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.entity;
|
||||
package top.wms.admin.common.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.entity;
|
||||
package top.wms.admin.common.model.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.FieldFill;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package top.ysoft.admin.common.model.req;
|
||||
package top.wms.admin.common.model.req;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import lombok.Data;
|
||||
import top.ysoft.admin.common.enums.DisEnableStatusEnum;
|
||||
import top.wms.admin.common.enums.DisEnableStatusEnum;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.resp;
|
||||
package top.wms.admin.common.model.resp;
|
||||
|
||||
import cn.crane4j.annotation.Assemble;
|
||||
import cn.crane4j.annotation.Mapping;
|
||||
@@ -7,7 +7,7 @@ import com.alibaba.excel.annotation.ExcelIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import top.ysoft.admin.common.constant.ContainerConstants;
|
||||
import top.wms.admin.common.constant.ContainerConstants;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.resp;
|
||||
package top.wms.admin.common.model.resp;
|
||||
|
||||
import cn.crane4j.annotation.Assemble;
|
||||
import cn.crane4j.annotation.Mapping;
|
||||
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import top.ysoft.admin.common.constant.ContainerConstants;
|
||||
import top.wms.admin.common.constant.ContainerConstants;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.model.resp;
|
||||
package top.wms.admin.common.model.resp;
|
||||
|
||||
import cn.crane4j.annotation.Assemble;
|
||||
import cn.crane4j.annotation.Mapping;
|
||||
@@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Data;
|
||||
import top.ysoft.admin.common.constant.ContainerConstants;
|
||||
import top.wms.admin.common.constant.ContainerConstants;
|
||||
|
||||
import java.io.Serial;
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package top.ysoft.admin.common.service;
|
||||
package top.wms.admin.common.service;
|
||||
|
||||
import cn.crane4j.annotation.ContainerMethod;
|
||||
import cn.crane4j.annotation.MappingType;
|
||||
import top.ysoft.admin.common.constant.ContainerConstants;
|
||||
import top.wms.admin.common.constant.ContainerConstants;
|
||||
|
||||
/**
|
||||
* 公共用户业务接口
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.util;
|
||||
package top.wms.admin.common.util;
|
||||
|
||||
import org.apache.commons.codec.binary.Base64;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package top.ysoft.admin.common.util;
|
||||
package top.wms.admin.common.util;
|
||||
|
||||
import net.coobird.thumbnailator.Thumbnails;
|
||||
import org.springframework.mock.web.MockMultipartFile;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package top.ysoft.admin.common.util;
|
||||
package top.wms.admin.common.util;
|
||||
|
||||
import cn.hutool.core.codec.Base64;
|
||||
import cn.hutool.crypto.SecureUtil;
|
||||
import cn.hutool.crypto.asymmetric.KeyType;
|
||||
import cn.hutool.extra.spring.SpringUtil;
|
||||
import top.ysoft.admin.common.config.properties.RsaProperties;
|
||||
import top.wms.admin.common.config.properties.RsaProperties;
|
||||
import top.continew.starter.core.exception.BusinessException;
|
||||
import top.continew.starter.core.validation.ValidationUtils;
|
||||
import top.continew.starter.security.crypto.autoconfigure.CryptoProperties;
|
||||
|
||||
Reference in New Issue
Block a user