diff --git a/common/pom.xml b/common/pom.xml index 25dcf73..78b2c63 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -16,94 +16,7 @@ 5.3.4 - - - - - org.springframework.boot - spring-boot-starter-data-redis-reactive - - - - org.projectlombok - lombok - true - - - - org.apache.commons - commons-lang3 - - - commons-io - commons-io - 20030203.000550 - - - org.springframework.boot - spring-boot-starter-aop - - - - - com.alibaba - easyexcel - 3.0.5 - - - - commons-fileupload - commons-fileupload - 1.4 - - - - com.aliyun - aliyun-java-sdk-core - 4.5.30 - - - - org.springframework.boot - spring-boot-starter-mail - - - - org.springframework.boot - spring-boot-starter-thymeleaf - - - - cn.jpush.api - jpush-client - 3.5.5 - - - - org.apache.commons - commons-compress - 1.21 - - - - - com.google.zxing - core - 3.4.1 - - - com.google.zxing - javase - 3.4.1 - - - - mysql - mysql-connector-java - runtime - - cn.hutool diff --git a/common/src/main/java/com/canvas/web/service/IUplpadService.java b/common/src/main/java/com/canvas/web/service/IUplpadService.java deleted file mode 100644 index d4ed234..0000000 --- a/common/src/main/java/com/canvas/web/service/IUplpadService.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.canvas.web.service; - - -import com.canvas.web.utils.JsonResult; - -import javax.servlet.http.HttpServletRequest; - -public interface IUplpadService { - - /** - * 上传图片 - * - * @param request 网络请求 - * @param name 目录名 - * @return - */ - JsonResult uploadImage(HttpServletRequest request, String name); - -} diff --git a/common/src/main/java/com/canvas/web/service/impl/UploadServiceImpl.java b/common/src/main/java/com/canvas/web/service/impl/UploadServiceImpl.java deleted file mode 100644 index affa271..0000000 --- a/common/src/main/java/com/canvas/web/service/impl/UploadServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.canvas.web.service.impl; - -import com.canvas.web.service.IUplpadService; -import com.canvas.web.utils.CommonUtils; -import com.canvas.web.utils.JsonResult; -import com.canvas.web.utils.UploadUtils; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -public class UploadServiceImpl implements IUplpadService { - - - /** - * 上传图片 - * - * @param request 网络请求 - * @param name 目录名 - * @return - */ - @Override - public JsonResult uploadImage(HttpServletRequest request, String name) { - UploadUtils uploadUtils = new UploadUtils(); - Map result = uploadUtils.uploadFile(request, name); - List imageList = (List) result.get("image"); - String imageUrl = CommonUtils.getImageURL(imageList.get(0)); - return JsonResult.success("上传成功", imageUrl); - } -} diff --git a/common/src/main/java/com/canvas/web/utils/UploadUtils.java b/common/src/main/java/com/canvas/web/utils/UploadUtils.java deleted file mode 100644 index d8df1b0..0000000 --- a/common/src/main/java/com/canvas/web/utils/UploadUtils.java +++ /dev/null @@ -1,305 +0,0 @@ -package com.canvas.web.utils; - -import com.canvas.web.config.UploadFileConfig; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; - -import javax.servlet.http.HttpServletRequest; -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.*; - -public class UploadUtils { - - // 表单字段常量 - public static final String FORM_FIELDS = "form_fields"; - - // 文件域常量 - public static final String FILE_FIELDS = "file"; - // 定义允许上传的文件扩展名 - private Map extMap = new HashMap(); - // 文件保存目录路径 - private String uploadPath = UploadFileConfig.uploadFolder; - // 文件的目录名 - private String dirName = "images"; - // 上传临时路径 - private static final String TEMP_PATH = "temp"; - // 临时存相对路径 - private String tempPath = uploadPath + TEMP_PATH; - // 单个文件最大上传大小(10M) - private long fileMaxSize = 1024 * 1024 * 10; - // 最大文件大小(100M) - private long maxSize = 1024 * 1024 * 100; - // 文件保存目录url - private String saveUrl; - // 文件最终的url包括文件名 - private List fileUrl = new ArrayList<>(); - - /** - * 构造函数 - */ - public UploadUtils() { - // 其中images,flashs,medias,files,对应文件夹名称,对应dirName - // key文件夹名称 - // value该文件夹内可以上传文件的后缀名 - extMap.put("images", "gif,jpg,jpeg,png,bmp"); - extMap.put("flashs", "swf,flv"); - extMap.put("medias", "swf,flv,mp3,wav,wma,wmv,mid,avi,mpg,asf,rm,rmvb"); - extMap.put("files", "doc,docx,xls,xlsx,ppt,htm,html,txt,zip,rar,gz,bz2"); - } - - /** - * 文件上传 - * - * @param request - * @return - */ - @SuppressWarnings("unchecked") - public Map uploadFile(HttpServletRequest request, String name) { - // 验证文件并返回错误信息 - String error = this.validateFields(request, name); - // 初始化表单元素 - Map fieldsMap = new HashMap(); - if (error.equals("")) { - fieldsMap = this.initFields(request); - } - List fiList = (List) fieldsMap.get(UploadUtils.FILE_FIELDS); - if (fiList != null) { - for (FileItem item : fiList) { - // 上传文件并返回错误信息 - error = this.saveFile(item); - } - } - // 返回结果 - Map result = new HashMap<>(); - result.put("error", error); - result.put("image", this.fileUrl); - return result; - } - - /** - * 上传验证并初始化目录 - * - * @param request - * @return - */ - private String validateFields(HttpServletRequest request, String name) { - String errorInfo = ""; - // 获取内容类型 - String contentType = request.getContentType(); - int contentLength = request.getContentLength(); - // 初始化上传路径，不存在则创建 - File uploadDir = new File(uploadPath); - // 目录不存在则创建 - if (!uploadDir.exists()) { - uploadDir.mkdirs(); - } - if (contentType == null || !contentType.startsWith("multipart")) { - // TODO - System.out.println("请求不包含multipart/form-data流"); - errorInfo = "请求不包含multipart/form-data流"; - } else if (maxSize < contentLength) { - // TODO - System.out.println("上传文件大小超出文件最大大小"); - errorInfo = "上传文件大小超出文件最大大小[" + maxSize + "]"; - } else if (!ServletFileUpload.isMultipartContent(request)) { - // TODO - errorInfo = "请选择文件"; - } else if (!uploadDir.isDirectory()) { - // TODO - errorInfo = "上传目录[" + uploadPath + "]不存在"; - } else if (!uploadDir.canWrite()) { - // TODO - errorInfo = "上传目录[" + uploadPath + "]没有写权限"; - } else if (!extMap.containsKey(dirName)) { - // TODO - errorInfo = "目录名不正确"; - } else { - // 上传路径 - uploadPath += dirName + "/" + name + "/"; - // 保存目录Url - saveUrl = dirName + "/" + name + "/"; - - // 创建一级目录 - File saveDirFile = new File(uploadPath); - if (!saveDirFile.exists()) { - saveDirFile.mkdirs(); - } - - // 创建二级目录(格式：年月日) - SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd"); - String ymd = sdf.format(new Date()); - uploadPath += ymd + "/"; - saveUrl += ymd + "/"; - File dirFile = new File(uploadPath); - if (!dirFile.exists()) { - dirFile.mkdirs(); - } - - // 创建上传临时目录 - File file = new File(tempPath); - if (!file.exists()) { - file.mkdirs(); - } - } - return errorInfo; - } - - /** - * 处理上传内容 - * - * @return - */ -// @SuppressWarnings("unchecked") - private Map initFields(HttpServletRequest request) { - // 存储表单字段和非表单字段 - Map map = new HashMap(); - // 第一步：判断request - boolean isMultipart = ServletFileUpload.isMultipartContent(request); - // 第二步：解析request - if (isMultipart) { - // 设置环境:创建一个DiskFileItemFactory工厂 - DiskFileItemFactory factory = new DiskFileItemFactory(); - // 阀值,超过这个值才会写到临时目录,否则在内存中 - factory.setSizeThreshold(1024 * 1024 * 10); - // 设置上传文件的临时目录 - factory.setRepository(new File(tempPath)); - // 核心操作类:创建一个文件上传解析器。 - ServletFileUpload upload = new ServletFileUpload(factory); - // 设置文件名称编码(解决上传"文件名"的中文乱码) - upload.setHeaderEncoding("UTF-8"); - // 限制单个文件上传大小 - upload.setFileSizeMax(fileMaxSize); - // 限制总上传文件大小 - upload.setSizeMax(maxSize); - // 使用ServletFileUpload解析器解析上传数据，解析结果返回的是一个List集合，每一个FileItem对应一个Form表单的输入项 - List items = null; - try { - items = upload.parseRequest(request); - } catch (FileUploadException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - // 第3步：处理uploaded items - if (items != null && items.size() > 0) { - Iterator iter = items.iterator(); - // 文件域对象 - List list = new ArrayList(); - // 表单字段 - Map fields = new HashMap(); - while (iter.hasNext()) { - FileItem item = iter.next(); - // 处理所有表单元素和文件域表单元素 - if (item.isFormField()) { - // 如果fileitem中封装的是普通输入项的数据（输出名、值） - String name = item.getFieldName();// 普通输入项数据的名 - String value = item.getString(); - fields.put(name, value); - } else { - //如果fileitem中封装的是上传文件，得到上传的文件名称 - // 文件域表单元素 - list.add(item); - } - } - map.put(FORM_FIELDS, fields); - map.put(FILE_FIELDS, list); - } - } - return map; - } - - /** - * 保存文件 - * - * @param item - * @return - */ - private String saveFile(FileItem item) { - String error = ""; - String fileName = item.getName(); - String fileExt = fileName.substring(fileName.lastIndexOf(".") + 1).toLowerCase(); - - if (item.getSize() > maxSize) { // 检查文件大小 - // TODO - error = "上传文件大小超过限制"; - } else if (!Arrays.asList(extMap.get(dirName).split(",")).contains(fileExt)) {// 检查扩展名 - error = "上传文件扩展名是不允许的扩展名。\n只允许" + extMap.get(dirName) + "格式。"; - } else { - // 存储文件重命名 - SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss"); - String newFileName = df.format(new Date()) + new Random().nextInt(1000) + "." + fileExt; - - // 新增值文件数组 - String filePath = saveUrl + newFileName; - fileUrl.add(filePath); - - // 写入文件 - try { - File uploadedFile = new File(uploadPath, newFileName); - item.write(uploadedFile); - } catch (IOException e) { - e.printStackTrace(); - System.out.println("上传失败了！！！"); - } catch (Exception e) { - e.printStackTrace(); - } - } - return error; - } - - /** - * *********************get/set方法********************************* - */ - public String getSaveUrl() { - return saveUrl; - } - - public String getUploadPath() { - return uploadPath; - } - - public long getMaxSize() { - return maxSize; - } - - public void setMaxSize(long maxSize) { - this.maxSize = maxSize; - } - - public Map getExtMap() { - return extMap; - } - - public void setExtMap(Map extMap) { - this.extMap = extMap; - } - - public String getDirName() { - return dirName; - } - - public void setDirName(String dirName) { - this.dirName = dirName; - } - - public String getTempPath() { - return tempPath; - } - - public void setTempPath(String tempPath) { - this.tempPath = tempPath; - } - - public List getFileUrl() { - return fileUrl; - } - - public void setFileUrl(List fileUrl) { - this.fileUrl = fileUrl; - } - -} diff --git a/generator/pom.xml b/generator/pom.xml deleted file mode 100644 index c550a82..0000000 --- a/generator/pom.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - yxk_canvasScreen - com.canvas.web - 1.0-SNAPSHOT - - 4.0.0 - - generator - 代码生成 - - - 17 - 17 - - - - - - - com.canvas.web - common - 1.0-SNAPSHOT - - - - mysql - mysql-connector-java - runtime - - - - com.baomidou - mybatis-plus-generator - 3.2.0 - - - - org.freemarker - freemarker - 2.3.28 - - - org.projectlombok - lombok - true - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index aa084e4..9839922 100644 --- a/pom.xml +++ b/pom.xml @@ -10,11 +10,8 @@ pom 1.0-SNAPSHOT - common - generator - quartz - queue system + common 多媒体后台管理系统 @@ -235,17 +232,6 @@ - - - - - org.apache.maven.plugins - maven-surefire-plugin - - true - - - - + \ No newline at end of file diff --git a/quartz/pom.xml b/quartz/pom.xml deleted file mode 100644 index fe28274..0000000 --- a/quartz/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - yxk_canvasScreen - com.canvas.web - 1.0-SNAPSHOT - - 4.0.0 - - quartz - 定时任务 - - - 17 - 17 - - - - - - - com.canvas.web - common - 1.0-SNAPSHOT - - - org.projectlombok - lombok - true - - - - \ No newline at end of file diff --git a/queue/pom.xml b/queue/pom.xml deleted file mode 100644 index a65abff..0000000 --- a/queue/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - yxk_canvasScreen - com.canvas.web - 1.0-SNAPSHOT - - 4.0.0 - - queue - 消息队列 - - - 17 - 17 - - - - - - - com.canvas.web - common - 1.0-SNAPSHOT - - - org.springframework.boot - spring-boot-starter-activemq - - - org.springframework.boot - spring-boot-starter-amqp - - - org.projectlombok - lombok - true - - - - \ No newline at end of file diff --git a/system/pom.xml b/system/pom.xml index 9409ef6..c06eec0 100644 --- a/system/pom.xml +++ b/system/pom.xml @@ -19,6 +19,7 @@ + com.canvas.web common diff --git a/system/src/main/java/AppRun.java b/system/src/main/java/com/canvas/web/AppRun.java similarity index 98% rename from system/src/main/java/AppRun.java rename to system/src/main/java/com/canvas/web/AppRun.java index ff08566..663aaa5 100644 --- a/system/src/main/java/AppRun.java +++ b/system/src/main/java/com/canvas/web/AppRun.java @@ -1,3 +1,5 @@ +package com.canvas.web; + import com.canvas.web.annotation.rest.AnonymousGetMapping; import com.canvas.web.utils.SpringContextHolder; import io.swagger.annotations.Api; diff --git a/system/src/main/java/modules/security/config/ConfigBeanConfiguration.java b/system/src/main/java/com/canvas/web/modules/config/ConfigBeanConfiguration.java similarity index 78% rename from system/src/main/java/modules/security/config/ConfigBeanConfiguration.java rename to system/src/main/java/com/canvas/web/modules/config/ConfigBeanConfiguration.java index 4d570bf..b32551c 100644 --- a/system/src/main/java/modules/security/config/ConfigBeanConfiguration.java +++ b/system/src/main/java/com/canvas/web/modules/config/ConfigBeanConfiguration.java @@ -1,8 +1,8 @@ -package modules.security.config; +package com.canvas.web.modules.config; -import modules.security.config.bean.LoginProperties; -import modules.security.config.bean.SecurityProperties; +import com.canvas.web.modules.config.bean.SecurityProperties; +import com.canvas.web.modules.config.bean.LoginProperties; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/system/src/main/java/modules/security/config/SpringSecurityConfig.java b/system/src/main/java/com/canvas/web/modules/config/SpringSecurityConfig.java similarity index 76% rename from system/src/main/java/modules/security/config/SpringSecurityConfig.java rename to system/src/main/java/com/canvas/web/modules/config/SpringSecurityConfig.java index b86cfd7..0ae5a63 100644 --- a/system/src/main/java/modules/security/config/SpringSecurityConfig.java +++ b/system/src/main/java/com/canvas/web/modules/config/SpringSecurityConfig.java @@ -1,11 +1,12 @@ -package modules.security.config; +package com.canvas.web.modules.config; +import com.canvas.web.modules.security.JwtAccessDeniedHandler; +import com.canvas.web.modules.security.JwtAuthenticationEntryPoint; +import com.canvas.web.modules.security.SecurityProperties; +import com.canvas.web.modules.security.TokenProvider; import lombok.RequiredArgsConstructor; -import modules.security.security.JwtAccessDeniedHandler; -import modules.security.security.JwtAuthenticationEntryPoint; -import modules.security.security.SecurityProperties; -import modules.security.security.TokenProvider; -import modules.security.service.UserCacheClean; + +import com.canvas.web.modules.service.UserCacheClean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; diff --git a/system/src/main/java/modules/security/config/bean/LoginCode.java b/system/src/main/java/com/canvas/web/modules/config/bean/LoginCode.java similarity index 93% rename from system/src/main/java/modules/security/config/bean/LoginCode.java rename to system/src/main/java/com/canvas/web/modules/config/bean/LoginCode.java index 1b4e08d..4db6e5f 100644 --- a/system/src/main/java/modules/security/config/bean/LoginCode.java +++ b/system/src/main/java/com/canvas/web/modules/config/bean/LoginCode.java @@ -1,4 +1,4 @@ -package modules.security.config.bean; +package com.canvas.web.modules.config.bean; import lombok.Data; diff --git a/system/src/main/java/modules/security/config/bean/LoginCodeEnum.java b/system/src/main/java/com/canvas/web/modules/config/bean/LoginCodeEnum.java similarity index 84% rename from system/src/main/java/modules/security/config/bean/LoginCodeEnum.java rename to system/src/main/java/com/canvas/web/modules/config/bean/LoginCodeEnum.java index d99bfbb..48a89f1 100644 --- a/system/src/main/java/modules/security/config/bean/LoginCodeEnum.java +++ b/system/src/main/java/com/canvas/web/modules/config/bean/LoginCodeEnum.java @@ -1,4 +1,4 @@ -package modules.security.config.bean; +package com.canvas.web.modules.config.bean; //验证码配置枚举 public enum LoginCodeEnum { diff --git a/system/src/main/java/modules/security/config/bean/LoginProperties.java b/system/src/main/java/com/canvas/web/modules/config/bean/LoginProperties.java similarity index 96% rename from system/src/main/java/modules/security/config/bean/LoginProperties.java rename to system/src/main/java/com/canvas/web/modules/config/bean/LoginProperties.java index 44b4eec..491eaad 100644 --- a/system/src/main/java/modules/security/config/bean/LoginProperties.java +++ b/system/src/main/java/com/canvas/web/modules/config/bean/LoginProperties.java @@ -1,7 +1,6 @@ -package modules.security.config.bean; +package com.canvas.web.modules.config.bean; import com.canvas.web.exception.BaseException; -import com.canvas.web.exception.user.UserException; import com.canvas.web.utils.StringUtils; import com.wf.captcha.*; import com.wf.captcha.base.Captcha; diff --git a/system/src/main/java/modules/security/security/SecurityProperties.java b/system/src/main/java/com/canvas/web/modules/config/bean/SecurityProperties.java similarity index 95% rename from system/src/main/java/modules/security/security/SecurityProperties.java rename to system/src/main/java/com/canvas/web/modules/config/bean/SecurityProperties.java index ed8cfe9..0e8cd3a 100644 --- a/system/src/main/java/modules/security/security/SecurityProperties.java +++ b/system/src/main/java/com/canvas/web/modules/config/bean/SecurityProperties.java @@ -1,10 +1,11 @@ -package modules.security.security; +package com.canvas.web.modules.config.bean; import lombok.Data; @Data public class SecurityProperties { + /** * Request Headers:Authorization */ diff --git a/system/src/main/java/modules/security/controller/AuthorizationController.java b/system/src/main/java/com/canvas/web/modules/controller/AuthorizationController.java similarity index 90% rename from system/src/main/java/modules/security/controller/AuthorizationController.java rename to system/src/main/java/com/canvas/web/modules/controller/AuthorizationController.java index 46863be..ab558a9 100644 --- a/system/src/main/java/modules/security/controller/AuthorizationController.java +++ b/system/src/main/java/com/canvas/web/modules/controller/AuthorizationController.java @@ -1,9 +1,12 @@ -package modules.security.controller; +package com.canvas.web.modules.controller; import com.canvas.web.annotation.rest.AnonymousPostMapping; import com.canvas.web.config.RsaProperties; import com.canvas.web.exception.BaseException; +import com.canvas.web.modules.security.TokenProvider; +import com.canvas.web.modules.service.OnlineUserService; +import com.canvas.web.modules.service.dto.AuthUserDto; import com.canvas.web.utils.RedisUtils; import com.canvas.web.utils.RsaUtils; import com.canvas.web.utils.StringUtils; @@ -11,12 +14,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import modules.security.config.bean.LoginProperties; -import modules.security.config.bean.SecurityProperties; -import modules.security.security.TokenProvider; -import modules.security.service.OnlineUserService; -import modules.security.service.dto.AuthUserDto; -import modules.security.service.dto.JwtUserDto; +import com.canvas.web.modules.config.bean.LoginProperties; +import com.canvas.web.modules.config.bean.SecurityProperties; +import com.canvas.web.modules.service.dto.JwtUserDto; import org.springframework.http.ResponseEntity; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; diff --git a/system/src/main/java/com/canvas/web/modules/controller/OnlineController.java b/system/src/main/java/com/canvas/web/modules/controller/OnlineController.java new file mode 100644 index 0000000..fc66b9b --- /dev/null +++ b/system/src/main/java/com/canvas/web/modules/controller/OnlineController.java @@ -0,0 +1,15 @@ +package com.canvas.web.modules.controller; + + +import com.canvas.web.modules.service.OnlineUserService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth/online") +public class OnlineController { + + private final OnlineUserService onlineUserService; +} diff --git a/system/src/main/java/modules/security/security/JwtAccessDeniedHandler.java b/system/src/main/java/com/canvas/web/modules/security/JwtAccessDeniedHandler.java similarity index 95% rename from system/src/main/java/modules/security/security/JwtAccessDeniedHandler.java rename to system/src/main/java/com/canvas/web/modules/security/JwtAccessDeniedHandler.java index 6d31a15..363466e 100644 --- a/system/src/main/java/modules/security/security/JwtAccessDeniedHandler.java +++ b/system/src/main/java/com/canvas/web/modules/security/JwtAccessDeniedHandler.java @@ -1,4 +1,4 @@ -package modules.security.security; +package com.canvas.web.modules.security; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; diff --git a/system/src/main/java/modules/security/security/JwtAuthenticationEntryPoint.java b/system/src/main/java/com/canvas/web/modules/security/JwtAuthenticationEntryPoint.java similarity index 94% rename from system/src/main/java/modules/security/security/JwtAuthenticationEntryPoint.java rename to system/src/main/java/com/canvas/web/modules/security/JwtAuthenticationEntryPoint.java index eeff1fa..4b32faa 100644 --- a/system/src/main/java/modules/security/security/JwtAuthenticationEntryPoint.java +++ b/system/src/main/java/com/canvas/web/modules/security/JwtAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package modules.security.security; +package com.canvas.web.modules.security; import org.springframework.security.core.AuthenticationException; diff --git a/system/src/main/java/modules/security/config/bean/SecurityProperties.java b/system/src/main/java/com/canvas/web/modules/security/SecurityProperties.java similarity index 95% rename from system/src/main/java/modules/security/config/bean/SecurityProperties.java rename to system/src/main/java/com/canvas/web/modules/security/SecurityProperties.java index e0a2992..daad602 100644 --- a/system/src/main/java/modules/security/config/bean/SecurityProperties.java +++ b/system/src/main/java/com/canvas/web/modules/security/SecurityProperties.java @@ -1,11 +1,10 @@ -package modules.security.config.bean; +package com.canvas.web.modules.security; import lombok.Data; @Data public class SecurityProperties { - /** * Request Headers:Authorization */ diff --git a/system/src/main/java/modules/security/security/TokenConfigurer.java b/system/src/main/java/com/canvas/web/modules/security/TokenConfigurer.java similarity index 79% rename from system/src/main/java/modules/security/security/TokenConfigurer.java rename to system/src/main/java/com/canvas/web/modules/security/TokenConfigurer.java index 31203a1..0c8f977 100644 --- a/system/src/main/java/modules/security/security/TokenConfigurer.java +++ b/system/src/main/java/com/canvas/web/modules/security/TokenConfigurer.java @@ -1,8 +1,8 @@ -package modules.security.security; +package com.canvas.web.modules.security; +import com.canvas.web.modules.service.OnlineUserService; import lombok.RequiredArgsConstructor; -import modules.security.service.OnlineUserService; -import modules.security.service.UserCacheClean; +import com.canvas.web.modules.service.UserCacheClean; import org.springframework.security.config.annotation.SecurityConfigurerAdapter; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.web.DefaultSecurityFilterChain; diff --git a/system/src/main/java/modules/security/security/TokenProvider.java b/system/src/main/java/com/canvas/web/modules/security/TokenProvider.java similarity index 98% rename from system/src/main/java/modules/security/security/TokenProvider.java rename to system/src/main/java/com/canvas/web/modules/security/TokenProvider.java index 4d33f8e..f9b3efb 100644 --- a/system/src/main/java/modules/security/security/TokenProvider.java +++ b/system/src/main/java/com/canvas/web/modules/security/TokenProvider.java @@ -1,4 +1,4 @@ -package modules.security.security; +package com.canvas.web.modules.security; import cn.hutool.core.date.DateField; import cn.hutool.core.date.DateUtil; diff --git a/system/src/main/java/modules/security/service/OnlineUserService.java b/system/src/main/java/com/canvas/web/modules/service/OnlineUserService.java similarity index 86% rename from system/src/main/java/modules/security/service/OnlineUserService.java rename to system/src/main/java/com/canvas/web/modules/service/OnlineUserService.java index a213cc7..c71a402 100644 --- a/system/src/main/java/modules/security/service/OnlineUserService.java +++ b/system/src/main/java/com/canvas/web/modules/service/OnlineUserService.java @@ -1,15 +1,14 @@ -package modules.security.service; +package com.canvas.web.modules.service; import com.canvas.web.utils.RedisUtils; import com.canvas.web.utils.StringUtils; import lombok.extern.slf4j.Slf4j; -import modules.security.config.bean.SecurityProperties; -import modules.security.service.dto.JwtUserDto; -import modules.security.service.dto.OnlineUserDto; +import com.canvas.web.modules.config.bean.SecurityProperties; +import com.canvas.web.modules.service.dto.JwtUserDto; +import com.canvas.web.modules.service.dto.OnlineUserDto; import org.springframework.stereotype.Service; import javax.servlet.http.HttpServletRequest; -import java.util.Date; @Service diff --git a/system/src/main/java/modules/security/service/UserCacheClean.java b/system/src/main/java/com/canvas/web/modules/service/UserCacheClean.java similarity index 94% rename from system/src/main/java/modules/security/service/UserCacheClean.java rename to system/src/main/java/com/canvas/web/modules/service/UserCacheClean.java index 5d8c3df..7822a2a 100644 --- a/system/src/main/java/modules/security/service/UserCacheClean.java +++ b/system/src/main/java/com/canvas/web/modules/service/UserCacheClean.java @@ -1,4 +1,4 @@ -package modules.security.service; +package com.canvas.web.modules.service; diff --git a/system/src/main/java/modules/security/service/UserDetailsServiceImpl.java b/system/src/main/java/com/canvas/web/modules/service/UserDetailsServiceImpl.java similarity index 85% rename from system/src/main/java/modules/security/service/UserDetailsServiceImpl.java rename to system/src/main/java/com/canvas/web/modules/service/UserDetailsServiceImpl.java index b432b3a..6b5af9b 100644 --- a/system/src/main/java/modules/security/service/UserDetailsServiceImpl.java +++ b/system/src/main/java/com/canvas/web/modules/service/UserDetailsServiceImpl.java @@ -1,14 +1,14 @@ -package modules.security.service; +package com.canvas.web.modules.service; import com.canvas.web.exception.BaseException; +import com.canvas.web.modules.service.dto.JwtUserDto; +import com.canvas.web.modules.system.service.UserService; +import com.canvas.web.modules.system.service.dto.UserDto; import lombok.RequiredArgsConstructor; -import modules.security.config.bean.LoginProperties; -import modules.security.service.dto.JwtUserDto; -import modules.system.service.DataService; -import modules.system.service.RoleService; -import modules.system.service.UserService; +import com.canvas.web.modules.config.bean.LoginProperties; +import com.canvas.web.modules.system.service.DataService; +import com.canvas.web.modules.system.service.RoleService; -import modules.system.service.dto.UserDto; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; diff --git a/system/src/main/java/modules/security/service/dto/AuthUserDto.java b/system/src/main/java/com/canvas/web/modules/service/dto/AuthUserDto.java similarity index 86% rename from system/src/main/java/modules/security/service/dto/AuthUserDto.java rename to system/src/main/java/com/canvas/web/modules/service/dto/AuthUserDto.java index d8d1b8d..89cc046 100644 --- a/system/src/main/java/modules/security/service/dto/AuthUserDto.java +++ b/system/src/main/java/com/canvas/web/modules/service/dto/AuthUserDto.java @@ -1,4 +1,4 @@ -package modules.security.service.dto; +package com.canvas.web.modules.service.dto; import lombok.Getter; diff --git a/system/src/main/java/modules/security/service/dto/JwtUserDto.java b/system/src/main/java/com/canvas/web/modules/service/dto/JwtUserDto.java similarity index 92% rename from system/src/main/java/modules/security/service/dto/JwtUserDto.java rename to system/src/main/java/com/canvas/web/modules/service/dto/JwtUserDto.java index 8fc0ec6..26b369c 100644 --- a/system/src/main/java/modules/security/service/dto/JwtUserDto.java +++ b/system/src/main/java/com/canvas/web/modules/service/dto/JwtUserDto.java @@ -1,10 +1,10 @@ -package modules.security.service.dto; +package com.canvas.web.modules.service.dto; +import com.canvas.web.modules.system.service.dto.UserDto; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.AllArgsConstructor; import lombok.Getter; -import modules.system.service.dto.UserDto; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/system/src/main/java/modules/security/service/dto/OnlineUserDto.java b/system/src/main/java/com/canvas/web/modules/service/dto/OnlineUserDto.java similarity index 93% rename from system/src/main/java/modules/security/service/dto/OnlineUserDto.java rename to system/src/main/java/com/canvas/web/modules/service/dto/OnlineUserDto.java index 8dca55e..ed14d77 100644 --- a/system/src/main/java/modules/security/service/dto/OnlineUserDto.java +++ b/system/src/main/java/com/canvas/web/modules/service/dto/OnlineUserDto.java @@ -1,4 +1,4 @@ -package modules.security.service.dto; +package com.canvas.web.modules.service.dto; import lombok.AllArgsConstructor; diff --git a/system/src/main/java/modules/system/service/DataService.java b/system/src/main/java/com/canvas/web/modules/system/service/DataService.java similarity index 63% rename from system/src/main/java/modules/system/service/DataService.java rename to system/src/main/java/com/canvas/web/modules/system/service/DataService.java index 94dd297..b350995 100644 --- a/system/src/main/java/modules/system/service/DataService.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/DataService.java @@ -1,6 +1,6 @@ -package modules.system.service; +package com.canvas.web.modules.system.service; -import modules.system.service.dto.UserDto; +import com.canvas.web.modules.system.service.dto.UserDto; import java.util.List; diff --git a/system/src/main/java/modules/system/service/RoleService.java b/system/src/main/java/com/canvas/web/modules/system/service/RoleService.java similarity index 73% rename from system/src/main/java/modules/system/service/RoleService.java rename to system/src/main/java/com/canvas/web/modules/system/service/RoleService.java index 04c5327..1a0a434 100644 --- a/system/src/main/java/modules/system/service/RoleService.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/RoleService.java @@ -1,6 +1,6 @@ -package modules.system.service; +package com.canvas.web.modules.system.service; -import modules.system.service.dto.UserDto; +import com.canvas.web.modules.system.service.dto.UserDto; import org.springframework.security.core.GrantedAuthority; import java.util.List; diff --git a/system/src/main/java/modules/system/service/UserService.java b/system/src/main/java/com/canvas/web/modules/system/service/UserService.java similarity index 91% rename from system/src/main/java/modules/system/service/UserService.java rename to system/src/main/java/com/canvas/web/modules/system/service/UserService.java index b1dda96..5140b54 100644 --- a/system/src/main/java/modules/system/service/UserService.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/UserService.java @@ -1,7 +1,7 @@ -package modules.system.service; +package com.canvas.web.modules.system.service; -import modules.system.service.dto.UserDto; -import modules.system.service.dto.UserQueryCriteria; +import com.canvas.web.modules.system.service.dto.UserDto; +import com.canvas.web.modules.system.service.dto.UserQueryCriteria; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/system/src/main/java/modules/system/service/dto/MenuDto.java b/system/src/main/java/com/canvas/web/modules/system/service/dto/MenuDto.java similarity index 96% rename from system/src/main/java/modules/system/service/dto/MenuDto.java rename to system/src/main/java/com/canvas/web/modules/system/service/dto/MenuDto.java index 48866ec..ddf936f 100644 --- a/system/src/main/java/modules/system/service/dto/MenuDto.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/dto/MenuDto.java @@ -1,4 +1,4 @@ -package modules.system.service.dto; +package com.canvas.web.modules.system.service.dto; import com.canvas.web.base.BaseDTO; import lombok.Getter; diff --git a/system/src/main/java/modules/system/service/dto/RoleDto.java b/system/src/main/java/com/canvas/web/modules/system/service/dto/RoleDto.java similarity index 94% rename from system/src/main/java/modules/system/service/dto/RoleDto.java rename to system/src/main/java/com/canvas/web/modules/system/service/dto/RoleDto.java index d765a9d..feaf863 100644 --- a/system/src/main/java/modules/system/service/dto/RoleDto.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/dto/RoleDto.java @@ -1,4 +1,4 @@ -package modules.system.service.dto; +package com.canvas.web.modules.system.service.dto; import com.canvas.web.base.BaseDTO; import lombok.Getter; diff --git a/system/src/main/java/modules/system/service/dto/RoleSmallDto.java b/system/src/main/java/com/canvas/web/modules/system/service/dto/RoleSmallDto.java similarity index 81% rename from system/src/main/java/modules/system/service/dto/RoleSmallDto.java rename to system/src/main/java/com/canvas/web/modules/system/service/dto/RoleSmallDto.java index 03e1bb7..5c6c4ad 100644 --- a/system/src/main/java/modules/system/service/dto/RoleSmallDto.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/dto/RoleSmallDto.java @@ -1,4 +1,4 @@ -package modules.system.service.dto; +package com.canvas.web.modules.system.service.dto; import lombok.Data; diff --git a/system/src/main/java/modules/system/service/dto/UserDto.java b/system/src/main/java/com/canvas/web/modules/system/service/dto/UserDto.java similarity index 94% rename from system/src/main/java/modules/system/service/dto/UserDto.java rename to system/src/main/java/com/canvas/web/modules/system/service/dto/UserDto.java index 67fc802..0b6f9b2 100644 --- a/system/src/main/java/modules/system/service/dto/UserDto.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/dto/UserDto.java @@ -1,4 +1,4 @@ -package modules.system.service.dto; +package com.canvas.web.modules.system.service.dto; import com.canvas.web.base.BaseDTO; diff --git a/system/src/main/java/modules/system/service/dto/UserQueryCriteria.java b/system/src/main/java/com/canvas/web/modules/system/service/dto/UserQueryCriteria.java similarity index 92% rename from system/src/main/java/modules/system/service/dto/UserQueryCriteria.java rename to system/src/main/java/com/canvas/web/modules/system/service/dto/UserQueryCriteria.java index 7c56191..00403fd 100644 --- a/system/src/main/java/modules/system/service/dto/UserQueryCriteria.java +++ b/system/src/main/java/com/canvas/web/modules/system/service/dto/UserQueryCriteria.java @@ -1,4 +1,4 @@ -package modules.system.service.dto; +package com.canvas.web.modules.system.service.dto; import com.canvas.web.annotation.Query; import lombok.Data; diff --git a/system/src/main/resources/banner.txt b/system/src/main/resources/banner.txt new file mode 100644 index 0000000..4abe7cc --- /dev/null +++ b/system/src/main/resources/banner.txt @@ -0,0 +1,16 @@ + + + + $$$$$$$\ $$$$$$\ $$$$$$$\ $$\ $$\ $$$$$$\ $$$$$$$\ $$$$$$$\ $$\ $$\ $$$$$$\ $$$$$$\ $$$$$$\ $$$$$$$\ +$$ _____|\____$$\ $$ __$$\\$$\ $$ |\____$$\ $$ _____|$$$$$$\ $$ _____|\$$\ $$ |$$ __$$\ $$ __$$\ $$ __$$\ $$ __$$\ +$$ / $$$$$$$ |$$ | $$ |\$$\$$ / $$$$$$$ |\$$$$$$\ \______|\$$$$$$\ \$$\$$ / $$ | \__|$$$$$$$$ |$$$$$$$$ |$$ | $$ | +$$ | $$ __$$ |$$ | $$ | \$$$ / $$ __$$ | \____$$\ \____$$\ \$$$ / $$ | $$ ____|$$ ____|$$ | $$ | +\$$$$$$$\\$$$$$$$ |$$ | $$ | \$ / \$$$$$$$ |$$$$$$$ | $$$$$$$ | \$ / $$ | \$$$$$$$\ \$$$$$$$\ $$ | $$ | + \_______|\_______|\__| \__| \_/ \_______|\_______/ \_______/ \_/ \__| \_______| \_______|\__| \__| + + + + + + + :: Spring Boot :: (v2.6.1.RELEASE) \ No newline at end of file diff --git a/system/src/main/resources/config/application-dev.yml b/system/src/main/resources/config/application-dev.yml index 01767cc..8f7efda 100644 --- a/system/src/main/resources/config/application-dev.yml +++ b/system/src/main/resources/config/application-dev.yml @@ -3,7 +3,7 @@ spring: druid: db-type: com.alibaba.druid.pool.DruidDataSource driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy - url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.99.207}:${DB_PORT:3306}/${DB_NAME:yxkadmin}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false + url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.99.207}:${DB_PORT:3306}/${DB_NAME:yxk_canvasscreen}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false username: ${DB_USER:root} password: ${DB_PWD:ftzn83560792} # 初始连接数 diff --git a/system/src/main/resources/config/application.yml b/system/src/main/resources/config/application.yml index 65b07b5..9c281d9 100644 --- a/system/src/main/resources/config/application.yml +++ b/system/src/main/resources/config/application.yml @@ -20,9 +20,6 @@ spring: properties: hibernate: ddl-auto: none - #dialect: org.hibernate.dialect.MySQL5InnoDBDialect - # naming: - # physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl open-in-view: true