const整理

This commit is contained in:
yandanyang 2021-09-26 18:06:26 +08:00
parent e8dc6b5fe4
commit f4d4355837
62 changed files with 221 additions and 328 deletions

View File

@ -0,0 +1,20 @@
package net.lab1024.smartadmin.service.common.constant;
/**
* [ ]
*
* @author luoyi
* @date 2021/9/26 17:50
*/
public class ApiUrlPrefixConst {
/**
* 基础 api 前缀
*/
public static final String API_PREFIX_SUPPORT = "/support";
/**
* 后管 api 前缀
*/
public static final String API_PREFIX_ADMIN = "/admin";
}

View File

@ -1,9 +1,7 @@
package net.lab1024.smartadmin.service.common.constant;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Interner;
import com.google.common.collect.Interners;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
import java.util.*;
@ -44,16 +42,6 @@ public class CommonConst {
*/
public static final String EMPTY_STR = "";
/**
* 空MaP
*/
public static final Map EMPTY_MAP = Collections.unmodifiableMap(new HashMap<>(0));
/**
* list
*/
public static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList<>(0));
/**
* 全局通用 默认id
*/
@ -74,233 +62,17 @@ public class CommonConst {
*/
public static final Long DEFAULT_PARENT_ID = 0L;
/**
* 空MaP
*/
public static final Map EMPTY_MAP = Collections.unmodifiableMap(new HashMap<>(0));
/**
* list
*/
public static final List EMPTY_LIST = Collections.unmodifiableList(new ArrayList<>(0));
public static final Interner<String> STRING_POOL = Interners.newWeakInterner();
public static final class ApiUrl {
/**
* 基础 api 前缀
*/
public static final String API_PREFIX_SUPPORT = "/support";
/**
* 后管 api 前缀
*/
public static final String API_PREFIX_ADMIN = "/admin";
/**
* app 业务 api 前缀
*/
public static final String API_PREFIX_APP = "/app";
/**
* PC 业务 api 前缀
*/
public static final String API_PREFIX_PC = "/pc";
/**
* 开放平台 api 前缀
*/
public static final String API_PREFIX_OPEN = "/open";
}
public static final String IGNORE_H5_URL_MAPPING = "/h5/api";
public static final class FileServiceConst {
/**
* 公用读取文件夹 public
*/
public static final String FOLDER_PUBLIC = "pu";
/**
* 私有读取文件夹 private
*/
public static final String FOLDER_PRIVATE = "pr";
/**
* 文件夹格式
*/
public static final String FOLDER_FORMAT = "folder";
}
public static final class System {
/**
* oss url redis 过期时间
*/
public static final int FILE_URL_EXPIRE_SECOND = 7100;
public static final int FILE_VO_EXPIRE_SECOND = 86400;
/**
* 系统 id
*/
public static final Long SYSTEM_ID = 0L;
/**
* 系统 名称
*/
public static final String SYSTEM_NAME = "小蜜蜂CRM系统";
}
/**
* 长度类常量
*/
public static final class NumberLimit {
/**
* 用户昵称
*/
public static final int USER_NICKNAME = 15;
/**
* 短信验证码长度
*/
public static final int SMS_CODE = 6;
/**
* 短信发送间隔
*/
public static final int SMS_SEND_INTERVAL = 60;
/**
* 短信有效期
*/
public static final int SMS_VALID_SECOND = 300;
/**
* 验证码短信 每天的限制
*/
public static final int SMS_DAY_LIMIT = 10;
/**
* 文件名称长度
*/
public static final int FILE_NAME = 100;
}
public static final class Password {
public static final String DEFAULT = "123456";
public static final String SALT_FORMAT = "xiaomifeng_%s_crm";
}
public static final class CommonCollection {
public static final Set<String> IGNORE_URL = ImmutableSet.of("/swagger", "Excel");
public static final Set<String> IGNORE_URL_MAPPING = ImmutableSet.of(IGNORE_H5_URL_MAPPING);
public static Boolean contain(Set<String> ignores, String uri) {
if (CollectionUtils.isEmpty(ignores)) {
return false;
}
for (String ignoreUrl : ignores) {
if (uri.startsWith(ignoreUrl)) {
return true;
}
}
return false;
}
}
/**
* 用户类型
*/
public static class UserType {
/**
* 用户
*/
public static final Integer USER = 1;
/**
* 管理端
*/
public static final Integer ADMIN = 3;
/**
* 系统
*/
public static final Integer SYSTEM = 4;
/**
* 游客
*/
public static final Integer NO_LOGIN = 5;
}
/**
* 请求头常量
*/
public static class RequestHeader {
public static final String TOKEN = "x-access-token";
public static final String USER_AGENT = "user-agent";
/**
* 用户唯一标识
*/
public static final String USER_IDENTITY = "user-identity";
/**
* 经纬度
*/
public static final String USER_GEO = "user-geo";
/**
* 位置
*/
public static final String USER_LOCATION = "user-location";
}
/**
* 系统类型
*/
public static class SystemType {
public static final int XMF_CRM = 100;
public static final int REN_MIN = 200;
public static final int ZHI_KAO = 300;
public static final int XIAO_YING_YI = 400;
}
/**
* 支付方式
*/
public static class PayType {
public static final int WX = 10;
public static final int ZFB = 15;
/**
* 20 线下支付
*/
public static final int OFFLINE = 20;
/**
* 21 银行卡
*/
public static final int BANK = 21;
}
public static final class Token {
public static final String DEFAULT_TOKEN = "default-token-id-";
public static final String INNER_TOKEN_NAME = "inner-token";
public static final String OUTER_TOKEN_NAME = "x-access-token";
}
}

View File

@ -0,0 +1,39 @@
package net.lab1024.smartadmin.service.common.constant;
/**
* [ ]
*
* @author luoyi
* @date 2021/9/26 17:45
*/
public class NumberLimitConst {
/**
* 用户昵称
*/
public static final int USER_NICKNAME = 15;
/**
* 短信验证码长度
*/
public static final int SMS_CODE = 6;
/**
* 短信发送间隔
*/
public static final int SMS_SEND_INTERVAL = 60;
/**
* 短信有效期
*/
public static final int SMS_VALID_SECOND = 300;
/**
* 验证码短信 每天的限制
*/
public static final int SMS_DAY_LIMIT = 10;
/**
* 文件名称长度
*/
public static final int FILE_NAME = 100;
}

View File

@ -0,0 +1,29 @@
package net.lab1024.smartadmin.service.common.constant;
/**
* [ ]
*
* @author luoyi
* @date 2021/9/26 17:43
*/
public class RequestHeaderConst {
public static final String TOKEN = "x-access-token";
public static final String USER_AGENT = "user-agent";
/**
* 用户唯一标识
*/
public static final String USER_IDENTITY = "user-identity";
/**
* 经纬度
*/
public static final String USER_GEO = "user-geo";
/**
* 位置
*/
public static final String USER_LOCATION = "user-location";
}

View File

@ -0,0 +1,15 @@
package net.lab1024.smartadmin.service.common.constant;
/**
* @author 罗伊
* @date 2021-01-31 0:00
*/
public class SystemConst {
public static final class Password {
public static final String DEFAULT = "123456";
public static final String SALT_FORMAT = "smartAdmin_%s";
}
}

View File

@ -1,6 +1,7 @@
package net.lab1024.smartadmin.service.common.controller;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import org.springframework.web.bind.annotation.RequestMapping;
@ -9,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @create: 2020-03-31 08:54 PM from win10
*/
@Slf4j
@RequestMapping(CommonConst.ApiUrl.API_PREFIX_ADMIN)
@RequestMapping(ApiUrlPrefixConst.API_PREFIX_ADMIN)
public class AdminBaseController {
}

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.common.controller;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst;
import org.springframework.web.bind.annotation.RequestMapping;
/**
@ -9,6 +9,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author 胡克
* @date 2019/10/18 11:51
*/
@RequestMapping(CommonConst.ApiUrl.API_PREFIX_SUPPORT)
@RequestMapping(ApiUrlPrefixConst.API_PREFIX_SUPPORT)
public class SupportBaseController {
}

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.common.domain;
import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
/**
*

View File

@ -1,4 +1,4 @@
package net.lab1024.smartadmin.service.common.constant;
package net.lab1024.smartadmin.service.common.enumconst;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONAware;

View File

@ -1,4 +1,4 @@
package net.lab1024.smartadmin.service.common.constant;
package net.lab1024.smartadmin.service.common.enumconst;
/**
* 性别枚举类

View File

@ -1,4 +1,4 @@
package net.lab1024.smartadmin.service.common.constant;
package net.lab1024.smartadmin.service.common.enumconst;
/**

View File

@ -3,6 +3,7 @@ package net.lab1024.smartadmin.service.common.security;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.smartadmin.service.common.anno.NoNeedLogin;
import net.lab1024.smartadmin.service.common.constant.ApiUrlPrefixConst;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
@ -69,7 +70,7 @@ public class SmartSecurityUrlMatchers {
ignoreUrl.add("/swagger-resources/**");
ignoreUrl.add("/webjars/**");
ignoreUrl.add("/*/api-docs");
ignoreUrl.add(CommonConst.ApiUrl.API_PREFIX_SUPPORT + "/**");
ignoreUrl.add(ApiUrlPrefixConst.API_PREFIX_SUPPORT + "/**");
log.info("忽略URL{}", ignoreUrl);
return ignoreUrl;
}

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.common.swagger;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.common.swagger;
import com.google.common.base.Function;
import com.google.common.base.Optional;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import org.apache.commons.lang3.StringUtils;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.annotation.Order;

View File

@ -1,4 +1,4 @@
package net.lab1024.smartadmin.service.common.constant;
package net.lab1024.smartadmin.service.common.swagger;
/**
* [ ]

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.common.validator.en;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import javax.validation.Constraint;
import javax.validation.Payload;

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.common.validator.en;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;

View File

@ -7,9 +7,9 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import io.swagger.annotations.Api;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.constant.RequestHeaderConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.swagger.SwaggerApiModelPropertyEnumPlugin;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeansException;
@ -221,35 +221,35 @@ public class SwaggerConfig implements EnvironmentAware, BeanDefinitionRegistryPo
*/
private List<Parameter> generateParameter() {
// 配置全局参数 token
Parameter token = new ParameterBuilder().name(CommonConst.RequestHeader.TOKEN)
Parameter token = new ParameterBuilder().name(RequestHeaderConst.TOKEN)
.description("token")
.modelRef(new ModelRef("string"))
.parameterType("header").defaultValue("1")
.required(false)
.build();
Parameter agent = new ParameterBuilder().name(CommonConst.RequestHeader.USER_AGENT)
Parameter agent = new ParameterBuilder().name(RequestHeaderConst.USER_AGENT)
.description("agent")
.modelRef(new ModelRef("string"))
.parameterType("header").defaultValue("")
.required(false)
.build();
Parameter identity = new ParameterBuilder().name(CommonConst.RequestHeader.USER_IDENTITY)
Parameter identity = new ParameterBuilder().name(RequestHeaderConst.USER_IDENTITY)
.description("用户唯一标识")
.modelRef(new ModelRef("string"))
.parameterType("header").defaultValue("")
.required(false)
.build();
Parameter geo = new ParameterBuilder().name(CommonConst.RequestHeader.USER_GEO)
Parameter geo = new ParameterBuilder().name(RequestHeaderConst.USER_GEO)
.description("定位")
.modelRef(new ModelRef("string"))
.parameterType("header").defaultValue("")
.required(false)
.build();
Parameter location = new ParameterBuilder().name(CommonConst.RequestHeader.USER_LOCATION)
Parameter location = new ParameterBuilder().name(RequestHeaderConst.USER_LOCATION)
.description("位置")
.modelRef(new ModelRef("string"))
.parameterType("header").defaultValue("")

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.config;
import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO;
import net.lab1024.smartadmin.service.util.SmartBaseEnumUtil;
import org.apache.commons.lang3.StringUtils;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.handler;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO;
import net.lab1024.smartadmin.service.common.exception.SmartBusinessException;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.category;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.business.category.domain.*;

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.business.category.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* 分类类型 枚举

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.goods;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.business.goods.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* 商品类型 枚举

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.business.notice;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.PageBaseDTO;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.module.support.beanrecord.annotation;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

View File

@ -4,7 +4,7 @@ package net.lab1024.smartadmin.service.module.support.captcha;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.anno.NoNeedLogin;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.support.captcha.domain.CaptchaVO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.datatracer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.support.datatracer.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* [ 数据业务类型 ]

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.support.datatracer.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* [ ]

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.support.datatracer.domain;
import lombok.Data;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import net.lab1024.smartadmin.service.module.support.datatracer.constant.DataTracerBusinessTypeEnum;
import java.time.LocalDateTime;

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.module.support.file;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.common.controller.SupportBaseController;

View File

@ -1,7 +1,6 @@
package net.lab1024.smartadmin.service.module.support.file.domain;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* 文件服务 文件夹位置类型枚举类
@ -11,11 +10,26 @@ import net.lab1024.smartadmin.service.common.constant.CommonConst;
*/
public enum FileFolderTypeEnum implements BaseEnum {
COMMON(1, CommonConst.FileServiceConst.FOLDER_PUBLIC + "/common/", "通用"),
COMMON(1, FileFolderTypeEnum.FOLDER_PUBLIC + "/common/", "通用"),
;
public static final String INFO = "201:erp货物";
/**
* 公用读取文件夹 public
*/
public static final String FOLDER_PUBLIC = "pu";
/**
* 私有读取文件夹 private
*/
public static final String FOLDER_PRIVATE = "pr";
/**
* 文件夹格式
*/
public static final String FOLDER_FORMAT = "folder";
public static final String INFO = "1:通用";
private Integer value;

View File

@ -6,6 +6,7 @@ import com.google.common.collect.Lists;
import net.lab1024.smartadmin.service.common.codeconst.FileResponseCodeConst;
import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import net.lab1024.smartadmin.service.common.constant.NumberLimitConst;
import net.lab1024.smartadmin.service.common.constant.RedisKeyConst;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
@ -98,7 +99,7 @@ public class FileService {
}
// 校验文件名称
String originalFilename = file.getOriginalFilename();
if (StringUtils.isBlank(originalFilename) || originalFilename.length() > CommonConst.NumberLimit.FILE_NAME) {
if (StringUtils.isBlank(originalFilename) || originalFilename.length() > NumberLimitConst.FILE_NAME) {
return ResponseDTO.wrap(FileResponseCodeConst.FILE_NAME_ERROR);
}
// 校验文件大小
@ -126,11 +127,11 @@ public class FileService {
uploadVO.setFileId(fileEntity.getId());
//添加缓存
String redisKey = RedisKeyConst.Base.FILE_URL + uploadVO.getFileKey();
redisService.set(redisKey, uploadVO.getFileUrl(), CommonConst.System.FILE_URL_EXPIRE_SECOND);
redisService.set(redisKey, uploadVO.getFileUrl(), fileStorageService.cacheExpireSecond());
String fileRedisKey = RedisKeyConst.Base.FILE_VO + uploadVO.getFileKey();
FileVO fileVO = SmartBeanUtil.copy(fileEntity, FileVO.class);
redisService.set(fileRedisKey, fileVO, CommonConst.System.FILE_VO_EXPIRE_SECOND);
redisService.set(fileRedisKey, fileVO, fileStorageService.cacheExpireSecond());
}
return response;
@ -156,7 +157,7 @@ public class FileService {
if (fileVO == null) {
fileVO = fileDao.getByFileKey(fileKey);
if (fileVO != null) {
redisService.set(redisKey, fileVO, CommonConst.System.FILE_VO_EXPIRE_SECOND);
redisService.set(redisKey, fileVO, fileStorageService.cacheExpireSecond());
}
}
@ -194,7 +195,7 @@ public class FileService {
return null;
}
fileUrl = responseDTO.getData();
redisService.set(redisKey, fileUrl, CommonConst.System.FILE_URL_EXPIRE_SECOND);
redisService.set(redisKey, fileUrl, fileStorageService.cacheExpireSecond());
return fileUrl;
}

View File

@ -10,6 +10,7 @@ import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.config.FileCloudConfig;
import net.lab1024.smartadmin.service.module.support.file.domain.FileFolderTypeEnum;
import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileDownloadDTO;
import net.lab1024.smartadmin.service.module.support.file.domain.dto.FileMetadataDTO;
import net.lab1024.smartadmin.service.module.support.file.domain.vo.FileUploadVO;
@ -121,7 +122,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
if (StringUtils.isBlank(fileKey)) {
return ResponseDTO.wrap(ResponseCodeConst.ERROR_PARAM);
}
if (!fileKey.startsWith(CommonConst.FileServiceConst.FOLDER_PRIVATE)) {
if (!fileKey.startsWith(FileFolderTypeEnum.FOLDER_PRIVATE)) {
// 不是私有的 都公共读
return ResponseDTO.succData(cloudConfig.getPublicUrl() + fileKey);
}
@ -183,7 +184,7 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
*/
private CannedAccessControlList getACL(String fileKey) {
// 公用读
if (fileKey.contains(CommonConst.FileServiceConst.FOLDER_PUBLIC)) {
if (fileKey.contains(FileFolderTypeEnum.FOLDER_PUBLIC)) {
return CannedAccessControlList.PublicRead;
}
// 其他默认私有读写
@ -205,4 +206,9 @@ public class FileStorageCloudServiceImpl implements IFileStorageService {
}
@Override
public Long cacheExpireSecond(){
return cloudConfig.getUrlExpire() - 1800;
}
}

View File

@ -56,6 +56,15 @@ public interface IFileStorageService {
ResponseDTO<String> delete(String fileKey);
/**
* 缓存过期秒数
* @return
*/
default Long cacheExpireSecond(){
return 3600L;
}
/**
* 不带后缀名的文件名
*

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.heartbeat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.domain.PageBaseDTO;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.support.idgenerator;
import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
import net.lab1024.smartadmin.service.module.support.idgenerator.constant.IdGeneratorEnum;

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.module.support.idgenerator.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* @author Administrator

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.support.operatelog;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.datascope;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.datascope.domain.dto.DataScopeAndViewTypeVO;

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.system.datascope.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* [ ]

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.system.datascope.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* [ ]

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.system.datascope.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* [ ]

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.department;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.department.domain.dto.DepartmentCreateDTO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -5,6 +5,7 @@ import com.google.common.collect.Lists;
import net.lab1024.smartadmin.service.common.codeconst.ResponseCodeConst;
import net.lab1024.smartadmin.service.common.constant.CacheModuleConst;
import net.lab1024.smartadmin.service.common.constant.CommonConst;
import net.lab1024.smartadmin.service.common.constant.SystemConst;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.support.beancache.cache.IBeanCache;
@ -488,8 +489,8 @@ public class EmployeeService {
* @return
*/
public static String getEncryptPwd(String pwd) {
pwd = StringUtils.isBlank(pwd) ? CommonConst.Password.DEFAULT : pwd;
return DigestUtils.md5Hex(String.format(CommonConst.Password.SALT_FORMAT, pwd));
pwd = StringUtils.isBlank(pwd) ? SystemConst.Password.DEFAULT : pwd;
return DigestUtils.md5Hex(String.format(SystemConst.Password.SALT_FORMAT, pwd));
}
public static void main(String[] args) {

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.constant.GenderEnum;
import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
import net.lab1024.smartadmin.service.util.SmartVerificationUtil;
import org.hibernate.validator.constraints.Length;

View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
import java.time.LocalDateTime;
@ -38,7 +39,7 @@ public class EmployeeEntity {
/**
* 性别
*
* @see net.lab1024.smartadmin.service.common.constant.GenderEnum
* @see GenderEnum
*/
private Integer gender;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.employee.domain.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.constant.GenderEnum;
import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
import java.time.LocalDateTime;

View File

@ -3,7 +3,7 @@ package net.lab1024.smartadmin.service.module.system.login;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.anno.NoNeedLogin;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.employee.domain.dto.EmployeeLoginDTO;

View File

@ -4,7 +4,7 @@ import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.smartadmin.service.common.constant.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.enumconst.SystemEnvironmentEnum;
import net.lab1024.smartadmin.service.common.domain.SystemEnvironmentBO;
import net.lab1024.smartadmin.service.module.system.employee.EmployeeService;
import net.lab1024.smartadmin.service.module.system.login.domain.EmployeeLoginBO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.login.domain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import net.lab1024.smartadmin.service.common.constant.GenderEnum;
import net.lab1024.smartadmin.service.common.enumconst.GenderEnum;
import net.lab1024.smartadmin.service.common.swagger.ApiModelPropertyEnum;
import java.util.List;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.menu;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.menu.domain.*;

View File

@ -58,8 +58,8 @@ public class RequestUrlService {
}
}
//获取url的Set集合一个方法可能对应多个url
Set<String> patterns = info.getPatternsCondition().getPatterns();
if (CollectionUtils.isEmpty(patterns)) {
Set<String> urlSet = info.getPatternsCondition().getPatterns();
if (CollectionUtils.isEmpty(urlSet)) {
return;
}
String className = handlerMethod.getMethod().getDeclaringClass().getName();
@ -80,7 +80,6 @@ public class RequestUrlService {
methodComment = handlerMethod.getMethod().getName();
}
}
Set<String> urlSet = this.getUrlSet(patterns);
for (String url : urlSet) {
RequestUrlVO requestUrlVO = new RequestUrlVO();
requestUrlVO.setUrl(url);
@ -91,21 +90,6 @@ public class RequestUrlService {
});
}
private Set<String> getUrlSet(Set<String> patterns) {
Set<String> urlSet = Sets.newHashSet();
for (String url : patterns) {
for (String ignoreUrl : CommonConst.CommonCollection.IGNORE_URL) {
if (url.startsWith(ignoreUrl)) {
urlSet.add(url.substring(ignoreUrl.length() - 1));
} else {
urlSet.add(url);
}
}
}
return urlSet;
}
public List<RequestUrlVO> getPrivilegeList() {
return this.requestUrlVOS;
}

View File

@ -1,7 +1,7 @@
package net.lab1024.smartadmin.service.module.system.menu.constant;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* 菜单类型枚举

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.basic;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.role.basic.domain.dto.RoleAddDTO;

View File

@ -4,7 +4,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.role.rolemenu;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.AdminBaseController;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;
import net.lab1024.smartadmin.service.module.system.role.rolemenu.domain.RoleMenuDTO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.lab1024.smartadmin.service.common.constant.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.swagger.SwaggerTagConst;
import net.lab1024.smartadmin.service.common.controller.SupportBaseController;
import net.lab1024.smartadmin.service.common.domain.PageResultDTO;
import net.lab1024.smartadmin.service.common.domain.ResponseDTO;

View File

@ -2,7 +2,7 @@ package net.lab1024.smartadmin.service.module.system.systemconfig;
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
/**
* [ 系统配置常量类 ]

View File

@ -1,6 +1,6 @@
package net.lab1024.smartadmin.service.util;
import net.lab1024.smartadmin.service.common.constant.BaseEnum;
import net.lab1024.smartadmin.service.common.enumconst.BaseEnum;
import java.util.List;
import java.util.Objects;