zmyYYDS
/
wit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

假期作业

zmy
chenbingxuan 2024-01-24 08:43:21 +08:00
parent 78e61d89ba
commit a353d1caef
668 changed files with 35500 additions and 59991 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/FUNDING.yml vendored
View File

@ -1 +1 @@
custom: http://doc.ruoyi.vip/ruoyi-cloud/other/donate.html
custom: http://doc.HomeWork.vip/HomeWork-cloud/other/donate.html

12
ruoyi-api/ruoyi-api-system/pom.xml → HomeWork-api/HomeWork-api-system/pom.xml
View File

@ -3,24 +3,24 @@
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">
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-api</artifactId>
<groupId>HomeWork</groupId>
<artifactId>HomeWork-api</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-api-system</artifactId>
<artifactId>HomeWork-api-system</artifactId>
<description>
ruoyi-api-system系统接口模块
HomeWork-api-system系统接口模块
</description>
<dependencies>
<!-- RuoYi Common Core-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-core</artifactId>
<groupId>HomeWork</groupId>
<artifactId>HomeWork-common-core</artifactId>
</dependency>
</dependencies>

10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/RemoteFileService.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.system.api;
package HomeWork.system.api;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysFile;
import com.ruoyi.system.api.factory.RemoteFileFallbackFactory;
import HomeWork.common.core.constant.ServiceNameConstants;
import HomeWork.common.core.domain.R;
import HomeWork.system.api.domain.SysFile;
import HomeWork.system.api.factory.RemoteFileFallbackFactory;
/**
* 文件服务

18
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteLogService.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/RemoteLogService.java
View File

@ -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.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.domain.SysLogininfor;
import com.ruoyi.system.api.domain.SysOperLog;
import com.ruoyi.system.api.factory.RemoteLogFallbackFactory;
import HomeWork.common.core.constant.SecurityConstants;
import HomeWork.common.core.constant.ServiceNameConstants;
import HomeWork.common.core.domain.R;
import HomeWork.system.api.domain.SysLogininfor;
import HomeWork.system.api.domain.SysOperLog;
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")
public R<Boolean> saveLogininfor(@RequestBody SysLogininfor sysLogininfor, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
}

30
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/RemoteUserService.java
View File

@ -1,17 +1,13 @@
package com.ruoyi.system.api;
package HomeWork.system.api;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.ServiceNameConstants;
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;
import org.springframework.web.bind.annotation.*;
import HomeWork.common.core.constant.SecurityConstants;
import HomeWork.common.core.constant.ServiceNameConstants;
import HomeWork.common.core.domain.R;
import HomeWork.system.api.domain.SysUser;
import HomeWork.system.api.factory.RemoteUserFallbackFactory;
import HomeWork.system.api.model.LoginUser;
/**
* 用户服务
@ -40,4 +36,14 @@ public interface RemoteUserService
*/
@PostMapping("/user/register")
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;
}

4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysDept.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import java.util.ArrayList;
import java.util.List;
@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.web.domain.BaseEntity;
import HomeWork.common.core.web.domain.BaseEntity;
/**
* 部门表 sys_dept

10
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysDictData.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.web.domain.BaseEntity;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.constant.UserConstants;
import HomeWork.common.core.web.domain.BaseEntity;
/**
* 字典数据表 sys_dict_data

8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysDictType.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.web.domain.BaseEntity;
/**
* 字典类型表 sys_dict_type

2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysFile.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysFile.java
View File

@ -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.ToStringStyle;

8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysLogininfor.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysLogininfor.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.web.domain.BaseEntity;
/**
* 系统访问记录表 sys_logininfor

8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysOperLog.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.web.domain.BaseEntity;
/**
* 操作日志记录表 oper_log

8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysRole.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import java.util.Set;
import javax.validation.constraints.NotBlank;
@ -6,9 +6,9 @@ import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.web.domain.BaseEntity;
/**
* 角色表 sys_role

14
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/domain/SysUser.java
View File

@ -1,16 +1,16 @@
package com.ruoyi.system.api.domain;
package HomeWork.system.api.domain;
import java.util.Date;
import java.util.List;
import javax.validation.constraints.*;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.web.domain.BaseEntity;
import com.ruoyi.common.core.xss.Xss;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.annotation.Excel.Type;
import HomeWork.common.core.annotation.Excels;
import HomeWork.common.core.web.domain.BaseEntity;
import HomeWork.common.core.xss.Xss;
/**
* 用户对象 sys_user

8
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/factory/RemoteFileFallbackFactory.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.system.api.factory;
package HomeWork.system.api.factory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.multipart.MultipartFile;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteFileService;
import com.ruoyi.system.api.domain.SysFile;
import HomeWork.common.core.domain.R;
import HomeWork.system.api.RemoteFileService;
import HomeWork.system.api.domain.SysFile;
/**
* 文件服务降级处理

12
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteLogFallbackFactory.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/factory/RemoteLogFallbackFactory.java
View File

@ -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.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteLogService;
import com.ruoyi.system.api.domain.SysLogininfor;
import com.ruoyi.system.api.domain.SysOperLog;
import HomeWork.common.core.domain.R;
import HomeWork.system.api.RemoteLogService;
import HomeWork.system.api.domain.SysLogininfor;
import HomeWork.system.api.domain.SysOperLog;
/**
* 日志服务降级处理
@ -36,6 +37,7 @@ public class RemoteLogFallbackFactory implements FallbackFactory<RemoteLogServic
{
return R.fail("保存登录日志失败:" + throwable.getMessage());
}
};
}

15
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/factory/RemoteUserFallbackFactory.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.system.api.factory;
package HomeWork.system.api.factory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.openfeign.FallbackFactory;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import HomeWork.common.core.domain.R;
import HomeWork.system.api.RemoteUserService;
import HomeWork.system.api.domain.SysUser;
import HomeWork.system.api.model.LoginUser;
/**
* 用户服务降级处理
@ -36,6 +36,11 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
{
return R.fail("注册用户失败:" + throwable.getMessage());
}
@Override
public R<LoginUser> faceLogin(String url) throws Exception {
return R.fail("人脸登录失败:" + throwable.getMessage());
}
};
}
}

4
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java → HomeWork-api/HomeWork-api-system/src/main/java/HomeWork/system/api/model/LoginUser.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.system.api.model;
package HomeWork.system.api.model;
import java.io.Serializable;
import java.util.Set;
import com.ruoyi.system.api.domain.SysUser;
import HomeWork.system.api.domain.SysUser;
/**
* 用户信息

3
HomeWork-api/HomeWork-api-system/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports 100644
View File

@ -0,0 +1,3 @@
HomeWork.system.api.factory.RemoteUserFallbackFactory
HomeWork.system.api.factory.RemoteLogFallbackFactory
HomeWork.system.api.factory.RemoteFileFallbackFactory

10
ruoyi-api/pom.xml → HomeWork-api/pom.xml
View File

@ -2,21 +2,21 @@
<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">
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<groupId>HomeWork</groupId>
<artifactId>HomeWork</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<modules>
<module>ruoyi-api-system</module>
<module>HomeWork-api-system</module>
</modules>
<artifactId>ruoyi-api</artifactId>
<artifactId>HomeWork-api</artifactId>
<packaging>pom</packaging>
<description>
ruoyi-api系统接口
HomeWork-api系统接口
</description>
</project>

25
ruoyi-auth/pom.xml → HomeWork-auth/pom.xml
View File

@ -2,20 +2,27 @@
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">
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi</artifactId>
<groupId>HomeWork</groupId>
<artifactId>HomeWork</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-auth</artifactId>
<artifactId>HomeWork-auth</artifactId>
<description>
ruoyi-auth认证授权中心
HomeWork-auth认证授权中心
</description>
<dependencies>
<!-- Oss上传 -->
<dependency>
<groupId>com.aliyun.oss</groupId>
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.10.2</version>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>
@ -48,9 +55,15 @@
<!-- RuoYi Common Security-->
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common-security</artifactId>
<groupId>HomeWork</groupId>
<artifactId>HomeWork-common-security</artifactId>
</dependency>
<!--lombok依赖-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>

8
ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java → HomeWork-auth/src/main/java/HomeWork/auth/HomeWorkAuthApplication.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.auth;
package HomeWork.auth;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
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
@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class })
public class RuoYiAuthApplication
public class HomeWorkAuthApplication
{
public static void main(String[] args)
{
SpringApplication.run(RuoYiAuthApplication.class, args);
SpringApplication.run(HomeWorkAuthApplication.class, args);
System.out.println("(♥◠‿◠)ﾉﾞ 认证授权中心启动成功 ლ(´ڡ`ლ)ﾞ \n" +
" .-------. ____ __ \n" +
" | _ _ \\ \\ \\ / / \n" +

39
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java → HomeWork-auth/src/main/java/HomeWork/auth/controller/TokenController.java
View File

@ -1,21 +1,19 @@
package com.ruoyi.auth.controller;
package HomeWork.auth.controller;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.auth.form.LoginBody;
import com.ruoyi.auth.form.RegisterBody;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
import org.springframework.web.bind.annotation.*;
import HomeWork.auth.form.LoginBody;
import HomeWork.auth.form.RegisterBody;
import HomeWork.auth.service.SysLoginService;
import HomeWork.common.core.domain.R;
import HomeWork.common.core.utils.JwtUtils;
import HomeWork.common.core.utils.StringUtils;
import HomeWork.common.security.auth.AuthUtil;
import HomeWork.common.security.service.TokenService;
import HomeWork.common.security.utils.SecurityUtils;
import HomeWork.system.api.model.LoginUser;
import org.springframework.web.multipart.MultipartFile;
/**
* token 控制
@ -40,6 +38,17 @@ public class TokenController
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")
public R<?> logout(HttpServletRequest request)
{

2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java → HomeWork-auth/src/main/java/HomeWork/auth/form/LoginBody.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.auth.form;
package HomeWork.auth.form;
/**
* 用户登录对象

2
ruoyi-auth/src/main/java/com/ruoyi/auth/form/RegisterBody.java → HomeWork-auth/src/main/java/HomeWork/auth/form/RegisterBody.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.auth.form;
package HomeWork.auth.form;
/**
* 用户注册对象

39
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java → HomeWork-auth/src/main/java/HomeWork/auth/service/SysLoginService.java
View File

@ -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.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.UserConstants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.enums.UserStatus;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.RemoteUserService;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.model.LoginUser;
import HomeWork.common.core.constant.CacheConstants;
import HomeWork.common.core.constant.Constants;
import HomeWork.common.core.constant.SecurityConstants;
import HomeWork.common.core.constant.UserConstants;
import HomeWork.common.core.domain.R;
import HomeWork.common.core.enums.UserStatus;
import HomeWork.common.core.exception.ServiceException;
import HomeWork.common.core.text.Convert;
import HomeWork.common.core.utils.StringUtils;
import HomeWork.common.core.utils.ip.IpUtils;
import HomeWork.common.redis.service.RedisService;
import HomeWork.common.security.utils.SecurityUtils;
import HomeWork.system.api.RemoteUserService;
import HomeWork.system.api.domain.SysUser;
import HomeWork.system.api.model.LoginUser;
import org.springframework.web.multipart.MultipartFile;
/**
* 登录校验方法
@ -140,4 +142,9 @@ public class SysLoginService
}
recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功");
}
public LoginUser faceLogin(MultipartFile file) {
String s = OssUtil.uploadMultipartFile(file);
return null;
}
}

14
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysPasswordService.java → HomeWork-auth/src/main/java/HomeWork/auth/service/SysPasswordService.java
View File

@ -1,14 +1,14 @@
package com.ruoyi.auth.service;
package HomeWork.auth.service;
import java.util.concurrent.TimeUnit;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.CacheConstants;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.redis.service.RedisService;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.SysUser;
import HomeWork.common.core.constant.CacheConstants;
import HomeWork.common.core.constant.Constants;
import HomeWork.common.core.exception.ServiceException;
import HomeWork.common.redis.service.RedisService;
import HomeWork.common.security.utils.SecurityUtils;
import HomeWork.system.api.domain.SysUser;
/**
* 登录密码方法

14
ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysRecordLogService.java → HomeWork-auth/src/main/java/HomeWork/auth/service/SysRecordLogService.java
View File

@ -1,13 +1,13 @@
package com.ruoyi.auth.service;
package HomeWork.auth.service;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.ip.IpUtils;
import com.ruoyi.system.api.RemoteLogService;
import com.ruoyi.system.api.domain.SysLogininfor;
import HomeWork.common.core.constant.Constants;
import HomeWork.common.core.constant.SecurityConstants;
import HomeWork.common.core.utils.StringUtils;
import HomeWork.common.core.utils.ip.IpUtils;
import HomeWork.system.api.RemoteLogService;
import HomeWork.system.api.domain.SysLogininfor;
/**
* 记录日志方法

154
HomeWork-auth/src/main/java/HomeWork/auth/util/OssUtil.java 100644
View File

@ -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;
}
}

0
ruoyi-auth/src/main/resources/banner.txt → HomeWork-auth/src/main/resources/banner.txt
View File

8
ruoyi-auth/src/main/resources/bootstrap.yml → HomeWork-auth/src/main/resources/bootstrap.yml
View File

@ -6,7 +6,7 @@ server:
spring:
application:
# 应用名称
name: ruoyi-auth
name: HomeWork-auth
profiles:
# 环境配置
active: dev
@ -14,10 +14,12 @@ spring:
nacos:
discovery:
# 服务注册地址
server-addr: 127.0.0.1:8848
server-addr: 101.34.77.101:8848
namespace: 20041112
config:
# 配置中心地址
server-addr: 127.0.0.1:8848
server-addr: 101.34.77.101:8848
namespace: 20041112
# 配置文件格式
file-extension: yml
# 共享配置

4
ruoyi-gateway/src/main/resources/logback.xml → HomeWork-auth/src/main/resources/logback.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<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" />
@ -58,7 +58,7 @@
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.ruoyi" level="info" />
<logger name="HomeWork" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />

9
ruoyi-common/ruoyi-common-core/pom.xml → HomeWork-common/HomeWork-common-core/pom.xml
View File

@ -3,16 +3,16 @@
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">
<parent>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
<groupId>HomeWork</groupId>
<artifactId>HomeWork-common</artifactId>
<version>3.6.3</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-common-core</artifactId>
<artifactId>HomeWork-common-core</artifactId>
<description>
ruoyi-common-core核心模块
HomeWork-common-core核心模块
</description>
<dependencies>
@ -113,6 +113,7 @@
<artifactId>swagger-annotations</artifactId>
</dependency>
</dependencies>
</project>

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/annotation/Excel.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.annotation;
package HomeWork.common.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
@ -7,7 +7,7 @@ import java.lang.annotation.Target;
import java.math.BigDecimal;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.poi.ss.usermodel.IndexedColors;
import com.ruoyi.common.core.utils.poi.ExcelHandlerAdapter;
import HomeWork.common.core.utils.poi.ExcelHandlerAdapter;
/**
* 自定义导出Excel数据注解

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excels.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/annotation/Excels.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.annotation;
package HomeWork.common.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/CacheConstants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/CacheConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 缓存常量信息

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/Constants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 通用常量信息
@ -120,16 +120,16 @@ public class Constants
/**
* 自动识别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",
"org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
"org.springframework", "org.apache", "HomeWork.common.core.utils.file" };
}

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/GenConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 代码生成通用常量

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/HttpStatus.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/HttpStatus.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 返回状态码

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/ScheduleConstants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/ScheduleConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 任务调度通用常量

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/SecurityConstants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/SecurityConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 权限相关通用常量

24
HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/ServiceNameConstants.java 100644
View File

@ -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";
}

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/TokenConstants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/TokenConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* Token的Key常量

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/UserConstants.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/constant/UserConstants.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.constant;
package HomeWork.common.core.constant;
/**
* 用户常量信息

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/context/SecurityContextHolder.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.context;
package HomeWork.common.core.context;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.constant.SecurityConstants;
import HomeWork.common.core.text.Convert;
import HomeWork.common.core.utils.StringUtils;
/**
* 获取当前线程变量中的 用户id、用户名称、Token等信息

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/domain/R.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/domain/R.java
View File

@ -1,7 +1,7 @@
package com.ruoyi.common.core.domain;
package HomeWork.common.core.domain;
import java.io.Serializable;
import com.ruoyi.common.core.constant.Constants;
import HomeWork.common.core.constant.Constants;
/**
* 响应信息主体

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/UserStatus.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/enums/UserStatus.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.enums;
package HomeWork.common.core.enums;
/**
* 用户状态

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CaptchaException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/CaptchaException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 验证码错误异常类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/CheckedException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/CheckedException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 检查异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/DemoModeException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/DemoModeException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 演示模式异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/GlobalException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/GlobalException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 全局异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/InnerAuthException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/InnerAuthException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 内部认证异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/PreAuthorizeException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 权限异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/ServiceException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/ServiceException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 业务异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/UtilException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/UtilException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception;
package HomeWork.common.core.exception;
/**
* 工具类异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotLoginException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/auth/NotLoginException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.auth;
package HomeWork.common.core.exception.auth;
/**
* 未能通过的登录认证异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotPermissionException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/auth/NotPermissionException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.auth;
package HomeWork.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/auth/NotRoleException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/auth/NotRoleException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.auth;
package HomeWork.common.core.exception.auth;
import org.apache.commons.lang3.StringUtils;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/base/BaseException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/base/BaseException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.base;
package HomeWork.common.core.exception.base;
/**
* 基础异常

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/file/FileException.java
View File

@ -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;
/**
* 文件信息异常类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileNameLengthLimitExceededException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/file/FileNameLengthLimitExceededException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.file;
package HomeWork.common.core.exception.file;
/**
* 文件名称超长限制异常类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileSizeLimitExceededException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/file/FileSizeLimitExceededException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.file;
package HomeWork.common.core.exception.file;
/**
* 文件名大小限制异常类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/FileUploadException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/file/FileUploadException.java
View 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.PrintWriter;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/file/InvalidExtensionException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.file;
package HomeWork.common.core.exception.file;
import java.util.Arrays;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/job/TaskException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/job/TaskException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.job;
package HomeWork.common.core.exception.job;
/**
* 计划策略异常

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/CaptchaExpireException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/user/CaptchaExpireException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.user;
package HomeWork.common.core.exception.user;
/**
* 验证码失效异常类

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/user/UserException.java
View File

@ -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;
/**
* 用户信息异常类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/user/UserPasswordNotMatchException.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/exception/user/UserPasswordNotMatchException.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.exception.user;
package HomeWork.common.core.exception.user;
/**
* 用户密码不正确或不符合规范异常类

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/CharsetKit.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/text/CharsetKit.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.common.core.text;
package HomeWork.common.core.text;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.utils.StringUtils;
/**
* 字符集工具类

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/text/Convert.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.text;
package HomeWork.common.core.text;
import java.math.BigDecimal;
import java.math.BigInteger;
@ -7,7 +7,7 @@ import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.text.NumberFormat;
import java.util.Set;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.utils.StringUtils;
/**
* 类型转换器

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/StrFormatter.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/text/StrFormatter.java
View File

@ -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;
/**
* 字符串格式化

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/DateUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import java.lang.management.ManagementFactory;
import java.text.ParseException;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ExceptionUtil.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/ExceptionUtil.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import java.io.PrintWriter;
import java.io.StringWriter;

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/JwtUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/JwtUtils.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import java.util.Map;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.constant.TokenConstants;
import com.ruoyi.common.core.text.Convert;
import HomeWork.common.core.constant.SecurityConstants;
import HomeWork.common.core.constant.TokenConstants;
import HomeWork.common.core.text.Convert;
import io.jsonwebtoken.Claims;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/PageUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/PageUtils.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.utils.sql.SqlUtil;
import com.ruoyi.common.core.web.page.PageDomain;
import com.ruoyi.common.core.web.page.TableSupport;
import HomeWork.common.core.utils.sql.SqlUtil;
import HomeWork.common.core.web.page.PageDomain;
import HomeWork.common.core.web.page.TableSupport;
/**
* 分页工具类

8
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/ServletUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import java.io.IOException;
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.ServletRequestAttributes;
import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.text.Convert;
import HomeWork.common.core.constant.Constants;
import HomeWork.common.core.domain.R;
import HomeWork.common.core.text.Convert;
import reactor.core.publisher.Mono;
/**

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/SpringUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/SpringUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import org.springframework.aop.framework.AopContext;
import org.springframework.beans.BeansException;

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/StringUtils.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.utils;
package HomeWork.common.core.utils;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.springframework.util.AntPathMatcher;
import com.ruoyi.common.core.constant.Constants;
import com.ruoyi.common.core.text.StrFormatter;
import HomeWork.common.core.constant.Constants;
import HomeWork.common.core.text.StrFormatter;
/**
* 字符串工具类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/bean/BeanUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.bean;
package HomeWork.common.core.utils.bean;
import java.lang.reflect.Method;
import java.util.ArrayList;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/bean/BeanValidators.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.bean;
package HomeWork.common.core.utils.bean;
import java.util.Set;
import javax.validation.ConstraintViolation;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileTypeUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/file/FileTypeUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.file;
package HomeWork.common.core.utils.file;
import java.io.File;
import java.util.Objects;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/file/FileUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.file;
package HomeWork.common.core.utils.file;
import java.io.File;
import java.io.FileInputStream;
@ -11,7 +11,7 @@ import java.nio.charset.StandardCharsets;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.utils.StringUtils;
/**
* 文件处理工具类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/ImageUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/file/ImageUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.file;
package HomeWork.common.core.utils.file;
import java.io.ByteArrayInputStream;
import java.io.InputStream;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/MimeTypeUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/file/MimeTypeUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.file;
package HomeWork.common.core.utils.file;
/**
* 媒体类型工具类

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/EscapeUtil.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/html/EscapeUtil.java
View 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;
/**
* 转义和反转义工具类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/html/HTMLFilter.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/html/HTMLFilter.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.html;
package HomeWork.common.core.utils.html;
import java.util.ArrayList;
import java.util.Collections;

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/ip/IpUtils.java
View File

@ -1,10 +1,10 @@
package com.ruoyi.common.core.utils.ip;
package HomeWork.common.core.utils.ip;
import java.net.InetAddress;
import java.net.UnknownHostException;
import javax.servlet.http.HttpServletRequest;
import com.ruoyi.common.core.utils.ServletUtils;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.utils.ServletUtils;
import HomeWork.common.core.utils.StringUtils;
/**
* 获取IP方法

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelHandlerAdapter.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/poi/ExcelHandlerAdapter.java
View File

@ -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.Workbook;

24
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/poi/ExcelUtil.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.poi;
package HomeWork.common.core.utils.poi;
import java.io.IOException;
import java.io.InputStream;
@ -51,17 +51,17 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
import org.apache.poi.xssf.usermodel.XSSFDataValidation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.annotation.Excel.Type;
import com.ruoyi.common.core.annotation.Excels;
import com.ruoyi.common.core.exception.UtilException;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.file.FileTypeUtils;
import com.ruoyi.common.core.utils.file.ImageUtils;
import com.ruoyi.common.core.utils.reflect.ReflectUtils;
import HomeWork.common.core.annotation.Excel;
import HomeWork.common.core.annotation.Excel.ColumnType;
import HomeWork.common.core.annotation.Excel.Type;
import HomeWork.common.core.annotation.Excels;
import HomeWork.common.core.exception.UtilException;
import HomeWork.common.core.text.Convert;
import HomeWork.common.core.utils.DateUtils;
import HomeWork.common.core.utils.StringUtils;
import HomeWork.common.core.utils.file.FileTypeUtils;
import HomeWork.common.core.utils.file.ImageUtils;
import HomeWork.common.core.utils.reflect.ReflectUtils;
/**
* Excel相关处理

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/reflect/ReflectUtils.java
View File

@ -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.InvocationTargetException;
@ -12,8 +12,8 @@ import org.apache.commons.lang3.Validate;
import org.apache.poi.ss.usermodel.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.DateUtils;
import HomeWork.common.core.text.Convert;
import HomeWork.common.core.utils.DateUtils;
/**
* 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sign/Base64.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/sign/Base64.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.sign;
package HomeWork.common.core.utils.sign;
/**
* Base64工具类

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/sql/SqlUtil.java
View File

@ -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 com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.exception.UtilException;
import HomeWork.common.core.utils.StringUtils;
/**
* sql操作工具类

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/IdUtils.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/uuid/IdUtils.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.utils.uuid;
package HomeWork.common.core.utils.uuid;
/**
* ID生成器工具类

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/Seq.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/uuid/Seq.java
View File

@ -1,8 +1,8 @@
package com.ruoyi.common.core.utils.uuid;
package HomeWork.common.core.utils.uuid;
import java.util.concurrent.atomic.AtomicInteger;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.utils.DateUtils;
import HomeWork.common.core.utils.StringUtils;
/**
* @author ruoyi 序列生成类

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/utils/uuid/UUID.java
View File

@ -1,11 +1,11 @@
package com.ruoyi.common.core.utils.uuid;
package HomeWork.common.core.utils.uuid;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Random;
import java.util.concurrent.ThreadLocalRandom;
import com.ruoyi.common.core.exception.UtilException;
import HomeWork.common.core.exception.UtilException;
/**
* 提供通用唯一识别码（universally unique identifier）（UUID）实现

12
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/web/controller/BaseController.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.web.controller;
package HomeWork.common.core.web.controller;
import java.beans.PropertyEditorSupport;
import java.util.Date;
@ -8,11 +8,11 @@ import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.core.constant.HttpStatus;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.PageUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import HomeWork.common.core.constant.HttpStatus;
import HomeWork.common.core.utils.DateUtils;
import HomeWork.common.core.utils.PageUtils;
import HomeWork.common.core.web.domain.AjaxResult;
import HomeWork.common.core.web.page.TableDataInfo;
/**
* web层通用数据处理

6
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/AjaxResult.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/web/domain/AjaxResult.java
View File

@ -1,9 +1,9 @@
package com.ruoyi.common.core.web.domain;
package HomeWork.common.core.web.domain;
import java.util.HashMap;
import java.util.Objects;
import com.ruoyi.common.core.constant.HttpStatus;
import com.ruoyi.common.core.utils.StringUtils;
import HomeWork.common.core.constant.HttpStatus;
import HomeWork.common.core.utils.StringUtils;
/**
* 操作消息提醒

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/web/domain/BaseEntity.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.web.domain;
package HomeWork.common.core.web.domain;
import java.io.Serializable;
import java.util.Date;

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/TreeEntity.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/web/domain/TreeEntity.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.web.domain;
package HomeWork.common.core.web.domain;
import java.util.ArrayList;
import java.util.List;

4
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/PageDomain.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/web/page/PageDomain.java
View File

@ -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;
/**
* 分页数据

2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/page/TableDataInfo.java → HomeWork-common/HomeWork-common-core/src/main/java/HomeWork/common/core/web/page/TableDataInfo.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.common.core.web.page;
package HomeWork.common.core.web.page;
import java.io.Serializable;
import java.util.List;

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