假期作业
parent
78e61d89ba
commit
a353d1caef
|
@ -1 +1 @@
|
||||||
custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html
|
custom: http://doc.HomeWork.vip/HomeWork-cloud/other/donate.html
|
||||||
|
|
|
@ -3,24 +3,24 @@
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
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">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>HomeWork</groupId>
|
||||||
<artifactId>ruoyi-api</artifactId>
|
<artifactId>HomeWork-api</artifactId>
|
||||||
<version>3.6.3</version>
|
<version>3.6.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-api-system</artifactId>
|
<artifactId>HomeWork-api-system</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-api-system系统接口模块
|
HomeWork-api-system系统接口模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
<!-- RuoYi Common Core-->
|
<!-- RuoYi Common Core-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>HomeWork</groupId>
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
<artifactId>HomeWork-common-core</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
|
@ -1,14 +1,14 @@
|
||||||
package com.ruoyi.system.api;
|
package HomeWork.system.api;
|
||||||
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestPart;
|
import org.springframework.web.bind.annotation.RequestPart;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
import HomeWork.common.core.constant.ServiceNameConstants;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.system.api.domain.SysFile;
|
import HomeWork.system.api.domain.SysFile;
|
||||||
import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
|
import HomeWork.system.api.factory.RemoteFileFallbackFactory;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件服务
|
* 文件服务
|
|
@ -1,15 +1,18 @@
|
||||||
package com.ruoyi.system.api;
|
package HomeWork.system.api;
|
||||||
|
|
||||||
|
import HomeWork.system.api.domain.SysUser;
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import org.springframework.web.bind.annotation.PostMapping;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
import org.springframework.web.bind.annotation.RequestHeader;
|
import org.springframework.web.bind.annotation.RequestHeader;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import HomeWork.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
import HomeWork.common.core.constant.ServiceNameConstants;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.system.api.domain.SysLogininfor;
|
import HomeWork.system.api.domain.SysLogininfor;
|
||||||
import com.ruoyi.system.api.domain.SysOperLog;
|
import HomeWork.system.api.domain.SysOperLog;
|
||||||
import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
|
import HomeWork.system.api.factory.RemoteLogFallbackFactory;
|
||||||
|
import org.springframework.web.bind.annotation.RequestParam;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 日志服务
|
* 日志服务
|
||||||
|
@ -38,4 +41,5 @@ public interface RemoteLogService
|
||||||
*/
|
*/
|
||||||
@PostMapping("/logininfor")
|
@PostMapping("/logininfor")
|
||||||
public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,17 +1,13 @@
|
||||||
package com.ruoyi.system.api;
|
package HomeWork.system.api;
|
||||||
|
|
||||||
import org.springframework.cloud.openfeign.FeignClient;
|
import org.springframework.cloud.openfeign.FeignClient;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PathVariable;
|
import HomeWork.common.core.constant.SecurityConstants;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import HomeWork.common.core.constant.ServiceNameConstants;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import HomeWork.common.core.domain.R;
|
||||||
import org.springframework.web.bind.annotation.RequestHeader;
|
import HomeWork.system.api.domain.SysUser;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import HomeWork.system.api.factory.RemoteUserFallbackFactory;
|
||||||
import com.ruoyi.common.core.constant.ServiceNameConstants;
|
import HomeWork.system.api.model.LoginUser;
|
||||||
import com.ruoyi.common.core.domain.R;
|
|
||||||
import com.ruoyi.system.api.domain.SysUser;
|
|
||||||
import com.ruoyi.system.api.factory.RemoteUserFallbackFactory;
|
|
||||||
import com.ruoyi.system.api.model.LoginUser;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户服务
|
* 用户服务
|
||||||
|
@ -40,4 +36,14 @@ public interface RemoteUserService
|
||||||
*/
|
*/
|
||||||
@PostMapping("/user/register")
|
@PostMapping("/user/register")
|
||||||
public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
public R<Boolean> registerUserInfo(@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 人脸登录
|
||||||
|
* @param url
|
||||||
|
* @return
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
@PostMapping("/user/faceLogin")
|
||||||
|
public R<LoginUser> faceLogin(@RequestParam("url") String url) throws Exception;
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 部门表 sys_dept
|
* 部门表 sys_dept
|
|
@ -1,13 +1,13 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.constant.UserConstants;
|
import HomeWork.common.core.constant.UserConstants;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字典数据表 sys_dict_data
|
* 字典数据表 sys_dict_data
|
|
@ -1,13 +1,13 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
import javax.validation.constraints.Pattern;
|
import javax.validation.constraints.Pattern;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字典类型表 sys_dict_type
|
* 字典类型表 sys_dict_type
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
|
@ -1,10 +1,10 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 系统访问记录表 sys_logininfor
|
* 系统访问记录表 sys_logininfor
|
|
@ -1,10 +1,10 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 操作日志记录表 oper_log
|
* 操作日志记录表 oper_log
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import javax.validation.constraints.NotBlank;
|
import javax.validation.constraints.NotBlank;
|
||||||
|
@ -6,9 +6,9 @@ import javax.validation.constraints.NotNull;
|
||||||
import javax.validation.constraints.Size;
|
import javax.validation.constraints.Size;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 角色表 sys_role
|
* 角色表 sys_role
|
|
@ -1,16 +1,16 @@
|
||||||
package com.ruoyi.system.api.domain;
|
package HomeWork.system.api.domain;
|
||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import javax.validation.constraints.*;
|
import javax.validation.constraints.*;
|
||||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.annotation.Excel.Type;
|
import HomeWork.common.core.annotation.Excel.Type;
|
||||||
import com.ruoyi.common.core.annotation.Excels;
|
import HomeWork.common.core.annotation.Excels;
|
||||||
import com.ruoyi.common.core.web.domain.BaseEntity;
|
import HomeWork.common.core.web.domain.BaseEntity;
|
||||||
import com.ruoyi.common.core.xss.Xss;
|
import HomeWork.common.core.xss.Xss;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户对象 sys_user
|
* 用户对象 sys_user
|
|
@ -1,13 +1,13 @@
|
||||||
package com.ruoyi.system.api.factory;
|
package HomeWork.system.api.factory;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.system.api.RemoteFileService;
|
import HomeWork.system.api.RemoteFileService;
|
||||||
import com.ruoyi.system.api.domain.SysFile;
|
import HomeWork.system.api.domain.SysFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件服务降级处理
|
* 文件服务降级处理
|
|
@ -1,13 +1,14 @@
|
||||||
package com.ruoyi.system.api.factory;
|
package HomeWork.system.api.factory;
|
||||||
|
|
||||||
|
import HomeWork.system.api.domain.SysUser;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.system.api.RemoteLogService;
|
import HomeWork.system.api.RemoteLogService;
|
||||||
import com.ruoyi.system.api.domain.SysLogininfor;
|
import HomeWork.system.api.domain.SysLogininfor;
|
||||||
import com.ruoyi.system.api.domain.SysOperLog;
|
import HomeWork.system.api.domain.SysOperLog;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 日志服务降级处理
|
* 日志服务降级处理
|
||||||
|
@ -36,6 +37,7 @@ public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogServic
|
||||||
{
|
{
|
||||||
return R.fail("保存登录日志失败:" + throwable.getMessage());
|
return R.fail("保存登录日志失败:" + throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,13 +1,13 @@
|
||||||
package com.ruoyi.system.api.factory;
|
package HomeWork.system.api.factory;
|
||||||
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.cloud.openfeign.FallbackFactory;
|
import org.springframework.cloud.openfeign.FallbackFactory;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.system.api.RemoteUserService;
|
import HomeWork.system.api.RemoteUserService;
|
||||||
import com.ruoyi.system.api.domain.SysUser;
|
import HomeWork.system.api.domain.SysUser;
|
||||||
import com.ruoyi.system.api.model.LoginUser;
|
import HomeWork.system.api.model.LoginUser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户服务降级处理
|
* 用户服务降级处理
|
||||||
|
@ -36,6 +36,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
|
||||||
{
|
{
|
||||||
return R.fail("注册用户失败:" + throwable.getMessage());
|
return R.fail("注册用户失败:" + throwable.getMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public R<LoginUser> faceLogin(String url) throws Exception {
|
||||||
|
return R.fail("人脸登录失败:" + throwable.getMessage());
|
||||||
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,8 +1,8 @@
|
||||||
package com.ruoyi.system.api.model;
|
package HomeWork.system.api.model;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import com.ruoyi.system.api.domain.SysUser;
|
import HomeWork.system.api.domain.SysUser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户信息
|
* 用户信息
|
|
@ -0,0 +1,3 @@
|
||||||
|
HomeWork.system.api.factory.RemoteUserFallbackFactory
|
||||||
|
HomeWork.system.api.factory.RemoteLogFallbackFactory
|
||||||
|
HomeWork.system.api.factory.RemoteFileFallbackFactory
|
|
@ -2,21 +2,21 @@
|
||||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
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">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>HomeWork</groupId>
|
||||||
<artifactId>ruoyi</artifactId>
|
<artifactId>HomeWork</artifactId>
|
||||||
<version>3.6.3</version>
|
<version>3.6.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>ruoyi-api-system</module>
|
<module>HomeWork-api-system</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<artifactId>ruoyi-api</artifactId>
|
<artifactId>HomeWork-api</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-api系统接口
|
HomeWork-api系统接口
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
</project>
|
</project>
|
|
@ -2,20 +2,27 @@
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
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">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>HomeWork</groupId>
|
||||||
<artifactId>ruoyi</artifactId>
|
<artifactId>HomeWork</artifactId>
|
||||||
<version>3.6.3</version>
|
<version>3.6.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-auth</artifactId>
|
<artifactId>HomeWork-auth</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-auth认证授权中心
|
HomeWork-auth认证授权中心
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
||||||
|
<!-- Oss上传 -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.aliyun.oss</groupId>
|
||||||
|
<artifactId>aliyun-sdk-oss</artifactId>
|
||||||
|
<version>3.10.2</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- SpringCloud Alibaba Nacos -->
|
<!-- SpringCloud Alibaba Nacos -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alibaba.cloud</groupId>
|
<groupId>com.alibaba.cloud</groupId>
|
||||||
|
@ -48,9 +55,15 @@
|
||||||
|
|
||||||
<!-- RuoYi Common Security-->
|
<!-- RuoYi Common Security-->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>HomeWork</groupId>
|
||||||
<artifactId>ruoyi-common-security</artifactId>
|
<artifactId>HomeWork-common-security</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<!--lombok依赖-->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
package com.ruoyi.auth;
|
package HomeWork.auth;
|
||||||
|
|
||||||
import org.springframework.boot.SpringApplication;
|
import org.springframework.boot.SpringApplication;
|
||||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||||
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
||||||
import com.ruoyi.common.security.annotation.EnableRyFeignClients;
|
import HomeWork.common.security.annotation.EnableRyFeignClients;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 认证授权中心
|
* 认证授权中心
|
||||||
|
@ -12,11 +12,11 @@ import com.ruoyi.common.security.annotation.EnableRyFeignClients;
|
||||||
*/
|
*/
|
||||||
@EnableRyFeignClients
|
@EnableRyFeignClients
|
||||||
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
|
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
|
||||||
public class RuoYiAuthApplication
|
public class HomeWorkAuthApplication
|
||||||
{
|
{
|
||||||
public static void main(String[] args)
|
public static void main(String[] args)
|
||||||
{
|
{
|
||||||
SpringApplication.run(RuoYiAuthApplication.class, args);
|
SpringApplication.run(HomeWorkAuthApplication.class, args);
|
||||||
System.out.println("(♥◠‿◠)ノ゙ 认证授权中心启动成功 ლ(´ڡ`ლ)゙ \n" +
|
System.out.println("(♥◠‿◠)ノ゙ 认证授权中心启动成功 ლ(´ڡ`ლ)゙ \n" +
|
||||||
" .-------. ____ __ \n" +
|
" .-------. ____ __ \n" +
|
||||||
" | _ _ \\ \\ \\ / / \n" +
|
" | _ _ \\ \\ \\ / / \n" +
|
|
@ -1,21 +1,19 @@
|
||||||
package com.ruoyi.auth.controller;
|
package HomeWork.auth.controller;
|
||||||
|
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import org.springframework.beans.factory.annotation.Autowired;
|
import org.springframework.beans.factory.annotation.Autowired;
|
||||||
import org.springframework.web.bind.annotation.DeleteMapping;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.bind.annotation.PostMapping;
|
import HomeWork.auth.form.LoginBody;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import HomeWork.auth.form.RegisterBody;
|
||||||
import org.springframework.web.bind.annotation.RestController;
|
import HomeWork.auth.service.SysLoginService;
|
||||||
import com.ruoyi.auth.form.LoginBody;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.auth.form.RegisterBody;
|
import HomeWork.common.core.utils.JwtUtils;
|
||||||
import com.ruoyi.auth.service.SysLoginService;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.security.auth.AuthUtil;
|
||||||
import com.ruoyi.common.core.utils.JwtUtils;
|
import HomeWork.common.security.service.TokenService;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.security.utils.SecurityUtils;
|
||||||
import com.ruoyi.common.security.auth.AuthUtil;
|
import HomeWork.system.api.model.LoginUser;
|
||||||
import com.ruoyi.common.security.service.TokenService;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
|
||||||
import com.ruoyi.system.api.model.LoginUser;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* token 控制
|
* token 控制
|
||||||
|
@ -40,6 +38,17 @@ public class TokenController
|
||||||
return R.ok(tokenService.createToken(userInfo));
|
return R.ok(tokenService.createToken(userInfo));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("faceLogin")
|
||||||
|
public R<?> login(@RequestParam MultipartFile file)
|
||||||
|
{
|
||||||
|
// 用户登录
|
||||||
|
LoginUser userInfo = sysLoginService.faceLogin(file);
|
||||||
|
// 获取登录token
|
||||||
|
return R.ok(tokenService.createToken(userInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@DeleteMapping("logout")
|
@DeleteMapping("logout")
|
||||||
public R<?> logout(HttpServletRequest request)
|
public R<?> logout(HttpServletRequest request)
|
||||||
{
|
{
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.auth.form;
|
package HomeWork.auth.form;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户登录对象
|
* 用户登录对象
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.auth.form;
|
package HomeWork.auth.form;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户注册对象
|
* 用户注册对象
|
|
@ -1,22 +1,24 @@
|
||||||
package com.ruoyi.auth.service;
|
package HomeWork.auth.service;
|
||||||
|
|
||||||
|
import HomeWork.auth.util.OssUtil;
|
||||||
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 com.ruoyi.common.core.constant.CacheConstants;
|
import HomeWork.common.core.constant.CacheConstants;
|
||||||
import com.ruoyi.common.core.constant.Constants;
|
import HomeWork.common.core.constant.Constants;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import HomeWork.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.constant.UserConstants;
|
import HomeWork.common.core.constant.UserConstants;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.common.core.enums.UserStatus;
|
import HomeWork.common.core.enums.UserStatus;
|
||||||
import com.ruoyi.common.core.exception.ServiceException;
|
import HomeWork.common.core.exception.ServiceException;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import HomeWork.common.core.text.Convert;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
import com.ruoyi.common.core.utils.ip.IpUtils;
|
import HomeWork.common.core.utils.ip.IpUtils;
|
||||||
import com.ruoyi.common.redis.service.RedisService;
|
import HomeWork.common.redis.service.RedisService;
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import HomeWork.common.security.utils.SecurityUtils;
|
||||||
import com.ruoyi.system.api.RemoteUserService;
|
import HomeWork.system.api.RemoteUserService;
|
||||||
import com.ruoyi.system.api.domain.SysUser;
|
import HomeWork.system.api.domain.SysUser;
|
||||||
import com.ruoyi.system.api.model.LoginUser;
|
import HomeWork.system.api.model.LoginUser;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 登录校验方法
|
* 登录校验方法
|
||||||
|
@ -140,4 +142,9 @@ public class SysLoginService
|
||||||
}
|
}
|
||||||
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
|
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public LoginUser faceLogin(MultipartFile file) {
|
||||||
|
String s = OssUtil.uploadMultipartFile(file);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -1,14 +1,14 @@
|
||||||
package com.ruoyi.auth.service;
|
package HomeWork.auth.service;
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
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 com.ruoyi.common.core.constant.CacheConstants;
|
import HomeWork.common.core.constant.CacheConstants;
|
||||||
import com.ruoyi.common.core.constant.Constants;
|
import HomeWork.common.core.constant.Constants;
|
||||||
import com.ruoyi.common.core.exception.ServiceException;
|
import HomeWork.common.core.exception.ServiceException;
|
||||||
import com.ruoyi.common.redis.service.RedisService;
|
import HomeWork.common.redis.service.RedisService;
|
||||||
import com.ruoyi.common.security.utils.SecurityUtils;
|
import HomeWork.common.security.utils.SecurityUtils;
|
||||||
import com.ruoyi.system.api.domain.SysUser;
|
import HomeWork.system.api.domain.SysUser;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 登录密码方法
|
* 登录密码方法
|
|
@ -1,13 +1,13 @@
|
||||||
package com.ruoyi.auth.service;
|
package HomeWork.auth.service;
|
||||||
|
|
||||||
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 com.ruoyi.common.core.constant.Constants;
|
import HomeWork.common.core.constant.Constants;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import HomeWork.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
import com.ruoyi.common.core.utils.ip.IpUtils;
|
import HomeWork.common.core.utils.ip.IpUtils;
|
||||||
import com.ruoyi.system.api.RemoteLogService;
|
import HomeWork.system.api.RemoteLogService;
|
||||||
import com.ruoyi.system.api.domain.SysLogininfor;
|
import HomeWork.system.api.domain.SysLogininfor;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 记录日志方法
|
* 记录日志方法
|
|
@ -0,0 +1,154 @@
|
||||||
|
package HomeWork.auth.util;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
import com.aliyun.oss.OSS;
|
||||||
|
import com.aliyun.oss.OSSClientBuilder;
|
||||||
|
import com.aliyun.oss.model.GetObjectRequest;
|
||||||
|
import com.aliyun.oss.model.PutObjectRequest;
|
||||||
|
import lombok.extern.log4j.Log4j2;
|
||||||
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
|
import java.io.*;
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Oss服务调用
|
||||||
|
*/
|
||||||
|
@Log4j2
|
||||||
|
public class OssUtil {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Endpoint 存储对象概述 阿里云主账号AccessKey,accessKeySecret拥有所有API的访问权限 访问路径前缀 存储对象概述
|
||||||
|
*/
|
||||||
|
private static String endPoint = "oss-cn-shanghai.aliyuncs.com";
|
||||||
|
private static String accessKeyId = "LTAI5tLE4XbyvvbuT7D2stCk";
|
||||||
|
private static String accessKeySecret = "W7ZeT4dMrMPP0c8BBwcyIPnhe3P4E8";
|
||||||
|
private static String accessPre = "https://lyb1314.oss-cn-shanghai.aliyuncs.com/";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* bucket名称
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
private static String bucketName = "lyb1314";
|
||||||
|
|
||||||
|
private static OSS ossClient ;
|
||||||
|
|
||||||
|
static {
|
||||||
|
ossClient = new OSSClientBuilder().build(
|
||||||
|
endPoint,
|
||||||
|
accessKeyId,
|
||||||
|
accessKeySecret);
|
||||||
|
log.info("oss服务连接成功!");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 默认路径上传本地文件
|
||||||
|
* @param filePath
|
||||||
|
*/
|
||||||
|
public static String uploadFile(String filePath){
|
||||||
|
return uploadFileForBucket(bucketName,getOssFilePath(filePath) ,filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 默认路径上传multipartFile文件
|
||||||
|
* @param multipartFile
|
||||||
|
*/
|
||||||
|
public static String uploadMultipartFile(MultipartFile multipartFile) {
|
||||||
|
return uploadMultipartFile(bucketName,getOssFilePath(multipartFile.getOriginalFilename()),multipartFile);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 上传 multipartFile 类型文件
|
||||||
|
* @param bucketName
|
||||||
|
* @param ossPath
|
||||||
|
* @param multipartFile
|
||||||
|
*/
|
||||||
|
public static String uploadMultipartFile(String bucketName , String ossPath , MultipartFile multipartFile){
|
||||||
|
InputStream inputStream = null;
|
||||||
|
try {
|
||||||
|
inputStream = multipartFile.getInputStream();
|
||||||
|
} catch (IOException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
uploadFileInputStreamForBucket(bucketName, ossPath, inputStream);
|
||||||
|
return accessPre+ossPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 使用File上传PutObject上传文件 ** 程序默认使用次方法上传
|
||||||
|
* @param bucketName 实例名称
|
||||||
|
* @param ossPath oss存储路径
|
||||||
|
* @param filePath 本地文件路径
|
||||||
|
*/
|
||||||
|
public static String uploadFileForBucket(String bucketName , String ossPath , String filePath) {
|
||||||
|
// 创建PutObjectRequest对象。
|
||||||
|
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName, ossPath, new File(filePath));
|
||||||
|
|
||||||
|
// 上传
|
||||||
|
ossClient.putObject(putObjectRequest);
|
||||||
|
return accessPre+ossPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 使用文件流上传到指定的bucket实例
|
||||||
|
* @param bucketName 实例名称
|
||||||
|
* @param ossPath oss存储路径
|
||||||
|
* @param filePath 本地文件路径
|
||||||
|
*/
|
||||||
|
public static String uploadFileInputStreamForBucket(String bucketName , String ossPath , String filePath){
|
||||||
|
|
||||||
|
// 填写本地文件的完整路径。如果未指定本地路径,则默认从示例程序所属项目对应本地路径中上传文件流。
|
||||||
|
InputStream inputStream = null;
|
||||||
|
try {
|
||||||
|
inputStream = new FileInputStream(filePath);
|
||||||
|
} catch (FileNotFoundException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
// 填写Bucket名称和Object完整路径。Object完整路径中不能包含Bucket名称。
|
||||||
|
uploadFileInputStreamForBucket(bucketName, ossPath, inputStream);
|
||||||
|
return accessPre+ossPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void uploadFileInputStreamForBucket(String bucketName , String ossPath , InputStream inputStream ){
|
||||||
|
ossClient.putObject(bucketName, ossPath, inputStream);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 下载
|
||||||
|
* @param ossFilePath
|
||||||
|
* @param filePath
|
||||||
|
*/
|
||||||
|
public static void downloadFile(String ossFilePath , String filePath ){
|
||||||
|
downloadFileForBucket(bucketName , ossFilePath , filePath);
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* 下载
|
||||||
|
* @param bucketName 实例名称
|
||||||
|
* @param ossFilePath oss存储路径
|
||||||
|
* @param filePath 本地文件路径
|
||||||
|
*/
|
||||||
|
public static void downloadFileForBucket(String bucketName , String ossFilePath , String filePath ){
|
||||||
|
ossClient.getObject(new GetObjectRequest(bucketName, ossFilePath), new File(filePath));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public static String getOssDefaultPath(){
|
||||||
|
LocalDateTime now = LocalDateTime.now();
|
||||||
|
String url =
|
||||||
|
now.getYear()+"/"+
|
||||||
|
now.getMonth()+"/"+
|
||||||
|
now.getDayOfMonth()+"/"+
|
||||||
|
now.getHour()+"/"+
|
||||||
|
now.getMinute()+"/";
|
||||||
|
return url;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String getOssFilePath(String filePath){
|
||||||
|
String fileSuf = filePath.substring(filePath.indexOf(".") + 1);
|
||||||
|
return getOssDefaultPath() + UUID.randomUUID().toString() + "." + fileSuf;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -6,7 +6,7 @@ server:
|
||||||
spring:
|
spring:
|
||||||
application:
|
application:
|
||||||
# 应用名称
|
# 应用名称
|
||||||
name: ruoyi-auth
|
name: HomeWork-auth
|
||||||
profiles:
|
profiles:
|
||||||
# 环境配置
|
# 环境配置
|
||||||
active: dev
|
active: dev
|
||||||
|
@ -14,10 +14,12 @@ spring:
|
||||||
nacos:
|
nacos:
|
||||||
discovery:
|
discovery:
|
||||||
# 服务注册地址
|
# 服务注册地址
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 101.34.77.101:8848
|
||||||
|
namespace: 20041112
|
||||||
config:
|
config:
|
||||||
# 配置中心地址
|
# 配置中心地址
|
||||||
server-addr: 127.0.0.1:8848
|
server-addr: 101.34.77.101:8848
|
||||||
|
namespace: 20041112
|
||||||
# 配置文件格式
|
# 配置文件格式
|
||||||
file-extension: yml
|
file-extension: yml
|
||||||
# 共享配置
|
# 共享配置
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
<configuration scan="true" scanPeriod="60 seconds" debug="false">
|
||||||
<!-- 日志存放路径 -->
|
<!-- 日志存放路径 -->
|
||||||
<property name="log.path" value="logs/ruoyi-gateway" />
|
<property name="log.path" value="logs/HomeWork-auth" />
|
||||||
<!-- 日志输出格式 -->
|
<!-- 日志输出格式 -->
|
||||||
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@
|
||||||
</appender>
|
</appender>
|
||||||
|
|
||||||
<!-- 系统模块日志级别控制 -->
|
<!-- 系统模块日志级别控制 -->
|
||||||
<logger name="com.ruoyi" level="info" />
|
<logger name="HomeWork" level="info" />
|
||||||
<!-- Spring日志级别控制 -->
|
<!-- Spring日志级别控制 -->
|
||||||
<logger name="org.springframework" level="warn" />
|
<logger name="org.springframework" level="warn" />
|
||||||
|
|
|
@ -3,16 +3,16 @@
|
||||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||||
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">
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>com.ruoyi</groupId>
|
<groupId>HomeWork</groupId>
|
||||||
<artifactId>ruoyi-common</artifactId>
|
<artifactId>HomeWork-common</artifactId>
|
||||||
<version>3.6.3</version>
|
<version>3.6.3</version>
|
||||||
</parent>
|
</parent>
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<artifactId>ruoyi-common-core</artifactId>
|
<artifactId>HomeWork-common-core</artifactId>
|
||||||
|
|
||||||
<description>
|
<description>
|
||||||
ruoyi-common-core核心模块
|
HomeWork-common-core核心模块
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -113,6 +113,7 @@
|
||||||
<artifactId>swagger-annotations</artifactId>
|
<artifactId>swagger-annotations</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.annotation;
|
package HomeWork.common.core.annotation;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
||||||
|
@ -7,7 +7,7 @@ import java.lang.annotation.Target;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import org.apache.poi.ss.usermodel.HorizontalAlignment;
|
import org.apache.poi.ss.usermodel.HorizontalAlignment;
|
||||||
import org.apache.poi.ss.usermodel.IndexedColors;
|
import org.apache.poi.ss.usermodel.IndexedColors;
|
||||||
import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
|
import HomeWork.common.core.utils.poi.ExcelHandlerAdapter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 自定义导出Excel数据注解
|
* 自定义导出Excel数据注解
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.annotation;
|
package HomeWork.common.core.annotation;
|
||||||
|
|
||||||
import java.lang.annotation.ElementType;
|
import java.lang.annotation.ElementType;
|
||||||
import java.lang.annotation.Retention;
|
import java.lang.annotation.Retention;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 缓存常量信息
|
* 缓存常量信息
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 通用常量信息
|
* 通用常量信息
|
||||||
|
@ -120,16 +120,16 @@ public class Constants
|
||||||
/**
|
/**
|
||||||
* 自动识别json对象白名单配置(仅允许解析的包名,范围越小越安全)
|
* 自动识别json对象白名单配置(仅允许解析的包名,范围越小越安全)
|
||||||
*/
|
*/
|
||||||
public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
|
public static final String[] JSON_WHITELIST_STR = { "org.springframework", "HomeWork" };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
|
* 定时任务白名单配置(仅允许访问的包名,如其他需要可以自行添加)
|
||||||
*/
|
*/
|
||||||
public static final String[] JOB_WHITELIST_STR = { "com.ruoyi" };
|
public static final String[] JOB_WHITELIST_STR = { "HomeWork" };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 定时任务违规的字符
|
* 定时任务违规的字符
|
||||||
*/
|
*/
|
||||||
public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
|
public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
|
||||||
"org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
|
"org.springframework", "org.apache", "HomeWork.common.core.utils.file" };
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 代码生成通用常量
|
* 代码生成通用常量
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 返回状态码
|
* 返回状态码
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 任务调度通用常量
|
* 任务调度通用常量
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 权限相关通用常量
|
* 权限相关通用常量
|
|
@ -0,0 +1,24 @@
|
||||||
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 服务名称
|
||||||
|
*
|
||||||
|
* @author ruoyi
|
||||||
|
*/
|
||||||
|
public class ServiceNameConstants
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* 认证服务的serviceid
|
||||||
|
*/
|
||||||
|
public static final String AUTH_SERVICE = "HomeWork-auth";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 系统模块的serviceid
|
||||||
|
*/
|
||||||
|
public static final String SYSTEM_SERVICE = "HomeWork-system";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 文件服务的serviceid
|
||||||
|
*/
|
||||||
|
public static final String FILE_SERVICE = "HomeWork-file";
|
||||||
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Token的Key常量
|
* Token的Key常量
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.constant;
|
package HomeWork.common.core.constant;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户常量信息
|
* 用户常量信息
|
|
@ -1,11 +1,11 @@
|
||||||
package com.ruoyi.common.core.context;
|
package HomeWork.common.core.context;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import com.alibaba.ttl.TransmittableThreadLocal;
|
import com.alibaba.ttl.TransmittableThreadLocal;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import HomeWork.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import HomeWork.common.core.text.Convert;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取当前线程变量中的 用户id、用户名称、Token等信息
|
* 获取当前线程变量中的 用户id、用户名称、Token等信息
|
|
@ -1,7 +1,7 @@
|
||||||
package com.ruoyi.common.core.domain;
|
package HomeWork.common.core.domain;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import com.ruoyi.common.core.constant.Constants;
|
import HomeWork.common.core.constant.Constants;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 响应信息主体
|
* 响应信息主体
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.enums;
|
package HomeWork.common.core.enums;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户状态
|
* 用户状态
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证码错误异常类
|
* 验证码错误异常类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 检查异常
|
* 检查异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 演示模式异常
|
* 演示模式异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 全局异常
|
* 全局异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 内部认证异常
|
* 内部认证异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 权限异常
|
* 权限异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 业务异常
|
* 业务异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception;
|
package HomeWork.common.core.exception;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 工具类异常
|
* 工具类异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.auth;
|
package HomeWork.common.core.exception.auth;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 未能通过的登录认证异常
|
* 未能通过的登录认证异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.auth;
|
package HomeWork.common.core.exception.auth;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.auth;
|
package HomeWork.common.core.exception.auth;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.base;
|
package HomeWork.common.core.exception.base;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 基础异常
|
* 基础异常
|
|
@ -1,6 +1,6 @@
|
||||||
package com.ruoyi.common.core.exception.file;
|
package HomeWork.common.core.exception.file;
|
||||||
|
|
||||||
import com.ruoyi.common.core.exception.base.BaseException;
|
import HomeWork.common.core.exception.base.BaseException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件信息异常类
|
* 文件信息异常类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.file;
|
package HomeWork.common.core.exception.file;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件名称超长限制异常类
|
* 文件名称超长限制异常类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.file;
|
package HomeWork.common.core.exception.file;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件名大小限制异常类
|
* 文件名大小限制异常类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.file;
|
package HomeWork.common.core.exception.file;
|
||||||
|
|
||||||
import java.io.PrintStream;
|
import java.io.PrintStream;
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.file;
|
package HomeWork.common.core.exception.file;
|
||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.job;
|
package HomeWork.common.core.exception.job;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 计划策略异常
|
* 计划策略异常
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.user;
|
package HomeWork.common.core.exception.user;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 验证码失效异常类
|
* 验证码失效异常类
|
|
@ -1,6 +1,6 @@
|
||||||
package com.ruoyi.common.core.exception.user;
|
package HomeWork.common.core.exception.user;
|
||||||
|
|
||||||
import com.ruoyi.common.core.exception.base.BaseException;
|
import HomeWork.common.core.exception.base.BaseException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户信息异常类
|
* 用户信息异常类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.exception.user;
|
package HomeWork.common.core.exception.user;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 用户密码不正确或不符合规范异常类
|
* 用户密码不正确或不符合规范异常类
|
|
@ -1,8 +1,8 @@
|
||||||
package com.ruoyi.common.core.text;
|
package HomeWork.common.core.text;
|
||||||
|
|
||||||
import java.nio.charset.Charset;
|
import java.nio.charset.Charset;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字符集工具类
|
* 字符集工具类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.text;
|
package HomeWork.common.core.text;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
|
@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
|
||||||
import java.nio.charset.Charset;
|
import java.nio.charset.Charset;
|
||||||
import java.text.NumberFormat;
|
import java.text.NumberFormat;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 类型转换器
|
* 类型转换器
|
|
@ -1,6 +1,6 @@
|
||||||
package com.ruoyi.common.core.text;
|
package HomeWork.common.core.text;
|
||||||
|
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字符串格式化
|
* 字符串格式化
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import java.lang.management.ManagementFactory;
|
import java.lang.management.ManagementFactory;
|
||||||
import java.text.ParseException;
|
import java.text.ParseException;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import java.io.PrintWriter;
|
import java.io.PrintWriter;
|
||||||
import java.io.StringWriter;
|
import java.io.StringWriter;
|
|
@ -1,9 +1,9 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import com.ruoyi.common.core.constant.SecurityConstants;
|
import HomeWork.common.core.constant.SecurityConstants;
|
||||||
import com.ruoyi.common.core.constant.TokenConstants;
|
import HomeWork.common.core.constant.TokenConstants;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import HomeWork.common.core.text.Convert;
|
||||||
import io.jsonwebtoken.Claims;
|
import io.jsonwebtoken.Claims;
|
||||||
import io.jsonwebtoken.Jwts;
|
import io.jsonwebtoken.Jwts;
|
||||||
import io.jsonwebtoken.SignatureAlgorithm;
|
import io.jsonwebtoken.SignatureAlgorithm;
|
|
@ -1,9 +1,9 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import com.github.pagehelper.PageHelper;
|
import com.github.pagehelper.PageHelper;
|
||||||
import com.ruoyi.common.core.utils.sql.SqlUtil;
|
import HomeWork.common.core.utils.sql.SqlUtil;
|
||||||
import com.ruoyi.common.core.web.page.PageDomain;
|
import HomeWork.common.core.web.page.PageDomain;
|
||||||
import com.ruoyi.common.core.web.page.TableSupport;
|
import HomeWork.common.core.web.page.TableSupport;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页工具类
|
* 分页工具类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UnsupportedEncodingException;
|
import java.io.UnsupportedEncodingException;
|
||||||
|
@ -22,9 +22,9 @@ import org.springframework.web.context.request.RequestAttributes;
|
||||||
import org.springframework.web.context.request.RequestContextHolder;
|
import org.springframework.web.context.request.RequestContextHolder;
|
||||||
import org.springframework.web.context.request.ServletRequestAttributes;
|
import org.springframework.web.context.request.ServletRequestAttributes;
|
||||||
import com.alibaba.fastjson2.JSON;
|
import com.alibaba.fastjson2.JSON;
|
||||||
import com.ruoyi.common.core.constant.Constants;
|
import HomeWork.common.core.constant.Constants;
|
||||||
import com.ruoyi.common.core.domain.R;
|
import HomeWork.common.core.domain.R;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import HomeWork.common.core.text.Convert;
|
||||||
import reactor.core.publisher.Mono;
|
import reactor.core.publisher.Mono;
|
||||||
|
|
||||||
/**
|
/**
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import org.springframework.aop.framework.AopContext;
|
import org.springframework.aop.framework.AopContext;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
|
@ -1,11 +1,11 @@
|
||||||
package com.ruoyi.common.core.utils;
|
package HomeWork.common.core.utils;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.springframework.util.AntPathMatcher;
|
import org.springframework.util.AntPathMatcher;
|
||||||
import com.ruoyi.common.core.constant.Constants;
|
import HomeWork.common.core.constant.Constants;
|
||||||
import com.ruoyi.common.core.text.StrFormatter;
|
import HomeWork.common.core.text.StrFormatter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 字符串工具类
|
* 字符串工具类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.bean;
|
package HomeWork.common.core.utils.bean;
|
||||||
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.bean;
|
package HomeWork.common.core.utils.bean;
|
||||||
|
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import javax.validation.ConstraintViolation;
|
import javax.validation.ConstraintViolation;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.file;
|
package HomeWork.common.core.utils.file;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.file;
|
package HomeWork.common.core.utils.file;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileInputStream;
|
import java.io.FileInputStream;
|
||||||
|
@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
import org.apache.commons.lang3.ArrayUtils;
|
import org.apache.commons.lang3.ArrayUtils;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 文件处理工具类
|
* 文件处理工具类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.file;
|
package HomeWork.common.core.utils.file;
|
||||||
|
|
||||||
import java.io.ByteArrayInputStream;
|
import java.io.ByteArrayInputStream;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.file;
|
package HomeWork.common.core.utils.file;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 媒体类型工具类
|
* 媒体类型工具类
|
|
@ -1,6 +1,6 @@
|
||||||
package com.ruoyi.common.core.utils.html;
|
package HomeWork.common.core.utils.html;
|
||||||
|
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 转义和反转义工具类
|
* 转义和反转义工具类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.html;
|
package HomeWork.common.core.utils.html;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
|
@ -1,10 +1,10 @@
|
||||||
package com.ruoyi.common.core.utils.ip;
|
package HomeWork.common.core.utils.ip;
|
||||||
|
|
||||||
import java.net.InetAddress;
|
import java.net.InetAddress;
|
||||||
import java.net.UnknownHostException;
|
import java.net.UnknownHostException;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import com.ruoyi.common.core.utils.ServletUtils;
|
import HomeWork.common.core.utils.ServletUtils;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取IP方法
|
* 获取IP方法
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.poi;
|
package HomeWork.common.core.utils.poi;
|
||||||
|
|
||||||
import org.apache.poi.ss.usermodel.Cell;
|
import org.apache.poi.ss.usermodel.Cell;
|
||||||
import org.apache.poi.ss.usermodel.Workbook;
|
import org.apache.poi.ss.usermodel.Workbook;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.poi;
|
package HomeWork.common.core.utils.poi;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
@ -51,17 +51,17 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
|
||||||
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
|
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import com.ruoyi.common.core.annotation.Excel;
|
import HomeWork.common.core.annotation.Excel;
|
||||||
import com.ruoyi.common.core.annotation.Excel.ColumnType;
|
import HomeWork.common.core.annotation.Excel.ColumnType;
|
||||||
import com.ruoyi.common.core.annotation.Excel.Type;
|
import HomeWork.common.core.annotation.Excel.Type;
|
||||||
import com.ruoyi.common.core.annotation.Excels;
|
import HomeWork.common.core.annotation.Excels;
|
||||||
import com.ruoyi.common.core.exception.UtilException;
|
import HomeWork.common.core.exception.UtilException;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import HomeWork.common.core.text.Convert;
|
||||||
import com.ruoyi.common.core.utils.DateUtils;
|
import HomeWork.common.core.utils.DateUtils;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
import com.ruoyi.common.core.utils.file.FileTypeUtils;
|
import HomeWork.common.core.utils.file.FileTypeUtils;
|
||||||
import com.ruoyi.common.core.utils.file.ImageUtils;
|
import HomeWork.common.core.utils.file.ImageUtils;
|
||||||
import com.ruoyi.common.core.utils.reflect.ReflectUtils;
|
import HomeWork.common.core.utils.reflect.ReflectUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Excel相关处理
|
* Excel相关处理
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.reflect;
|
package HomeWork.common.core.utils.reflect;
|
||||||
|
|
||||||
import java.lang.reflect.Field;
|
import java.lang.reflect.Field;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
@ -12,8 +12,8 @@ import org.apache.commons.lang3.Validate;
|
||||||
import org.apache.poi.ss.usermodel.DateUtil;
|
import org.apache.poi.ss.usermodel.DateUtil;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import com.ruoyi.common.core.text.Convert;
|
import HomeWork.common.core.text.Convert;
|
||||||
import com.ruoyi.common.core.utils.DateUtils;
|
import HomeWork.common.core.utils.DateUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
|
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.sign;
|
package HomeWork.common.core.utils.sign;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Base64工具类
|
* Base64工具类
|
|
@ -1,7 +1,7 @@
|
||||||
package com.ruoyi.common.core.utils.sql;
|
package HomeWork.common.core.utils.sql;
|
||||||
|
|
||||||
import com.ruoyi.common.core.exception.UtilException;
|
import HomeWork.common.core.exception.UtilException;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sql操作工具类
|
* sql操作工具类
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.utils.uuid;
|
package HomeWork.common.core.utils.uuid;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ID生成器工具类
|
* ID生成器工具类
|
|
@ -1,8 +1,8 @@
|
||||||
package com.ruoyi.common.core.utils.uuid;
|
package HomeWork.common.core.utils.uuid;
|
||||||
|
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
import com.ruoyi.common.core.utils.DateUtils;
|
import HomeWork.common.core.utils.DateUtils;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author ruoyi 序列生成类
|
* @author ruoyi 序列生成类
|
|
@ -1,11 +1,11 @@
|
||||||
package com.ruoyi.common.core.utils.uuid;
|
package HomeWork.common.core.utils.uuid;
|
||||||
|
|
||||||
import java.security.MessageDigest;
|
import java.security.MessageDigest;
|
||||||
import java.security.NoSuchAlgorithmException;
|
import java.security.NoSuchAlgorithmException;
|
||||||
import java.security.SecureRandom;
|
import java.security.SecureRandom;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.concurrent.ThreadLocalRandom;
|
import java.util.concurrent.ThreadLocalRandom;
|
||||||
import com.ruoyi.common.core.exception.UtilException;
|
import HomeWork.common.core.exception.UtilException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 提供通用唯一识别码(universally unique identifier)(UUID)实现
|
* 提供通用唯一识别码(universally unique identifier)(UUID)实现
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.web.controller;
|
package HomeWork.common.core.web.controller;
|
||||||
|
|
||||||
import java.beans.PropertyEditorSupport;
|
import java.beans.PropertyEditorSupport;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
@ -8,11 +8,11 @@ import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.web.bind.WebDataBinder;
|
import org.springframework.web.bind.WebDataBinder;
|
||||||
import org.springframework.web.bind.annotation.InitBinder;
|
import org.springframework.web.bind.annotation.InitBinder;
|
||||||
import com.github.pagehelper.PageInfo;
|
import com.github.pagehelper.PageInfo;
|
||||||
import com.ruoyi.common.core.constant.HttpStatus;
|
import HomeWork.common.core.constant.HttpStatus;
|
||||||
import com.ruoyi.common.core.utils.DateUtils;
|
import HomeWork.common.core.utils.DateUtils;
|
||||||
import com.ruoyi.common.core.utils.PageUtils;
|
import HomeWork.common.core.utils.PageUtils;
|
||||||
import com.ruoyi.common.core.web.domain.AjaxResult;
|
import HomeWork.common.core.web.domain.AjaxResult;
|
||||||
import com.ruoyi.common.core.web.page.TableDataInfo;
|
import HomeWork.common.core.web.page.TableDataInfo;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* web层通用数据处理
|
* web层通用数据处理
|
|
@ -1,9 +1,9 @@
|
||||||
package com.ruoyi.common.core.web.domain;
|
package HomeWork.common.core.web.domain;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import com.ruoyi.common.core.constant.HttpStatus;
|
import HomeWork.common.core.constant.HttpStatus;
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 操作消息提醒
|
* 操作消息提醒
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.web.domain;
|
package HomeWork.common.core.web.domain;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.web.domain;
|
package HomeWork.common.core.web.domain;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
|
@ -1,6 +1,6 @@
|
||||||
package com.ruoyi.common.core.web.page;
|
package HomeWork.common.core.web.page;
|
||||||
|
|
||||||
import com.ruoyi.common.core.utils.StringUtils;
|
import HomeWork.common.core.utils.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分页数据
|
* 分页数据
|
|
@ -1,4 +1,4 @@
|
||||||
package com.ruoyi.common.core.web.page;
|
package HomeWork.common.core.web.page;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.List;
|
import java.util.List;
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue