diff --git a/src/main/java/com/szxgl/vote2021/H52021Application.java b/src/main/java/com/szxgl/pars2021/H52021Application.java similarity index 93% rename from src/main/java/com/szxgl/vote2021/H52021Application.java rename to src/main/java/com/szxgl/pars2021/H52021Application.java index 01ed4a3..35f8eb4 100644 --- a/src/main/java/com/szxgl/vote2021/H52021Application.java +++ b/src/main/java/com/szxgl/pars2021/H52021Application.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021; +package com.szxgl.pars2021; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/szxgl/vote2021/ServletInitializer.java b/src/main/java/com/szxgl/pars2021/ServletInitializer.java similarity index 93% rename from src/main/java/com/szxgl/vote2021/ServletInitializer.java rename to src/main/java/com/szxgl/pars2021/ServletInitializer.java index 0da1b4a..205d1fe 100644 --- a/src/main/java/com/szxgl/vote2021/ServletInitializer.java +++ b/src/main/java/com/szxgl/pars2021/ServletInitializer.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021; +package com.szxgl.pars2021; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; diff --git a/src/main/java/com/szxgl/vote2021/config/InterceptorConfig.java b/src/main/java/com/szxgl/pars2021/config/InterceptorConfig.java similarity index 59% rename from src/main/java/com/szxgl/vote2021/config/InterceptorConfig.java rename to src/main/java/com/szxgl/pars2021/config/InterceptorConfig.java index d6e7ef2..a805a3b 100644 --- a/src/main/java/com/szxgl/vote2021/config/InterceptorConfig.java +++ b/src/main/java/com/szxgl/pars2021/config/InterceptorConfig.java @@ -1,9 +1,5 @@ -package com.szxgl.vote2021.config; +package com.szxgl.pars2021.config; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.InterceptorRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; //@Configuration //public class InterceptorConfig implements WebMvcConfigurer { // diff --git a/src/main/java/com/szxgl/vote2021/config/NorsInterceptor.java b/src/main/java/com/szxgl/pars2021/config/NorsInterceptor.java similarity index 74% rename from src/main/java/com/szxgl/vote2021/config/NorsInterceptor.java rename to src/main/java/com/szxgl/pars2021/config/NorsInterceptor.java index 4270258..b29eda1 100644 --- a/src/main/java/com/szxgl/vote2021/config/NorsInterceptor.java +++ b/src/main/java/com/szxgl/pars2021/config/NorsInterceptor.java @@ -1,12 +1,4 @@ -package com.szxgl.vote2021.config; - -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.web.servlet.HandlerInterceptor; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +package com.szxgl.pars2021.config; /** * 跨域拦截器的配置 @@ -29,4 +21,4 @@ import javax.servlet.http.HttpServletResponse; // // return true; // } -//} \ No newline at end of file +//} diff --git a/src/main/java/com/szxgl/vote2021/config/OssPropertiesConfiguration.java b/src/main/java/com/szxgl/pars2021/config/OssPropertiesConfiguration.java similarity index 97% rename from src/main/java/com/szxgl/vote2021/config/OssPropertiesConfiguration.java rename to src/main/java/com/szxgl/pars2021/config/OssPropertiesConfiguration.java index 370c0de..9186d1b 100644 --- a/src/main/java/com/szxgl/vote2021/config/OssPropertiesConfiguration.java +++ b/src/main/java/com/szxgl/pars2021/config/OssPropertiesConfiguration.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.config; +package com.szxgl.pars2021.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/szxgl/vote2021/config/RedisConfig.java b/src/main/java/com/szxgl/pars2021/config/RedisConfig.java similarity index 98% rename from src/main/java/com/szxgl/vote2021/config/RedisConfig.java rename to src/main/java/com/szxgl/pars2021/config/RedisConfig.java index 3ad7e2a..87a9420 100644 --- a/src/main/java/com/szxgl/vote2021/config/RedisConfig.java +++ b/src/main/java/com/szxgl/pars2021/config/RedisConfig.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.config; +package com.szxgl.pars2021.config; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; @@ -41,4 +41,4 @@ public class RedisConfig { template.afterPropertiesSet(); return template; } -} \ No newline at end of file +} diff --git a/src/main/java/com/szxgl/vote2021/controller/PraiseController.java b/src/main/java/com/szxgl/pars2021/controller/PraiseController.java similarity index 89% rename from src/main/java/com/szxgl/vote2021/controller/PraiseController.java rename to src/main/java/com/szxgl/pars2021/controller/PraiseController.java index 1af162a..0b31313 100644 --- a/src/main/java/com/szxgl/vote2021/controller/PraiseController.java +++ b/src/main/java/com/szxgl/pars2021/controller/PraiseController.java @@ -1,11 +1,10 @@ -package com.szxgl.vote2021.controller; +package com.szxgl.pars2021.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.szxgl.vote2021.entity.PraiseDao; -import com.szxgl.vote2021.entity.WorksDao; -import com.szxgl.vote2021.mapper.WorksMapper; -import com.szxgl.vote2021.service.PraiseService; -import com.szxgl.vote2021.utils.R; +import com.szxgl.pars2021.entity.WorksDao; +import com.szxgl.pars2021.mapper.WorksMapper; +import com.szxgl.pars2021.service.PraiseService; +import com.szxgl.pars2021.utils.R; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import java.util.Date; /** * 点赞 diff --git a/src/main/java/com/szxgl/vote2021/controller/RankingController.java b/src/main/java/com/szxgl/pars2021/controller/RankingController.java similarity index 94% rename from src/main/java/com/szxgl/vote2021/controller/RankingController.java rename to src/main/java/com/szxgl/pars2021/controller/RankingController.java index cd307b6..b0ea8cf 100644 --- a/src/main/java/com/szxgl/vote2021/controller/RankingController.java +++ b/src/main/java/com/szxgl/pars2021/controller/RankingController.java @@ -1,15 +1,13 @@ -package com.szxgl.vote2021.controller; +package com.szxgl.pars2021.controller; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WorksDao; -import com.szxgl.vote2021.mapper.WorksMapper; -import com.szxgl.vote2021.service.PraiseService; -import com.szxgl.vote2021.service.RankingService; -import com.szxgl.vote2021.service.UserService; -import com.szxgl.vote2021.service.WorksService; -import com.szxgl.vote2021.utils.R; -import com.szxgl.vote2021.utils.RedisUtil; +import com.szxgl.pars2021.entity.UserDO; +import com.szxgl.pars2021.entity.UserWorks; +import com.szxgl.pars2021.entity.WorksDao; +import com.szxgl.pars2021.service.PraiseService; +import com.szxgl.pars2021.service.UserService; +import com.szxgl.pars2021.service.WorksService; +import com.szxgl.pars2021.utils.R; +import com.szxgl.pars2021.utils.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/szxgl/vote2021/controller/SimpleTranscode.java b/src/main/java/com/szxgl/pars2021/controller/SimpleTranscode.java similarity index 95% rename from src/main/java/com/szxgl/vote2021/controller/SimpleTranscode.java rename to src/main/java/com/szxgl/pars2021/controller/SimpleTranscode.java index 3d90b4d..8c7c630 100644 --- a/src/main/java/com/szxgl/vote2021/controller/SimpleTranscode.java +++ b/src/main/java/com/szxgl/pars2021/controller/SimpleTranscode.java @@ -1,7 +1,6 @@ -package com.szxgl.vote2021.controller; +package com.szxgl.pars2021.controller; import java.io.File; -import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import com.alibaba.fastjson.JSONArray; @@ -12,9 +11,6 @@ import com.aliyuncs.IAcsClient; import com.aliyuncs.exceptions.ClientException; import com.aliyuncs.exceptions.ServerException; import com.aliyuncs.mts.model.v20140618.*; -import com.szxgl.vote2021.config.OssPropertiesConfiguration; -import com.szxgl.vote2021.utils.R; -import com.szxgl.vote2021.utils.UploadFileToOssUtil; /** * 转码 diff --git a/src/main/java/com/szxgl/vote2021/controller/VerificationCodeController.java b/src/main/java/com/szxgl/pars2021/controller/VerificationCodeController.java similarity index 83% rename from src/main/java/com/szxgl/vote2021/controller/VerificationCodeController.java rename to src/main/java/com/szxgl/pars2021/controller/VerificationCodeController.java index 9d7d9d5..386f5a0 100644 --- a/src/main/java/com/szxgl/vote2021/controller/VerificationCodeController.java +++ b/src/main/java/com/szxgl/pars2021/controller/VerificationCodeController.java @@ -1,19 +1,15 @@ -package com.szxgl.vote2021.controller; +package com.szxgl.pars2021.controller; -import com.szxgl.vote2021.utils.RedisUtil; -import com.szxgl.vote2021.utils.VerifyUtil; -import lombok.extern.java.Log; +import com.szxgl.pars2021.utils.RedisUtil; +import com.szxgl.pars2021.utils.VerifyUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; @Slf4j @RestController diff --git a/src/main/java/com/szxgl/vote2021/controller/WechatController.java b/src/main/java/com/szxgl/pars2021/controller/WechatController.java similarity index 95% rename from src/main/java/com/szxgl/vote2021/controller/WechatController.java rename to src/main/java/com/szxgl/pars2021/controller/WechatController.java index 19b36da..d0ae110 100644 --- a/src/main/java/com/szxgl/vote2021/controller/WechatController.java +++ b/src/main/java/com/szxgl/pars2021/controller/WechatController.java @@ -1,17 +1,15 @@ -package com.szxgl.vote2021.controller; +package com.szxgl.pars2021.controller; import com.alibaba.fastjson.JSONObject; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.WorksDao; -import com.szxgl.vote2021.service.UserService; -import com.szxgl.vote2021.utils.HttpClientUtil; -import com.szxgl.vote2021.utils.R; -import com.szxgl.vote2021.utils.RedisUtil; +import com.szxgl.pars2021.entity.UserDO; +import com.szxgl.pars2021.service.UserService; +import com.szxgl.pars2021.utils.HttpClientUtil; +import com.szxgl.pars2021.utils.R; +import com.szxgl.pars2021.utils.RedisUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import javax.servlet.http.Cookie; @@ -20,7 +18,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import java.util.UUID; @RestController @RequestMapping("/api/wechat") diff --git a/src/main/java/com/szxgl/vote2021/controller/WorksController.java b/src/main/java/com/szxgl/pars2021/controller/WorksController.java similarity index 91% rename from src/main/java/com/szxgl/vote2021/controller/WorksController.java rename to src/main/java/com/szxgl/pars2021/controller/WorksController.java index 8184791..60258a1 100644 --- a/src/main/java/com/szxgl/vote2021/controller/WorksController.java +++ b/src/main/java/com/szxgl/pars2021/controller/WorksController.java @@ -1,13 +1,12 @@ -package com.szxgl.vote2021.controller; +package com.szxgl.pars2021.controller; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WorksDao; -import com.szxgl.vote2021.service.UserService; -import com.szxgl.vote2021.service.WorksService; -import com.szxgl.vote2021.utils.R; -import com.szxgl.vote2021.utils.RedisUtil; -import com.szxgl.vote2021.utils.UploadFileToOssUtil; +import com.szxgl.pars2021.entity.UserDO; +import com.szxgl.pars2021.entity.WorksDao; +import com.szxgl.pars2021.service.UserService; +import com.szxgl.pars2021.service.WorksService; +import com.szxgl.pars2021.utils.R; +import com.szxgl.pars2021.utils.RedisUtil; +import com.szxgl.pars2021.utils.UploadFileToOssUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/java/com/szxgl/vote2021/entity/PraiseDao.java b/src/main/java/com/szxgl/pars2021/entity/PraiseDao.java similarity index 75% rename from src/main/java/com/szxgl/vote2021/entity/PraiseDao.java rename to src/main/java/com/szxgl/pars2021/entity/PraiseDao.java index ef49ce2..876b263 100644 --- a/src/main/java/com/szxgl/vote2021/entity/PraiseDao.java +++ b/src/main/java/com/szxgl/pars2021/entity/PraiseDao.java @@ -1,10 +1,8 @@ -package com.szxgl.vote2021.entity; +package com.szxgl.pars2021.entity; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.io.Serializable; import java.util.Date; @Data diff --git a/src/main/java/com/szxgl/vote2021/entity/UserDO.java b/src/main/java/com/szxgl/pars2021/entity/UserDO.java similarity index 84% rename from src/main/java/com/szxgl/vote2021/entity/UserDO.java rename to src/main/java/com/szxgl/pars2021/entity/UserDO.java index 7ed2a59..463f061 100644 --- a/src/main/java/com/szxgl/vote2021/entity/UserDO.java +++ b/src/main/java/com/szxgl/pars2021/entity/UserDO.java @@ -1,10 +1,8 @@ -package com.szxgl.vote2021.entity; +package com.szxgl.pars2021.entity; import com.baomidou.mybatisplus.annotation.TableName; -import com.szxgl.vote2021.utils.R; import lombok.Data; -import java.text.SimpleDateFormat; import java.util.Date; @Data diff --git a/src/main/java/com/szxgl/vote2021/entity/UserWorks.java b/src/main/java/com/szxgl/pars2021/entity/UserWorks.java similarity index 88% rename from src/main/java/com/szxgl/vote2021/entity/UserWorks.java rename to src/main/java/com/szxgl/pars2021/entity/UserWorks.java index a7967a9..1a348d0 100644 --- a/src/main/java/com/szxgl/vote2021/entity/UserWorks.java +++ b/src/main/java/com/szxgl/pars2021/entity/UserWorks.java @@ -1,8 +1,7 @@ -package com.szxgl.vote2021.entity; +package com.szxgl.pars2021.entity; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import reactor.util.annotation.Nullable; @Data public class UserWorks { diff --git a/src/main/java/com/szxgl/vote2021/entity/VoteStatistics.java b/src/main/java/com/szxgl/pars2021/entity/VoteStatistics.java similarity index 80% rename from src/main/java/com/szxgl/vote2021/entity/VoteStatistics.java rename to src/main/java/com/szxgl/pars2021/entity/VoteStatistics.java index 7c78b40..174eaee 100644 --- a/src/main/java/com/szxgl/vote2021/entity/VoteStatistics.java +++ b/src/main/java/com/szxgl/pars2021/entity/VoteStatistics.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.entity; +package com.szxgl.pars2021.entity; import lombok.Data; diff --git a/src/main/java/com/szxgl/vote2021/entity/WorksDao.java b/src/main/java/com/szxgl/pars2021/entity/WorksDao.java similarity index 91% rename from src/main/java/com/szxgl/vote2021/entity/WorksDao.java rename to src/main/java/com/szxgl/pars2021/entity/WorksDao.java index a7e20c1..2f9a9cd 100644 --- a/src/main/java/com/szxgl/vote2021/entity/WorksDao.java +++ b/src/main/java/com/szxgl/pars2021/entity/WorksDao.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.entity; +package com.szxgl.pars2021.entity; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/com/szxgl/vote2021/entity/WxMpUser.java b/src/main/java/com/szxgl/pars2021/entity/WxMpUser.java similarity index 97% rename from src/main/java/com/szxgl/vote2021/entity/WxMpUser.java rename to src/main/java/com/szxgl/pars2021/entity/WxMpUser.java index ecc9b6b..9c11a76 100644 --- a/src/main/java/com/szxgl/vote2021/entity/WxMpUser.java +++ b/src/main/java/com/szxgl/pars2021/entity/WxMpUser.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.entity; +package com.szxgl.pars2021.entity; import java.io.Serializable; @@ -13,58 +13,58 @@ public class WxMpUser implements Serializable { public WxMpUser(){ } - + public WxMpUser(String openId){ this.openid = openId; } - - + + /** * 授权用户唯一标识 */ private String openid; - + /** * 用户昵称 */ private String nickname; - + /** * 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 */ private String sex; - + /** * 用户个人资料填写的省份 */ private String province; - + /** * 普通用户个人资料填写的城市 */ private String city; - + /** * 国家，如中国为CN */ private String country; - + /** * 用户头像，最后一个数值代表正方形头像大小（有0、46、64、96、132数值可选，0代表640*640正方形头像），用户没有头像时该项为空。若用户更换头像，原有头像URL将失效。 */ private String headimgurl; - + /** * 用户特权信息，json数组，如微信沃卡用户为（chinaunicom） */ private String privilege; - + /** * 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 */ private String unionid; - + public String getOpenid() { return openid; } @@ -136,5 +136,5 @@ public class WxMpUser implements Serializable { public void setUnionid(String unionid) { this.unionid = unionid; } - + } diff --git a/src/main/java/com/szxgl/vote2021/exception/MyAjaxExceptionHandler.java b/src/main/java/com/szxgl/pars2021/exception/MyAjaxExceptionHandler.java similarity index 90% rename from src/main/java/com/szxgl/vote2021/exception/MyAjaxExceptionHandler.java rename to src/main/java/com/szxgl/pars2021/exception/MyAjaxExceptionHandler.java index 259f666..7514048 100644 --- a/src/main/java/com/szxgl/vote2021/exception/MyAjaxExceptionHandler.java +++ b/src/main/java/com/szxgl/pars2021/exception/MyAjaxExceptionHandler.java @@ -1,6 +1,6 @@ -package com.szxgl.vote2021.exception; +package com.szxgl.pars2021.exception; -import com.szxgl.vote2021.utils.R; +import com.szxgl.pars2021.utils.R; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; diff --git a/src/main/java/com/szxgl/vote2021/exception/ParameterException.java b/src/main/java/com/szxgl/pars2021/exception/ParameterException.java similarity index 78% rename from src/main/java/com/szxgl/vote2021/exception/ParameterException.java rename to src/main/java/com/szxgl/pars2021/exception/ParameterException.java index 518d19d..7602469 100644 --- a/src/main/java/com/szxgl/vote2021/exception/ParameterException.java +++ b/src/main/java/com/szxgl/pars2021/exception/ParameterException.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.exception; +package com.szxgl.pars2021.exception; public class ParameterException extends RuntimeException{ diff --git a/src/main/java/com/szxgl/vote2021/filter/WebAuthFilter.java b/src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java similarity index 88% rename from src/main/java/com/szxgl/vote2021/filter/WebAuthFilter.java rename to src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java index c7f61fd..df2d627 100644 --- a/src/main/java/com/szxgl/vote2021/filter/WebAuthFilter.java +++ b/src/main/java/com/szxgl/pars2021/filter/WebAuthFilter.java @@ -1,24 +1,4 @@ -package com.szxgl.vote2021.filter; - -import com.alibaba.fastjson.JSONObject; -import com.szxgl.vote2021.entity.WxMpUser; -import com.szxgl.vote2021.service.UserService; -import com.szxgl.vote2021.utils.URIUtil; -import com.szxgl.vote2021.utils.Utility; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.ApplicationContext; -import org.springframework.stereotype.Component; -import org.springframework.web.context.support.WebApplicationContextUtils; - -import javax.servlet.*; -import javax.servlet.annotation.WebFilter; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.*; -import java.net.HttpURLConnection; -import java.net.URL; +package com.szxgl.pars2021.filter; /** * 授权测试 diff --git a/src/main/java/com/szxgl/vote2021/mapper/PraiseMapper.java b/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper.java similarity index 68% rename from src/main/java/com/szxgl/vote2021/mapper/PraiseMapper.java rename to src/main/java/com/szxgl/pars2021/mapper/PraiseMapper.java index 9ae8254..f1f0d1d 100644 --- a/src/main/java/com/szxgl/vote2021/mapper/PraiseMapper.java +++ b/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper.java @@ -1,7 +1,7 @@ -package com.szxgl.vote2021.mapper; +package com.szxgl.pars2021.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.szxgl.vote2021.entity.PraiseDao; +import com.szxgl.pars2021.entity.PraiseDao; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/szxgl/vote2021/mapper/PraiseMapper2.java b/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java similarity index 88% rename from src/main/java/com/szxgl/vote2021/mapper/PraiseMapper2.java rename to src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java index f2c686e..427cc9a 100644 --- a/src/main/java/com/szxgl/vote2021/mapper/PraiseMapper2.java +++ b/src/main/java/com/szxgl/pars2021/mapper/PraiseMapper2.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.mapper; +package com.szxgl.pars2021.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/szxgl/vote2021/mapper/UserMapper.java b/src/main/java/com/szxgl/pars2021/mapper/UserMapper.java similarity index 58% rename from src/main/java/com/szxgl/vote2021/mapper/UserMapper.java rename to src/main/java/com/szxgl/pars2021/mapper/UserMapper.java index d6df0c1..d3410a8 100644 --- a/src/main/java/com/szxgl/vote2021/mapper/UserMapper.java +++ b/src/main/java/com/szxgl/pars2021/mapper/UserMapper.java @@ -1,8 +1,7 @@ -package com.szxgl.vote2021.mapper; +package com.szxgl.pars2021.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; +import com.szxgl.pars2021.entity.UserDO; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/szxgl/vote2021/mapper/UserMapper2.java b/src/main/java/com/szxgl/pars2021/mapper/UserMapper2.java similarity index 69% rename from src/main/java/com/szxgl/vote2021/mapper/UserMapper2.java rename to src/main/java/com/szxgl/pars2021/mapper/UserMapper2.java index 631f222..8614517 100644 --- a/src/main/java/com/szxgl/vote2021/mapper/UserMapper2.java +++ b/src/main/java/com/szxgl/pars2021/mapper/UserMapper2.java @@ -1,6 +1,6 @@ -package com.szxgl.vote2021.mapper; +package com.szxgl.pars2021.mapper; -import com.szxgl.vote2021.entity.UserWorks; +import com.szxgl.pars2021.entity.UserWorks; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/szxgl/vote2021/mapper/WorksMapper.java b/src/main/java/com/szxgl/pars2021/mapper/WorksMapper.java similarity index 54% rename from src/main/java/com/szxgl/vote2021/mapper/WorksMapper.java rename to src/main/java/com/szxgl/pars2021/mapper/WorksMapper.java index fa67e15..df7c0f1 100644 --- a/src/main/java/com/szxgl/vote2021/mapper/WorksMapper.java +++ b/src/main/java/com/szxgl/pars2021/mapper/WorksMapper.java @@ -1,12 +1,9 @@ -package com.szxgl.vote2021.mapper; +package com.szxgl.pars2021.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WorksDao; +import com.szxgl.pars2021.entity.WorksDao; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface WorksMapper extends BaseMapper { diff --git a/src/main/java/com/szxgl/vote2021/mapper/WorksMapper2.java b/src/main/java/com/szxgl/pars2021/mapper/WorksMapper2.java similarity index 71% rename from src/main/java/com/szxgl/vote2021/mapper/WorksMapper2.java rename to src/main/java/com/szxgl/pars2021/mapper/WorksMapper2.java index ae43c03..9b925fa 100644 --- a/src/main/java/com/szxgl/vote2021/mapper/WorksMapper2.java +++ b/src/main/java/com/szxgl/pars2021/mapper/WorksMapper2.java @@ -1,6 +1,6 @@ -package com.szxgl.vote2021.mapper; +package com.szxgl.pars2021.mapper; -import com.szxgl.vote2021.entity.UserWorks; +import com.szxgl.pars2021.entity.UserWorks; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/szxgl/vote2021/service/PraiseService.java b/src/main/java/com/szxgl/pars2021/service/PraiseService.java similarity index 80% rename from src/main/java/com/szxgl/vote2021/service/PraiseService.java rename to src/main/java/com/szxgl/pars2021/service/PraiseService.java index 6622ead..51f5413 100644 --- a/src/main/java/com/szxgl/vote2021/service/PraiseService.java +++ b/src/main/java/com/szxgl/pars2021/service/PraiseService.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.service; +package com.szxgl.pars2021.service; public interface PraiseService { diff --git a/src/main/java/com/szxgl/vote2021/service/RankingService.java b/src/main/java/com/szxgl/pars2021/service/RankingService.java similarity index 51% rename from src/main/java/com/szxgl/vote2021/service/RankingService.java rename to src/main/java/com/szxgl/pars2021/service/RankingService.java index 5a90557..de8b6e2 100644 --- a/src/main/java/com/szxgl/vote2021/service/RankingService.java +++ b/src/main/java/com/szxgl/pars2021/service/RankingService.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.service; +package com.szxgl.pars2021.service; public interface RankingService { diff --git a/src/main/java/com/szxgl/vote2021/service/UserService.java b/src/main/java/com/szxgl/pars2021/service/UserService.java similarity index 66% rename from src/main/java/com/szxgl/vote2021/service/UserService.java rename to src/main/java/com/szxgl/pars2021/service/UserService.java index 1d18eed..3b8bff7 100644 --- a/src/main/java/com/szxgl/vote2021/service/UserService.java +++ b/src/main/java/com/szxgl/pars2021/service/UserService.java @@ -1,8 +1,8 @@ -package com.szxgl.vote2021.service; +package com.szxgl.pars2021.service; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WxMpUser; +import com.szxgl.pars2021.entity.UserDO; +import com.szxgl.pars2021.entity.UserWorks; +import com.szxgl.pars2021.entity.WxMpUser; import java.util.List; diff --git a/src/main/java/com/szxgl/vote2021/service/WorksService.java b/src/main/java/com/szxgl/pars2021/service/WorksService.java similarity index 59% rename from src/main/java/com/szxgl/vote2021/service/WorksService.java rename to src/main/java/com/szxgl/pars2021/service/WorksService.java index 54143a8..b967360 100644 --- a/src/main/java/com/szxgl/vote2021/service/WorksService.java +++ b/src/main/java/com/szxgl/pars2021/service/WorksService.java @@ -1,7 +1,7 @@ -package com.szxgl.vote2021.service; +package com.szxgl.pars2021.service; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WorksDao; +import com.szxgl.pars2021.entity.UserWorks; +import com.szxgl.pars2021.entity.WorksDao; import java.util.List; diff --git a/src/main/java/com/szxgl/vote2021/service/WorksServiceImpl.java b/src/main/java/com/szxgl/pars2021/service/WorksServiceImpl.java similarity index 73% rename from src/main/java/com/szxgl/vote2021/service/WorksServiceImpl.java rename to src/main/java/com/szxgl/pars2021/service/WorksServiceImpl.java index 6fac8a7..e11e768 100644 --- a/src/main/java/com/szxgl/vote2021/service/WorksServiceImpl.java +++ b/src/main/java/com/szxgl/pars2021/service/WorksServiceImpl.java @@ -1,12 +1,10 @@ -package com.szxgl.vote2021.service; +package com.szxgl.pars2021.service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WorksDao; -import com.szxgl.vote2021.mapper.WorksMapper; -import com.szxgl.vote2021.mapper.WorksMapper2; -import com.szxgl.vote2021.utils.RedisUtil; +import com.szxgl.pars2021.entity.UserWorks; +import com.szxgl.pars2021.entity.WorksDao; +import com.szxgl.pars2021.mapper.WorksMapper; +import com.szxgl.pars2021.mapper.WorksMapper2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/szxgl/vote2021/service/impl/PraiseServiceImpl.java b/src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java similarity index 85% rename from src/main/java/com/szxgl/vote2021/service/impl/PraiseServiceImpl.java rename to src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java index 29b84aa..1b6fe7c 100644 --- a/src/main/java/com/szxgl/vote2021/service/impl/PraiseServiceImpl.java +++ b/src/main/java/com/szxgl/pars2021/service/impl/PraiseServiceImpl.java @@ -1,17 +1,15 @@ -package com.szxgl.vote2021.service.impl; +package com.szxgl.pars2021.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.szxgl.vote2021.entity.PraiseDao; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WorksDao; -import com.szxgl.vote2021.exception.ParameterException; -import com.szxgl.vote2021.mapper.PraiseMapper; -import com.szxgl.vote2021.mapper.PraiseMapper2; -import com.szxgl.vote2021.mapper.WorksMapper; -import com.szxgl.vote2021.mapper.WorksMapper2; -import com.szxgl.vote2021.service.PraiseService; -import com.szxgl.vote2021.utils.RedisUtil; +import com.szxgl.pars2021.entity.PraiseDao; +import com.szxgl.pars2021.entity.WorksDao; +import com.szxgl.pars2021.exception.ParameterException; +import com.szxgl.pars2021.mapper.PraiseMapper; +import com.szxgl.pars2021.mapper.PraiseMapper2; +import com.szxgl.pars2021.mapper.WorksMapper; +import com.szxgl.pars2021.mapper.WorksMapper2; +import com.szxgl.pars2021.service.PraiseService; +import com.szxgl.pars2021.utils.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/szxgl/vote2021/service/impl/RankingServiceImpl.java b/src/main/java/com/szxgl/pars2021/service/impl/RankingServiceImpl.java similarity index 63% rename from src/main/java/com/szxgl/vote2021/service/impl/RankingServiceImpl.java rename to src/main/java/com/szxgl/pars2021/service/impl/RankingServiceImpl.java index ae97d9c..e312db6 100644 --- a/src/main/java/com/szxgl/vote2021/service/impl/RankingServiceImpl.java +++ b/src/main/java/com/szxgl/pars2021/service/impl/RankingServiceImpl.java @@ -1,7 +1,7 @@ -package com.szxgl.vote2021.service.impl; +package com.szxgl.pars2021.service.impl; -import com.szxgl.vote2021.service.RankingService; -import com.szxgl.vote2021.utils.RedisUtil; +import com.szxgl.pars2021.service.RankingService; +import com.szxgl.pars2021.utils.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/szxgl/vote2021/service/impl/UserServiceImpl.java b/src/main/java/com/szxgl/pars2021/service/impl/UserServiceImpl.java similarity index 89% rename from src/main/java/com/szxgl/vote2021/service/impl/UserServiceImpl.java rename to src/main/java/com/szxgl/pars2021/service/impl/UserServiceImpl.java index 4858b51..6f8e386 100644 --- a/src/main/java/com/szxgl/vote2021/service/impl/UserServiceImpl.java +++ b/src/main/java/com/szxgl/pars2021/service/impl/UserServiceImpl.java @@ -1,18 +1,17 @@ -package com.szxgl.vote2021.service.impl; +package com.szxgl.pars2021.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.szxgl.vote2021.entity.UserDO; -import com.szxgl.vote2021.entity.UserWorks; -import com.szxgl.vote2021.entity.WxMpUser; -import com.szxgl.vote2021.mapper.UserMapper; -import com.szxgl.vote2021.mapper.UserMapper2; -import com.szxgl.vote2021.service.UserService; -import com.szxgl.vote2021.utils.RedisUtil; +import com.szxgl.pars2021.entity.UserDO; +import com.szxgl.pars2021.entity.UserWorks; +import com.szxgl.pars2021.entity.WxMpUser; +import com.szxgl.pars2021.mapper.UserMapper; +import com.szxgl.pars2021.mapper.UserMapper2; +import com.szxgl.pars2021.service.UserService; +import com.szxgl.pars2021.utils.RedisUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import javax.servlet.http.Cookie; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/szxgl/vote2021/utils/BCrypt.java b/src/main/java/com/szxgl/pars2021/utils/BCrypt.java similarity index 99% rename from src/main/java/com/szxgl/vote2021/utils/BCrypt.java rename to src/main/java/com/szxgl/pars2021/utils/BCrypt.java index fa56491..f06444c 100644 --- a/src/main/java/com/szxgl/vote2021/utils/BCrypt.java +++ b/src/main/java/com/szxgl/pars2021/utils/BCrypt.java @@ -12,7 +12,7 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import java.io.UnsupportedEncodingException; import java.security.SecureRandom; diff --git a/src/main/java/com/szxgl/vote2021/utils/FileUpLoad.java b/src/main/java/com/szxgl/pars2021/utils/FileUpLoad.java similarity index 98% rename from src/main/java/com/szxgl/vote2021/utils/FileUpLoad.java rename to src/main/java/com/szxgl/pars2021/utils/FileUpLoad.java index 9362b0b..00f02be 100644 --- a/src/main/java/com/szxgl/vote2021/utils/FileUpLoad.java +++ b/src/main/java/com/szxgl/pars2021/utils/FileUpLoad.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import org.apache.commons.io.IOUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/szxgl/vote2021/utils/HttpClientUtil.java b/src/main/java/com/szxgl/pars2021/utils/HttpClientUtil.java similarity index 99% rename from src/main/java/com/szxgl/vote2021/utils/HttpClientUtil.java rename to src/main/java/com/szxgl/pars2021/utils/HttpClientUtil.java index 3dd8c71..2ccb81e 100644 --- a/src/main/java/com/szxgl/vote2021/utils/HttpClientUtil.java +++ b/src/main/java/com/szxgl/pars2021/utils/HttpClientUtil.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import com.alibaba.fastjson.JSONObject; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/szxgl/vote2021/utils/R.java b/src/main/java/com/szxgl/pars2021/utils/R.java similarity index 96% rename from src/main/java/com/szxgl/vote2021/utils/R.java rename to src/main/java/com/szxgl/pars2021/utils/R.java index 94c6bdb..b139441 100644 --- a/src/main/java/com/szxgl/vote2021/utils/R.java +++ b/src/main/java/com/szxgl/pars2021/utils/R.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/szxgl/vote2021/utils/RedisUtil.java b/src/main/java/com/szxgl/pars2021/utils/RedisUtil.java similarity index 99% rename from src/main/java/com/szxgl/vote2021/utils/RedisUtil.java rename to src/main/java/com/szxgl/pars2021/utils/RedisUtil.java index 423f473..00bff9d 100644 --- a/src/main/java/com/szxgl/vote2021/utils/RedisUtil.java +++ b/src/main/java/com/szxgl/pars2021/utils/RedisUtil.java @@ -1,7 +1,6 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.BoundZSetOperations; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ZSetOperations; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/szxgl/vote2021/utils/URIUtil.java b/src/main/java/com/szxgl/pars2021/utils/URIUtil.java similarity index 97% rename from src/main/java/com/szxgl/vote2021/utils/URIUtil.java rename to src/main/java/com/szxgl/pars2021/utils/URIUtil.java index c15f1eb..da1c204 100644 --- a/src/main/java/com/szxgl/vote2021/utils/URIUtil.java +++ b/src/main/java/com/szxgl/pars2021/utils/URIUtil.java @@ -3,7 +3,7 @@ // (powered by FernFlower decompiler) // -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/szxgl/vote2021/utils/UploadFileToOssUtil.java b/src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java similarity index 93% rename from src/main/java/com/szxgl/vote2021/utils/UploadFileToOssUtil.java rename to src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java index dd715a2..b9f70c1 100644 --- a/src/main/java/com/szxgl/vote2021/utils/UploadFileToOssUtil.java +++ b/src/main/java/com/szxgl/pars2021/utils/UploadFileToOssUtil.java @@ -1,21 +1,13 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; -import com.alibaba.fastjson.JSONObject; import com.aliyun.oss.OSS; import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.common.comm.ResponseMessage; import com.aliyun.oss.model.PutObjectResult; -import org.apache.http.protocol.HTTP; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; -import java.util.Random; import java.util.UUID; public class UploadFileToOssUtil { diff --git a/src/main/java/com/szxgl/vote2021/utils/Utility.java b/src/main/java/com/szxgl/pars2021/utils/Utility.java similarity index 99% rename from src/main/java/com/szxgl/vote2021/utils/Utility.java rename to src/main/java/com/szxgl/pars2021/utils/Utility.java index cf40126..d7beb02 100644 --- a/src/main/java/com/szxgl/vote2021/utils/Utility.java +++ b/src/main/java/com/szxgl/pars2021/utils/Utility.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.UnixCrypt; diff --git a/src/main/java/com/szxgl/vote2021/utils/VerifyUtil.java b/src/main/java/com/szxgl/pars2021/utils/VerifyUtil.java similarity index 99% rename from src/main/java/com/szxgl/vote2021/utils/VerifyUtil.java rename to src/main/java/com/szxgl/pars2021/utils/VerifyUtil.java index d8fe991..73a81bf 100644 --- a/src/main/java/com/szxgl/vote2021/utils/VerifyUtil.java +++ b/src/main/java/com/szxgl/pars2021/utils/VerifyUtil.java @@ -1,4 +1,4 @@ -package com.szxgl.vote2021.utils; +package com.szxgl.pars2021.utils; import javax.imageio.ImageIO; import javax.servlet.http.HttpServletRequest; diff --git a/src/main/resources/mapper/PraiseMapper2.xml b/src/main/resources/mapper/PraiseMapper2.xml index bb891b4..db12f60 100644 --- a/src/main/resources/mapper/PraiseMapper2.xml +++ b/src/main/resources/mapper/PraiseMapper2.xml @@ -1,6 +1,6 @@ - + + +