diff --git a/pom.xml b/pom.xml index 61a09ee..9e8c473 100644 --- a/pom.xml +++ b/pom.xml @@ -9,8 +9,8 @@ - com.zhongzhi - zhongzhi + com.template + template 1.0 @@ -176,6 +176,18 @@ 2.0.0 + + com.itextpdf + itext-asian + ${itext-asian.version} + + + + com.itextpdf + itextpdf + ${itextpdf.version} + + diff --git a/src/main/java/com/zhongzhi/ZhongzhiApplication.java b/src/main/java/com/template/ZhongzhiApplication.java similarity index 84% rename from src/main/java/com/zhongzhi/ZhongzhiApplication.java rename to src/main/java/com/template/ZhongzhiApplication.java index b790a2a..a3546df 100644 --- a/src/main/java/com/zhongzhi/ZhongzhiApplication.java +++ b/src/main/java/com/template/ZhongzhiApplication.java @@ -1,4 +1,4 @@ -package com.zhongzhi; +package com.template; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; @@ -6,7 +6,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.web.bind.annotation.RestController; @RestController -@MapperScan(basePackages = {"com.zhongzhi.dao"}) +@MapperScan(basePackages = {"com.template.dao"}) @SpringBootApplication public class ZhongzhiApplication { diff --git a/src/main/java/com/zhongzhi/common/configure/AliyunSmsProperties.java b/src/main/java/com/template/common/configure/AliyunSmsProperties.java similarity index 94% rename from src/main/java/com/zhongzhi/common/configure/AliyunSmsProperties.java rename to src/main/java/com/template/common/configure/AliyunSmsProperties.java index 8bf4bc1..b2b33da 100644 --- a/src/main/java/com/zhongzhi/common/configure/AliyunSmsProperties.java +++ b/src/main/java/com/template/common/configure/AliyunSmsProperties.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/zhongzhi/common/configure/MybatisPlusConfig.java b/src/main/java/com/template/common/configure/MybatisPlusConfig.java similarity index 93% rename from src/main/java/com/zhongzhi/common/configure/MybatisPlusConfig.java rename to src/main/java/com/template/common/configure/MybatisPlusConfig.java index 4ca9b62..4b8ee72 100644 --- a/src/main/java/com/zhongzhi/common/configure/MybatisPlusConfig.java +++ b/src/main/java/com/template/common/configure/MybatisPlusConfig.java @@ -1,9 +1,9 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; -import com.zhongzhi.common.handler.MetaHandler; +import com.template.common.handler.MetaHandler; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/zhongzhi/common/configure/RemoteProperties.java b/src/main/java/com/template/common/configure/RemoteProperties.java similarity index 96% rename from src/main/java/com/zhongzhi/common/configure/RemoteProperties.java rename to src/main/java/com/template/common/configure/RemoteProperties.java index 46b5fa0..366bfe3 100644 --- a/src/main/java/com/zhongzhi/common/configure/RemoteProperties.java +++ b/src/main/java/com/template/common/configure/RemoteProperties.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.PropertySource; diff --git a/src/main/java/com/zhongzhi/common/configure/SecurityConfig.java b/src/main/java/com/template/common/configure/SecurityConfig.java similarity index 95% rename from src/main/java/com/zhongzhi/common/configure/SecurityConfig.java rename to src/main/java/com/template/common/configure/SecurityConfig.java index 1f8e08e..f6774e9 100644 --- a/src/main/java/com/zhongzhi/common/configure/SecurityConfig.java +++ b/src/main/java/com/template/common/configure/SecurityConfig.java @@ -1,8 +1,8 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; -import com.zhongzhi.common.interceptor.JwtAuthenticationEntryPoint; -import com.zhongzhi.common.interceptor.JwtAuthenticationTokenFilter; -import com.zhongzhi.common.utils.EncryptUtil; +import com.template.common.interceptor.JwtAuthenticationEntryPoint; +import com.template.common.interceptor.JwtAuthenticationTokenFilter; +import com.template.common.utils.EncryptUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/zhongzhi/common/configure/SwaggerConfig.java b/src/main/java/com/template/common/configure/SwaggerConfig.java similarity index 94% rename from src/main/java/com/zhongzhi/common/configure/SwaggerConfig.java rename to src/main/java/com/template/common/configure/SwaggerConfig.java index 6cd020d..88ad612 100644 --- a/src/main/java/com/zhongzhi/common/configure/SwaggerConfig.java +++ b/src/main/java/com/template/common/configure/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -26,7 +26,7 @@ public class SwaggerConfig { return new Docket(DocumentationType.SWAGGER_2) .pathMapping("/") .select() - .apis(RequestHandlerSelectors.basePackage("com.zhongzhi.controller")) + .apis(RequestHandlerSelectors.basePackage("com.template.controller")) .paths(PathSelectors.any()) .build() .apiInfo(new ApiInfoBuilder() diff --git a/src/main/java/com/zhongzhi/common/configure/VODConfig.java b/src/main/java/com/template/common/configure/VODConfig.java similarity index 94% rename from src/main/java/com/zhongzhi/common/configure/VODConfig.java rename to src/main/java/com/template/common/configure/VODConfig.java index aec1353..33e7ec6 100644 --- a/src/main/java/com/zhongzhi/common/configure/VODConfig.java +++ b/src/main/java/com/template/common/configure/VODConfig.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/zhongzhi/common/configure/WebConfig.java b/src/main/java/com/template/common/configure/WebConfig.java similarity index 97% rename from src/main/java/com/zhongzhi/common/configure/WebConfig.java rename to src/main/java/com/template/common/configure/WebConfig.java index 3c656ea..72f8213 100644 --- a/src/main/java/com/zhongzhi/common/configure/WebConfig.java +++ b/src/main/java/com/template/common/configure/WebConfig.java @@ -1,6 +1,6 @@ -package com.zhongzhi.common.configure; +package com.template.common.configure; -import com.zhongzhi.common.interceptor.AuthenticationInterceptor; +import com.template.common.interceptor.AuthenticationInterceptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/zhongzhi/common/constant/Code.java b/src/main/java/com/template/common/constant/Code.java similarity index 96% rename from src/main/java/com/zhongzhi/common/constant/Code.java rename to src/main/java/com/template/common/constant/Code.java index 69d55f2..0a1325e 100644 --- a/src/main/java/com/zhongzhi/common/constant/Code.java +++ b/src/main/java/com/template/common/constant/Code.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; import lombok.Getter; diff --git a/src/main/java/com/zhongzhi/common/constant/MemberType.java b/src/main/java/com/template/common/constant/MemberType.java similarity index 94% rename from src/main/java/com/zhongzhi/common/constant/MemberType.java rename to src/main/java/com/template/common/constant/MemberType.java index 62e4621..94a3bb7 100644 --- a/src/main/java/com/zhongzhi/common/constant/MemberType.java +++ b/src/main/java/com/template/common/constant/MemberType.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/constant/Platform.java b/src/main/java/com/template/common/constant/Platform.java similarity index 96% rename from src/main/java/com/zhongzhi/common/constant/Platform.java rename to src/main/java/com/template/common/constant/Platform.java index 00bcb93..5bfe0c2 100644 --- a/src/main/java/com/zhongzhi/common/constant/Platform.java +++ b/src/main/java/com/template/common/constant/Platform.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/constant/ProjectAssigned.java b/src/main/java/com/template/common/constant/ProjectAssigned.java similarity index 85% rename from src/main/java/com/zhongzhi/common/constant/ProjectAssigned.java rename to src/main/java/com/template/common/constant/ProjectAssigned.java index 7b8943d..bdd5105 100644 --- a/src/main/java/com/zhongzhi/common/constant/ProjectAssigned.java +++ b/src/main/java/com/template/common/constant/ProjectAssigned.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; import lombok.Data; diff --git a/src/main/java/com/zhongzhi/common/constant/ProjectReview.java b/src/main/java/com/template/common/constant/ProjectReview.java similarity index 95% rename from src/main/java/com/zhongzhi/common/constant/ProjectReview.java rename to src/main/java/com/template/common/constant/ProjectReview.java index b104abc..c399acd 100644 --- a/src/main/java/com/zhongzhi/common/constant/ProjectReview.java +++ b/src/main/java/com/template/common/constant/ProjectReview.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java b/src/main/java/com/template/common/constant/ProjectSchedule.java similarity index 95% rename from src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java rename to src/main/java/com/template/common/constant/ProjectSchedule.java index 008d8cf..d0d38e7 100644 --- a/src/main/java/com/zhongzhi/common/constant/ProjectSchedule.java +++ b/src/main/java/com/template/common/constant/ProjectSchedule.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/constant/ProjectStatus.java b/src/main/java/com/template/common/constant/ProjectStatus.java similarity index 95% rename from src/main/java/com/zhongzhi/common/constant/ProjectStatus.java rename to src/main/java/com/template/common/constant/ProjectStatus.java index e0622bd..ff95be7 100644 --- a/src/main/java/com/zhongzhi/common/constant/ProjectStatus.java +++ b/src/main/java/com/template/common/constant/ProjectStatus.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/constant/ProjectType.java b/src/main/java/com/template/common/constant/ProjectType.java similarity index 95% rename from src/main/java/com/zhongzhi/common/constant/ProjectType.java rename to src/main/java/com/template/common/constant/ProjectType.java index 8bd158b..52179bb 100644 --- a/src/main/java/com/zhongzhi/common/constant/ProjectType.java +++ b/src/main/java/com/template/common/constant/ProjectType.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/constant/SMSTemplate.java b/src/main/java/com/template/common/constant/SMSTemplate.java similarity index 95% rename from src/main/java/com/zhongzhi/common/constant/SMSTemplate.java rename to src/main/java/com/template/common/constant/SMSTemplate.java index bebf559..8f0c14c 100644 --- a/src/main/java/com/zhongzhi/common/constant/SMSTemplate.java +++ b/src/main/java/com/template/common/constant/SMSTemplate.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; public class SMSTemplate { diff --git a/src/main/java/com/zhongzhi/common/constant/SmsCode.java b/src/main/java/com/template/common/constant/SmsCode.java similarity index 95% rename from src/main/java/com/zhongzhi/common/constant/SmsCode.java rename to src/main/java/com/template/common/constant/SmsCode.java index b49a411..bf42b7b 100644 --- a/src/main/java/com/zhongzhi/common/constant/SmsCode.java +++ b/src/main/java/com/template/common/constant/SmsCode.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.constant; +package com.template.common.constant; /** *

diff --git a/src/main/java/com/zhongzhi/common/exception/GlobalExceptionHandler.java b/src/main/java/com/template/common/exception/GlobalExceptionHandler.java similarity index 95% rename from src/main/java/com/zhongzhi/common/exception/GlobalExceptionHandler.java rename to src/main/java/com/template/common/exception/GlobalExceptionHandler.java index d24ae00..a714f98 100644 --- a/src/main/java/com/zhongzhi/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/template/common/exception/GlobalExceptionHandler.java @@ -1,10 +1,10 @@ -package com.zhongzhi.common.exception; +package com.template.common.exception; import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.zhongzhi.common.configure.RemoteProperties; -import com.zhongzhi.common.constant.Code; -import com.zhongzhi.common.utils.ResponseData; -import com.zhongzhi.vo.ResponseVO; +import com.template.common.configure.RemoteProperties; +import com.template.common.constant.Code; +import com.template.common.utils.ResponseData; +import com.template.vo.ResponseVO; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; import org.springframework.http.converter.HttpMessageNotReadableException; diff --git a/src/main/java/com/zhongzhi/common/exception/HttpException.java b/src/main/java/com/template/common/exception/HttpException.java similarity index 94% rename from src/main/java/com/zhongzhi/common/exception/HttpException.java rename to src/main/java/com/template/common/exception/HttpException.java index b14bcc0..f187a44 100644 --- a/src/main/java/com/zhongzhi/common/exception/HttpException.java +++ b/src/main/java/com/template/common/exception/HttpException.java @@ -1,6 +1,6 @@ -package com.zhongzhi.common.exception; +package com.template.common.exception; -import com.zhongzhi.common.configure.RemoteProperties; +import com.template.common.configure.RemoteProperties; /** * 异常处理 diff --git a/src/main/java/com/zhongzhi/common/generator/CodeGenerator.java b/src/main/java/com/template/common/generator/CodeGenerator.java similarity index 98% rename from src/main/java/com/zhongzhi/common/generator/CodeGenerator.java rename to src/main/java/com/template/common/generator/CodeGenerator.java index 7f325fb..f9d269f 100644 --- a/src/main/java/com/zhongzhi/common/generator/CodeGenerator.java +++ b/src/main/java/com/template/common/generator/CodeGenerator.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.generator; +package com.template.common.generator; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.core.exceptions.MybatisPlusException; @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.generator.config.*; import com.baomidou.mybatisplus.generator.config.po.TableInfo; import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; import com.baomidou.mybatisplus.generator.engine.FreemarkerTemplateEngine; -import com.zhongzhi.model.base.BaseModel; +import com.template.model.base.BaseModel; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/zhongzhi/common/handler/MetaHandler.java b/src/main/java/com/template/common/handler/MetaHandler.java similarity index 95% rename from src/main/java/com/zhongzhi/common/handler/MetaHandler.java rename to src/main/java/com/template/common/handler/MetaHandler.java index 6dd207e..e700ba0 100644 --- a/src/main/java/com/zhongzhi/common/handler/MetaHandler.java +++ b/src/main/java/com/template/common/handler/MetaHandler.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.handler; +package com.template.common.handler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import org.apache.ibatis.reflection.MetaObject; diff --git a/src/main/java/com/zhongzhi/common/interceptor/AuthenticationInterceptor.java b/src/main/java/com/template/common/interceptor/AuthenticationInterceptor.java similarity index 91% rename from src/main/java/com/zhongzhi/common/interceptor/AuthenticationInterceptor.java rename to src/main/java/com/template/common/interceptor/AuthenticationInterceptor.java index 7c155de..7936864 100644 --- a/src/main/java/com/zhongzhi/common/interceptor/AuthenticationInterceptor.java +++ b/src/main/java/com/template/common/interceptor/AuthenticationInterceptor.java @@ -1,12 +1,12 @@ -package com.zhongzhi.common.interceptor; +package com.template.common.interceptor; import com.auth0.jwt.interfaces.Claim; -import com.zhongzhi.common.constant.Code; -import com.zhongzhi.common.constant.SmsCode; -import com.zhongzhi.common.exception.HttpException; -import com.zhongzhi.common.utils.JwtUtil; -import com.zhongzhi.common.utils.Localstorage; -import com.zhongzhi.common.utils.LoginRequired; +import com.template.common.constant.Code; +import com.template.common.constant.SmsCode; +import com.template.common.exception.HttpException; +import com.template.common.utils.JwtUtil; +import com.template.common.utils.Localstorage; +import com.template.common.utils.LoginRequired; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/zhongzhi/common/interceptor/JwtAuthenticationEntryPoint.java b/src/main/java/com/template/common/interceptor/JwtAuthenticationEntryPoint.java similarity index 88% rename from src/main/java/com/zhongzhi/common/interceptor/JwtAuthenticationEntryPoint.java rename to src/main/java/com/template/common/interceptor/JwtAuthenticationEntryPoint.java index 16ec3bb..e0cc0ba 100644 --- a/src/main/java/com/zhongzhi/common/interceptor/JwtAuthenticationEntryPoint.java +++ b/src/main/java/com/template/common/interceptor/JwtAuthenticationEntryPoint.java @@ -1,9 +1,9 @@ -package com.zhongzhi.common.interceptor; +package com.template.common.interceptor; import com.fasterxml.jackson.databind.ObjectMapper; -import com.zhongzhi.common.constant.Code; -import com.zhongzhi.common.utils.ResponseData; -import com.zhongzhi.vo.ResponseVO; +import com.template.common.constant.Code; +import com.template.common.utils.ResponseData; +import com.template.vo.ResponseVO; import org.springframework.security.core.AuthenticationException; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/zhongzhi/common/interceptor/JwtAuthenticationTokenFilter.java b/src/main/java/com/template/common/interceptor/JwtAuthenticationTokenFilter.java similarity index 87% rename from src/main/java/com/zhongzhi/common/interceptor/JwtAuthenticationTokenFilter.java rename to src/main/java/com/template/common/interceptor/JwtAuthenticationTokenFilter.java index 0a9d143..340ec1e 100644 --- a/src/main/java/com/zhongzhi/common/interceptor/JwtAuthenticationTokenFilter.java +++ b/src/main/java/com/template/common/interceptor/JwtAuthenticationTokenFilter.java @@ -1,14 +1,14 @@ -package com.zhongzhi.common.interceptor; +package com.template.common.interceptor; import com.auth0.jwt.interfaces.Claim; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.zhongzhi.common.constant.Code; -import com.zhongzhi.common.exception.HttpException; -import com.zhongzhi.common.utils.JwtUtil; -import com.zhongzhi.common.utils.Localstorage; -import com.zhongzhi.common.utils.ResponseData; -import com.zhongzhi.dao.UserMapper; -import com.zhongzhi.model.base.UserModel; +import com.template.common.constant.Code; +import com.template.common.exception.HttpException; +import com.template.common.utils.JwtUtil; +import com.template.common.utils.Localstorage; +import com.template.common.utils.ResponseData; +import com.template.dao.UserMapper; +import com.template.model.base.UserModel; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; diff --git a/src/main/java/com/zhongzhi/common/interceptor/RestAuthenticationAccessDeniedHandler.java b/src/main/java/com/template/common/interceptor/RestAuthenticationAccessDeniedHandler.java similarity index 88% rename from src/main/java/com/zhongzhi/common/interceptor/RestAuthenticationAccessDeniedHandler.java rename to src/main/java/com/template/common/interceptor/RestAuthenticationAccessDeniedHandler.java index 036720c..bd65051 100644 --- a/src/main/java/com/zhongzhi/common/interceptor/RestAuthenticationAccessDeniedHandler.java +++ b/src/main/java/com/template/common/interceptor/RestAuthenticationAccessDeniedHandler.java @@ -1,9 +1,9 @@ -package com.zhongzhi.common.interceptor; +package com.template.common.interceptor; import com.fasterxml.jackson.databind.ObjectMapper; -import com.zhongzhi.common.constant.Code; -import com.zhongzhi.common.utils.ResponseData; -import com.zhongzhi.vo.ResponseVO; +import com.template.common.constant.Code; +import com.template.common.utils.ResponseData; +import com.template.vo.ResponseVO; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.web.access.AccessDeniedHandler; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/zhongzhi/common/utils/AliyunSmsUtil.java b/src/main/java/com/template/common/utils/AliyunSmsUtil.java similarity index 96% rename from src/main/java/com/zhongzhi/common/utils/AliyunSmsUtil.java rename to src/main/java/com/template/common/utils/AliyunSmsUtil.java index 1d02343..eb2a419 100644 --- a/src/main/java/com/zhongzhi/common/utils/AliyunSmsUtil.java +++ b/src/main/java/com/template/common/utils/AliyunSmsUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -6,11 +6,11 @@ import com.aliyuncs.DefaultAcsClient; import com.aliyuncs.IAcsClient; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest; import com.aliyuncs.dysmsapi.model.v20170525.SendSmsResponse; -import com.zhongzhi.common.configure.AliyunSmsProperties; +import com.template.common.configure.AliyunSmsProperties; import com.aliyuncs.profile.DefaultProfile; import com.aliyuncs.profile.IClientProfile; -import com.zhongzhi.common.constant.SMSTemplate; -import com.zhongzhi.common.exception.HttpException; +import com.template.common.constant.SMSTemplate; +import com.template.common.exception.HttpException; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpEntity; diff --git a/src/main/java/com/zhongzhi/common/utils/ApplicationContextUtil.java b/src/main/java/com/template/common/utils/ApplicationContextUtil.java similarity index 95% rename from src/main/java/com/zhongzhi/common/utils/ApplicationContextUtil.java rename to src/main/java/com/template/common/utils/ApplicationContextUtil.java index ec96cc1..3c6d026 100644 --- a/src/main/java/com/zhongzhi/common/utils/ApplicationContextUtil.java +++ b/src/main/java/com/template/common/utils/ApplicationContextUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; diff --git a/src/main/java/com/zhongzhi/common/utils/DateFormatUtil.java b/src/main/java/com/template/common/utils/DateFormatUtil.java similarity index 99% rename from src/main/java/com/zhongzhi/common/utils/DateFormatUtil.java rename to src/main/java/com/template/common/utils/DateFormatUtil.java index 6d264b3..9d203d0 100644 --- a/src/main/java/com/zhongzhi/common/utils/DateFormatUtil.java +++ b/src/main/java/com/template/common/utils/DateFormatUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; diff --git a/src/main/java/com/zhongzhi/common/utils/EncryptUtil.java b/src/main/java/com/template/common/utils/EncryptUtil.java similarity index 97% rename from src/main/java/com/zhongzhi/common/utils/EncryptUtil.java rename to src/main/java/com/template/common/utils/EncryptUtil.java index 6664669..bc88aec 100644 --- a/src/main/java/com/zhongzhi/common/utils/EncryptUtil.java +++ b/src/main/java/com/template/common/utils/EncryptUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import com.amdelamar.jhash.Hash; import com.amdelamar.jhash.algorithms.Type; diff --git a/src/main/java/com/template/common/utils/EncryptionUtil.java b/src/main/java/com/template/common/utils/EncryptionUtil.java new file mode 100644 index 0000000..a484196 --- /dev/null +++ b/src/main/java/com/template/common/utils/EncryptionUtil.java @@ -0,0 +1,100 @@ +package com.template.common.utils; + +import javax.crypto.Cipher; +import javax.crypto.spec.IvParameterSpec; +import javax.crypto.spec.SecretKeySpec; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.Base64; +import java.util.Random; + +/** + * 敏感数据加密解密 + */ +public class EncryptionUtil { + + // AES加密 + public static String encrypt(String data, String key, String salt) throws Exception { + // 生成密钥 + byte[] keyBytes = generateKey(key, salt); + SecretKeySpec secretKeySpec = new SecretKeySpec(keyBytes, "AES"); + + // 初始化向量 + byte[] ivBytes = new byte[16]; + System.arraycopy(keyBytes, 0, ivBytes, 0, Math.min(keyBytes.length, ivBytes.length)); + IvParameterSpec ivParameterSpec = new IvParameterSpec(ivBytes); + + // 加密 + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec); + byte[] encryptedBytes = cipher.doFinal(data.getBytes(StandardCharsets.UTF_8)); + + // 返回Base64编码的密文 + return Base64.getEncoder().encodeToString(encryptedBytes); + } + + // AES解密 + public static String decrypt(String encryptedData, String key, String salt) throws Exception { + // 生成密钥 + byte[] keyBytes = generateKey(key, salt); + SecretKeySpec secretKeySpec = new SecretKeySpec(keyBytes, "AES"); + + // 初始化向量 + byte[] ivBytes = new byte[16]; + System.arraycopy(keyBytes, 0, ivBytes, 0, Math.min(keyBytes.length, ivBytes.length)); + IvParameterSpec ivParameterSpec = new IvParameterSpec(ivBytes); + + // 解密 + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec); + byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(encryptedData)); + + // 返回解密后的字符串 + return new String(decryptedBytes, StandardCharsets.UTF_8); + } + + // 生成密钥（加盐） + private static byte[] generateKey(String key, String salt) throws Exception { + MessageDigest sha = MessageDigest.getInstance("SHA-256"); + byte[] keyBytes = (key + salt).getBytes(StandardCharsets.UTF_8); + keyBytes = sha.digest(keyBytes); + return keyBytes; + } + + // 方法：生成指定长度的随机字符串 + public static String generateRandomString(int length) { + // 定义字符集（可以根据需要修改字符集） + String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + + // 创建一个随机数生成器 + Random random = new Random(); + StringBuilder sb = new StringBuilder(length); + + // 随机选择字符并拼接 + for (int i = 0; i < length; i++) { + int index = random.nextInt(characters.length()); + sb.append(characters.charAt(index)); + } + + return sb.toString(); + } + + public static void main(String[] args) { + try { + String data = "Hello, World!"; + String key = "youhehulian"; // 密钥 + String salt = generateRandomString(8); // 盐值 + System.out.println("salt:"+salt); + + // 加密 + String encryptedData = encrypt(data, key, salt); + System.out.println("Encrypted Data: " + encryptedData); + + // 解密 + String decryptedData = decrypt(encryptedData, key, salt); + System.out.println("Decrypted Data: " + decryptedData); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/src/main/java/com/zhongzhi/common/utils/ExcelColumn.java b/src/main/java/com/template/common/utils/ExcelColumn.java similarity index 88% rename from src/main/java/com/zhongzhi/common/utils/ExcelColumn.java rename to src/main/java/com/template/common/utils/ExcelColumn.java index 5c0a008..67d46a2 100644 --- a/src/main/java/com/zhongzhi/common/utils/ExcelColumn.java +++ b/src/main/java/com/template/common/utils/ExcelColumn.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import java.lang.annotation.*; diff --git a/src/main/java/com/zhongzhi/common/utils/ExcelUtil.java b/src/main/java/com/template/common/utils/ExcelUtil.java similarity index 98% rename from src/main/java/com/zhongzhi/common/utils/ExcelUtil.java rename to src/main/java/com/template/common/utils/ExcelUtil.java index c39092d..beb8890 100644 --- a/src/main/java/com/zhongzhi/common/utils/ExcelUtil.java +++ b/src/main/java/com/template/common/utils/ExcelUtil.java @@ -1,7 +1,7 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; -import com.zhongzhi.common.exception.HttpException; -import com.zhongzhi.vo.ExcelFieldVO; +import com.template.common.exception.HttpException; +import com.template.vo.ExcelFieldVO; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.poi.hssf.usermodel.HSSFCellStyle; diff --git a/src/main/java/com/zhongzhi/common/utils/IpAddressUtil.java b/src/main/java/com/template/common/utils/IpAddressUtil.java similarity index 97% rename from src/main/java/com/zhongzhi/common/utils/IpAddressUtil.java rename to src/main/java/com/template/common/utils/IpAddressUtil.java index 82dfea0..036a67a 100644 --- a/src/main/java/com/zhongzhi/common/utils/IpAddressUtil.java +++ b/src/main/java/com/template/common/utils/IpAddressUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import javax.servlet.http.HttpServletRequest; import java.net.InetAddress; diff --git a/src/main/java/com/zhongzhi/common/utils/JwtUtil.java b/src/main/java/com/template/common/utils/JwtUtil.java similarity index 95% rename from src/main/java/com/zhongzhi/common/utils/JwtUtil.java rename to src/main/java/com/template/common/utils/JwtUtil.java index e642445..8a9327e 100644 --- a/src/main/java/com/zhongzhi/common/utils/JwtUtil.java +++ b/src/main/java/com/template/common/utils/JwtUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import com.auth0.jwt.JWT; import com.auth0.jwt.JWTVerifier; @@ -19,9 +19,9 @@ import java.util.Map; */ public class JwtUtil { - private static final Long EXPIRE_TIME = 24 * 60 * 60 * 1000L; + private static final Long EXPIRE_TIME = 30 * 60 * 1000L; - private static final String SECRET = "PBKDF2SHA256:64000:18:24:N:GFHZ6Y0PTEUDYCJI3K6SOOXWYEKPOZED:WBWFJMX5DF252E0HR3BF3P/D"; + public static final String SECRET = "PBKDF2SHA256:64000:18:24:N:GFHZ6Y0PTEUDYCJI3K6SOOXWYEKPOZED:WBWFJMX5DF252E0HR3BF3P/D"; /** * 生成Token diff --git a/src/main/java/com/zhongzhi/common/utils/Localstorage.java b/src/main/java/com/template/common/utils/Localstorage.java similarity index 95% rename from src/main/java/com/zhongzhi/common/utils/Localstorage.java rename to src/main/java/com/template/common/utils/Localstorage.java index 2fe3696..74a8400 100644 --- a/src/main/java/com/zhongzhi/common/utils/Localstorage.java +++ b/src/main/java/com/template/common/utils/Localstorage.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/zhongzhi/common/utils/LoginRequired.java b/src/main/java/com/template/common/utils/LoginRequired.java similarity index 94% rename from src/main/java/com/zhongzhi/common/utils/LoginRequired.java rename to src/main/java/com/template/common/utils/LoginRequired.java index 79c2ca0..483385e 100644 --- a/src/main/java/com/zhongzhi/common/utils/LoginRequired.java +++ b/src/main/java/com/template/common/utils/LoginRequired.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import java.lang.annotation.*; diff --git a/src/main/java/com/zhongzhi/common/utils/RandomUtil.java b/src/main/java/com/template/common/utils/RandomUtil.java similarity index 98% rename from src/main/java/com/zhongzhi/common/utils/RandomUtil.java rename to src/main/java/com/template/common/utils/RandomUtil.java index fed1563..2e0d5f4 100644 --- a/src/main/java/com/zhongzhi/common/utils/RandomUtil.java +++ b/src/main/java/com/template/common/utils/RandomUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import java.util.Date; import java.util.Random; diff --git a/src/main/java/com/zhongzhi/common/utils/ResponseData.java b/src/main/java/com/template/common/utils/ResponseData.java similarity index 94% rename from src/main/java/com/zhongzhi/common/utils/ResponseData.java rename to src/main/java/com/template/common/utils/ResponseData.java index 2c8b207..5b83f0b 100644 --- a/src/main/java/com/zhongzhi/common/utils/ResponseData.java +++ b/src/main/java/com/template/common/utils/ResponseData.java @@ -1,7 +1,7 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; -import com.zhongzhi.common.configure.RemoteProperties; -import com.zhongzhi.vo.ResponseVO; +import com.template.common.configure.RemoteProperties; +import com.template.vo.ResponseVO; import lombok.Data; import org.springframework.boot.context.properties.EnableConfigurationProperties; diff --git a/src/main/java/com/zhongzhi/common/utils/Signature.java b/src/main/java/com/template/common/utils/Signature.java similarity index 98% rename from src/main/java/com/zhongzhi/common/utils/Signature.java rename to src/main/java/com/template/common/utils/Signature.java index 420d39b..31c1b16 100644 --- a/src/main/java/com/zhongzhi/common/utils/Signature.java +++ b/src/main/java/com/template/common/utils/Signature.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import sun.misc.BASE64Encoder; diff --git a/src/main/java/com/zhongzhi/common/utils/SysLog.java b/src/main/java/com/template/common/utils/SysLog.java similarity index 93% rename from src/main/java/com/zhongzhi/common/utils/SysLog.java rename to src/main/java/com/template/common/utils/SysLog.java index b04fc15..ac79ce1 100644 --- a/src/main/java/com/zhongzhi/common/utils/SysLog.java +++ b/src/main/java/com/template/common/utils/SysLog.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import java.lang.annotation.*; diff --git a/src/main/java/com/zhongzhi/common/utils/VodUtil.java b/src/main/java/com/template/common/utils/VodUtil.java similarity index 97% rename from src/main/java/com/zhongzhi/common/utils/VodUtil.java rename to src/main/java/com/template/common/utils/VodUtil.java index 9c61ea2..98ab293 100644 --- a/src/main/java/com/zhongzhi/common/utils/VodUtil.java +++ b/src/main/java/com/template/common/utils/VodUtil.java @@ -1,4 +1,4 @@ -package com.zhongzhi.common.utils; +package com.template.common.utils; import com.tencentcloudapi.common.Credential; import com.tencentcloudapi.common.exception.TencentCloudSDKException; @@ -6,8 +6,8 @@ import com.tencentcloudapi.common.profile.ClientProfile; import com.tencentcloudapi.common.profile.HttpProfile; import com.tencentcloudapi.vod.v20180717.VodClient; import com.tencentcloudapi.vod.v20180717.models.*; -import com.zhongzhi.common.configure.VODConfig; -import com.zhongzhi.common.exception.HttpException; +import com.template.common.configure.VODConfig; +import com.template.common.exception.HttpException; import org.springframework.stereotype.Component; /** diff --git a/src/main/java/com/zhongzhi/controller/AuthController.java b/src/main/java/com/template/controller/AuthController.java similarity index 83% rename from src/main/java/com/zhongzhi/controller/AuthController.java rename to src/main/java/com/template/controller/AuthController.java index 3be436d..0c39b06 100644 --- a/src/main/java/com/zhongzhi/controller/AuthController.java +++ b/src/main/java/com/template/controller/AuthController.java @@ -1,9 +1,9 @@ -package com.zhongzhi.controller; +package com.template.controller; -import com.zhongzhi.common.utils.ResponseData; -import com.zhongzhi.dto.UserDTO; -import com.zhongzhi.service.UserService; -import com.zhongzhi.vo.ResponseVO; +import com.template.common.utils.ResponseData; +import com.template.dto.UserDTO; +import com.template.service.UserService; +import com.template.vo.ResponseVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/zhongzhi/controller/OssController.java b/src/main/java/com/template/controller/OssController.java similarity index 96% rename from src/main/java/com/zhongzhi/controller/OssController.java rename to src/main/java/com/template/controller/OssController.java index 4a334d3..97385f0 100644 --- a/src/main/java/com/zhongzhi/controller/OssController.java +++ b/src/main/java/com/template/controller/OssController.java @@ -1,4 +1,4 @@ -package com.zhongzhi.controller; +package com.template.controller; import com.aliyun.oss.ClientException; @@ -6,10 +6,10 @@ import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.OSSException; import com.aliyun.oss.model.*; -import com.zhongzhi.common.utils.ResponseData; -import com.zhongzhi.vo.ResponseVO; -import com.zhongzhi.vo.oss.GetSecretVO; -import com.zhongzhi.vo.oss.UploadFileVO; +import com.template.common.utils.ResponseData; +import com.template.vo.ResponseVO; +import com.template.vo.oss.GetSecretVO; +import com.template.vo.oss.UploadFileVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/zhongzhi/dao/UserMapper.java b/src/main/java/com/template/dao/UserMapper.java similarity index 60% rename from src/main/java/com/zhongzhi/dao/UserMapper.java rename to src/main/java/com/template/dao/UserMapper.java index c59d671..3962d16 100644 --- a/src/main/java/com/zhongzhi/dao/UserMapper.java +++ b/src/main/java/com/template/dao/UserMapper.java @@ -1,7 +1,7 @@ -package com.zhongzhi.dao; +package com.template.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.zhongzhi.model.base.UserModel; +import com.template.model.base.UserModel; public interface UserMapper extends BaseMapper { diff --git a/src/main/java/com/zhongzhi/dto/UserDTO.java b/src/main/java/com/template/dto/UserDTO.java similarity index 85% rename from src/main/java/com/zhongzhi/dto/UserDTO.java rename to src/main/java/com/template/dto/UserDTO.java index 7ce1f3d..f16056d 100644 --- a/src/main/java/com/zhongzhi/dto/UserDTO.java +++ b/src/main/java/com/template/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.zhongzhi.dto; +package com.template.dto; import lombok.Data; diff --git a/src/main/java/com/zhongzhi/model/base/BaseModel.java b/src/main/java/com/template/model/base/BaseModel.java similarity index 93% rename from src/main/java/com/zhongzhi/model/base/BaseModel.java rename to src/main/java/com/template/model/base/BaseModel.java index 405a4d7..4b48e06 100644 --- a/src/main/java/com/zhongzhi/model/base/BaseModel.java +++ b/src/main/java/com/template/model/base/BaseModel.java @@ -1,4 +1,4 @@ -package com.zhongzhi.model.base; +package com.template.model.base; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldStrategy; @@ -31,5 +31,5 @@ public class BaseModel { */ @JsonIgnore @TableLogic - private LocalDateTime deleteTime; + private LocalDateTime deleteDate; } diff --git a/src/main/java/com/zhongzhi/model/base/UserModel.java b/src/main/java/com/template/model/base/UserModel.java similarity index 96% rename from src/main/java/com/zhongzhi/model/base/UserModel.java rename to src/main/java/com/template/model/base/UserModel.java index 8ca3c0e..9b84621 100644 --- a/src/main/java/com/zhongzhi/model/base/UserModel.java +++ b/src/main/java/com/template/model/base/UserModel.java @@ -1,4 +1,4 @@ -package com.zhongzhi.model.base; +package com.template.model.base; import lombok.Data; import org.springframework.security.core.GrantedAuthority; diff --git a/src/main/java/com/zhongzhi/service/UserService.java b/src/main/java/com/template/service/UserService.java similarity index 62% rename from src/main/java/com/zhongzhi/service/UserService.java rename to src/main/java/com/template/service/UserService.java index 04865b6..e40117c 100644 --- a/src/main/java/com/zhongzhi/service/UserService.java +++ b/src/main/java/com/template/service/UserService.java @@ -1,8 +1,8 @@ -package com.zhongzhi.service; +package com.template.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhongzhi.dto.UserDTO; -import com.zhongzhi.model.base.UserModel; +import com.template.dto.UserDTO; +import com.template.model.base.UserModel; public interface UserService extends IService { diff --git a/src/main/java/com/zhongzhi/service/impl/UserServiceImpl.java b/src/main/java/com/template/service/impl/UserServiceImpl.java similarity index 80% rename from src/main/java/com/zhongzhi/service/impl/UserServiceImpl.java rename to src/main/java/com/template/service/impl/UserServiceImpl.java index 6cae517..2377c24 100644 --- a/src/main/java/com/zhongzhi/service/impl/UserServiceImpl.java +++ b/src/main/java/com/template/service/impl/UserServiceImpl.java @@ -1,14 +1,15 @@ -package com.zhongzhi.service.impl; +package com.template.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.zhongzhi.common.constant.Code; -import com.zhongzhi.common.utils.JwtUtil; -import com.zhongzhi.common.utils.Localstorage; -import com.zhongzhi.dao.UserMapper; -import com.zhongzhi.dto.UserDTO; -import com.zhongzhi.model.base.UserModel; -import com.zhongzhi.service.UserService; +import com.template.common.constant.Code; +import com.template.common.utils.EncryptUtil; +import com.template.common.utils.JwtUtil; +import com.template.common.utils.Localstorage; +import com.template.dao.UserMapper; +import com.template.dto.UserDTO; +import com.template.model.base.UserModel; +import com.template.service.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -19,6 +20,8 @@ import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; +import java.util.Date; + @Service public class UserServiceImpl extends ServiceImpl implements UserService, UserDetailsService { @@ -46,7 +49,10 @@ public class UserServiceImpl extends ServiceImpl implemen Authentication authentication = authenticationManager.authenticate(upToken); SecurityContextHolder.getContext().setAuthentication(authentication); UserDetails userDetails = userDetailsService.loadUserByUsername(userDTO.getUsername()); + System.out.println("user======>"+Localstorage.getUser()); + Localstorage.remove(); String token = JwtUtil.generateToken(userDetails); + return token; } @@ -54,4 +60,8 @@ public class UserServiceImpl extends ServiceImpl implemen public void loginOut() { Localstorage.remove(); } + + public static void main(String[] args) { + System.out.println(EncryptUtil.encrypt("123456")); + } } diff --git a/src/main/java/com/zhongzhi/vo/ExcelFieldVO.java b/src/main/java/com/template/vo/ExcelFieldVO.java similarity index 85% rename from src/main/java/com/zhongzhi/vo/ExcelFieldVO.java rename to src/main/java/com/template/vo/ExcelFieldVO.java index bea28df..d6cef13 100644 --- a/src/main/java/com/zhongzhi/vo/ExcelFieldVO.java +++ b/src/main/java/com/template/vo/ExcelFieldVO.java @@ -1,4 +1,4 @@ -package com.zhongzhi.vo; +package com.template.vo; import lombok.Data; diff --git a/src/main/java/com/zhongzhi/vo/ResponseVO.java b/src/main/java/com/template/vo/ResponseVO.java similarity index 93% rename from src/main/java/com/zhongzhi/vo/ResponseVO.java rename to src/main/java/com/template/vo/ResponseVO.java index 6cbadd0..01d7fcf 100644 --- a/src/main/java/com/zhongzhi/vo/ResponseVO.java +++ b/src/main/java/com/template/vo/ResponseVO.java @@ -1,4 +1,4 @@ -package com.zhongzhi.vo; +package com.template.vo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/com/zhongzhi/vo/oss/GetSecretVO.java b/src/main/java/com/template/vo/oss/GetSecretVO.java similarity index 85% rename from src/main/java/com/zhongzhi/vo/oss/GetSecretVO.java rename to src/main/java/com/template/vo/oss/GetSecretVO.java index 686f8f3..b49d6bc 100644 --- a/src/main/java/com/zhongzhi/vo/oss/GetSecretVO.java +++ b/src/main/java/com/template/vo/oss/GetSecretVO.java @@ -1,4 +1,4 @@ -package com.zhongzhi.vo.oss; +package com.template.vo.oss; import lombok.Data; diff --git a/src/main/java/com/zhongzhi/vo/oss/UploadFileVO.java b/src/main/java/com/template/vo/oss/UploadFileVO.java similarity index 85% rename from src/main/java/com/zhongzhi/vo/oss/UploadFileVO.java rename to src/main/java/com/template/vo/oss/UploadFileVO.java index 92715f1..7302354 100644 --- a/src/main/java/com/zhongzhi/vo/oss/UploadFileVO.java +++ b/src/main/java/com/template/vo/oss/UploadFileVO.java @@ -1,4 +1,4 @@ -package com.zhongzhi.vo.oss; +package com.template.vo.oss; import lombok.Data; diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 118abba..7c9dddd 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,6 +1,6 @@ # 本地环境配置 # 端口号 -server.port=23507 +server.port=65000 # 数据源配置 # 数据源配置 spring.datasource.url=jdbc:mysql://139.224.253.21:3306/template?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 115947a..0efd114 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,25 +1,25 @@ -# 生产环境配置 -# 端口号 -server.port=23507 -server.tomcat.connection-timeout=600000 -# 数据源配置 -spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/lida?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai -spring.datasource.type=com.alibaba.druid.pool.DruidDataSource -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.username=ykadmin_new -spring.datasource.password=youkedb608@good -spring.datasource.druid.initialSize=5 -spring.datasource.druid.minIdle=5 -spring.datasource.druid.maxActive=20 -spring.datasource.druid.maxWait=600000 -spring.datasource.druid.timeBetweenEvictionRunsMillis=600000 -spring.datasource.druid.minEvictableIdleTimeMillis=300000 -spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL -spring.datasource.druid.testWhileIdle=true -spring.datasource.druid.testOnBorrow=false -spring.datasource.druid.testOnReturn=false -spring.datasource.druid.poolPreparedStatements=true -spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 -spring.datasource.druid.useGlobalDataSourceStat=true - -mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file +## 生产环境配置 +## 端口号 +#server.port=65000 +#server.tomcat.connection-timeout=600000 +## 数据源配置 +#spring.datasource.url=jdbc:mysql://rm-uf69w46mo6agw0ahao.mysql.rds.aliyuncs.com:3306/lida?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource +#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +#spring.datasource.username=ykadmin_new +#spring.datasource.password=youkedb608@good +#spring.datasource.druid.initialSize=5 +#spring.datasource.druid.minIdle=5 +#spring.datasource.druid.maxActive=20 +#spring.datasource.druid.maxWait=600000 +#spring.datasource.druid.timeBetweenEvictionRunsMillis=600000 +#spring.datasource.druid.minEvictableIdleTimeMillis=300000 +#spring.datasource.druid.validationQuery=SELECT 1 FROM DUAL +#spring.datasource.druid.testWhileIdle=true +#spring.datasource.druid.testOnBorrow=false +#spring.datasource.druid.testOnReturn=false +#spring.datasource.druid.poolPreparedStatements=true +#spring.datasource.druid.maxPoolPreparedStatementPerConnectionSize=20 +#spring.datasource.druid.useGlobalDataSourceStat=true +# +#mybatis-plus.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/src/main/resources/mybatis-generator.properties b/src/main/resources/mybatis-generator.properties index ef9b0bb..f030cc6 100644 --- a/src/main/resources/mybatis-generator.properties +++ b/src/main/resources/mybatis-generator.properties @@ -2,11 +2,11 @@ outputDir=/src/main/java/ author=DengMin # 父的包名 -setParent=com.zhongzhi +setParent=com.template # mapper.xml文件生成路径 mapperPath=/src/main/resources/mapper/ # 数据库地址 -url=jdbc:mysql://139.224.253.21:3306/gtja?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 +url=jdbc:mysql://139.224.253.21:3306/template?autoReconnect=true&useUnicode=true&characterEncoding=utf8&serverTimezone=GMT%2B8 driverName=com.mysql.cj.jdbc.Driver userName=root password=ykhladmin302 \ No newline at end of file