diff --git a/pom.xml b/pom.xml index b992be06..6369e8da 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ co.yixiang yshop pom - 3.2 + 3.3 yshop-common @@ -28,18 +28,17 @@ org.springframework.boot spring-boot-starter-parent - 2.4.13 + 2.7.2 - 1.2.11 UTF-8 UTF-8 1.8 3.3.0 3.0.0 1.2.83 - 1.2.9 + 1.2.11 5.5.7 4.1.2 2.5.0 @@ -50,9 +49,9 @@ 2.11.0 1 1.6.2 - 1.20 - 6.1.6.Final - 2.8.0 + 1.21 + 6.1.7.Final + 2.8.9 @@ -60,12 +59,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-logging - - org.springframework.boot @@ -73,43 +66,6 @@ test - - org.springframework.boot - spring-boot-starter-logging - - - org.apache.logging.log4j - log4j-api - - - org.apache.logging.log4j - log4j-to-slf4j - - - ch.gos.logback - logback-classic - - - - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-core - - - - - - ch.qos.logback - logback-core - ${logback.version} - - org.hibernate.validator hibernate-validator @@ -128,32 +84,20 @@ org.springframework.boot spring-boot-starter-data-redis - - - io.lettuce - lettuce-core - - - - - - redis.clients - jedis - ${jedis.version} - - org.apache.commons - commons-pool2 - ${commons-pool2.version} - - - org.apache.commons - commons-lang3 - + + + + + + + + + @@ -191,6 +135,22 @@ com.github.xiaoymin knife4j-spring-boot-starter ${github-xiaoymin.version} + + + io.swagger + swagger-models + + + io.swagger + swagger-annotations + + + + + io.swagger + swagger-models + ${swagger-models.version} + compile @@ -219,22 +179,22 @@ ${hutool.version} - - org.apache.poi - poi - ${poi.version} - + + + + + org.apache.poi poi-ooxml ${poi.version} - - xerces - xercesImpl - ${xerces.version} - + + + + + @@ -243,22 +203,22 @@ ${fastjson.version} - - org.mapstruct - mapstruct-jdk8 - ${mapstruct.version} - - - org.mapstruct - mapstruct-processor - ${mapstruct.version} - provided - - - javax.inject - javax.inject - 1 - + + + + + + + + + + + + + + + + com.github.whvcse easy-captcha diff --git a/shell/start.sh b/shell/start.sh index 9ed76c25..abaae587 100644 --- a/shell/start.sh +++ b/shell/start.sh @@ -1 +1 @@ -nohup java -jar yshop-app-3.2.jar --spring.profiles.active=prod & +nohup java -jar yshop-app-3.3.jar --spring.profiles.active=prod & diff --git a/shell/stop.sh b/shell/stop.sh index 3a823cb8..48a48f00 100644 --- a/shell/stop.sh +++ b/shell/stop.sh @@ -1,4 +1,4 @@ -PID=$(ps -ef | grep yshop-app-3.2.jar | grep -v grep | awk '{ print $2 }') +PID=$(ps -ef | grep yshop-app-3.3.jar | grep -v grep | awk '{ print $2 }') if [ -z "$PID" ];then echo Application is already stopped else diff --git a/yshop-admin/Dockerfile b/yshop-admin/Dockerfile index f8c3fa66..97825725 100644 --- a/yshop-admin/Dockerfile +++ b/yshop-admin/Dockerfile @@ -13,6 +13,6 @@ WORKDIR /yshop-admin EXPOSE 8001 -ADD ./target/yshop-admin-3.2.jar ./ +ADD ./target/yshop-admin-3.3.jar ./ -CMD java $JAVA_OPTS -jar yshop-admin-3.2.jar --spring.profiles.active=docker +CMD java $JAVA_OPTS -jar yshop-admin-3.3.jar --spring.profiles.active=docker diff --git a/yshop-admin/pom.xml b/yshop-admin/pom.xml index 221cc10e..af2e5320 100644 --- a/yshop-admin/pom.xml +++ b/yshop-admin/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -21,7 +21,7 @@ co.yixiang yshop-generator - 3.2 + 3.3 co.yixiang @@ -32,7 +32,7 @@ co.yixiang yshop-shop - 3.2 + 3.3 org.springframework.boot @@ -64,14 +64,14 @@ - org.quartz-scheduler - quartz + org.springframework.boot + spring-boot-starter-quartz co.yixiang yshop-weixin - 3.2 + 3.3 org.springframework.boot diff --git a/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java b/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java index c089a24c..5804907d 100644 --- a/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java +++ b/yshop-admin/src/main/java/co/yixiang/config/MybatisPlusConfig.java @@ -1,7 +1,9 @@ package co.yixiang.config; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -16,7 +18,9 @@ public class MybatisPlusConfig { * mybatis-plus分页插件 */ @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; } } diff --git a/yshop-admin/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java b/yshop-admin/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java index 3efbcfbb..3833f2c8 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/monitor/rest/RedisController.java @@ -1,6 +1,6 @@ package co.yixiang.modules.monitor.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.monitor.domain.vo.RedisVo; import co.yixiang.modules.monitor.service.RedisService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java index 4d076dfd..b3c30f62 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/monitor/service/impl/VisitsServiceImpl.java @@ -1,7 +1,7 @@ package co.yixiang.modules.monitor.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.logging.service.mapper.LogMapper; +import co.yixiang.modules.logging.service.mapper.LogMapper; import co.yixiang.modules.monitor.domain.Visits; import co.yixiang.modules.monitor.service.VisitsService; import co.yixiang.modules.monitor.service.mapper.VisitsMapper; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java b/yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java index cf5c1776..191b4279 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/quartz/rest/QuartzJobController.java @@ -7,7 +7,7 @@ package co.yixiang.modules.quartz.rest; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.quartz.domain.QuartzJob; import co.yixiang.modules.quartz.service.QuartzJobService; @@ -17,7 +17,6 @@ import co.yixiang.modules.quartz.service.dto.QuartzJobQueryCriteria; import co.yixiang.modules.quartz.service.dto.QuartzLogDto; import co.yixiang.modules.quartz.service.dto.QuartzLogQueryCriteria; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java index 26a711fb..10ad06da 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/security/config/SecurityConfig.java @@ -17,11 +17,11 @@ import org.springframework.http.HttpMethod; import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.config.core.GrantedAuthorityDefaults; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.filter.CorsFilter; import org.springframework.web.method.HandlerMethod; @@ -38,7 +38,7 @@ import java.util.Set; @Configuration(proxyBeanMethods = false) @EnableWebSecurity @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true) -public class SecurityConfig extends WebSecurityConfigurerAdapter { +public class SecurityConfig { private final TokenUtil tokenUtil; private final CorsFilter corsFilter; @@ -66,8 +66,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { return new BCryptPasswordEncoder(); } - @Override - protected void configure(HttpSecurity httpSecurity) throws Exception { + @Bean + SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { // 搜寻匿名标记 url： @AnonymousAccess Map handlerMethodMap = applicationContext.getBean(RequestMappingHandlerMapping.class).getHandlerMethods(); Set anonymousUrls = new HashSet<>(); @@ -78,7 +78,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { anonymousUrls.addAll(infoEntry.getKey().getPatternsCondition().getPatterns()); } } - httpSecurity + return httpSecurity // 禁用 CSRF .csrf().disable() .addFilterBefore(corsFilter, UsernamePasswordAuthenticationFilter.class) @@ -130,7 +130,9 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers(anonymousUrls.toArray(new String[0])).permitAll() // 所有请求都需要认证 .anyRequest().authenticated() - .and().apply(securityConfigurerAdapter()); + .and().apply(securityConfigurerAdapter()) + .and() + .build(); } private TokenConfigurer securityConfigurerAdapter() { diff --git a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java index 71919548..70df412c 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/AuthController.java @@ -9,7 +9,7 @@ import cn.hutool.crypto.asymmetric.KeyType; import cn.hutool.crypto.asymmetric.RSA; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.security.config.SecurityProperties; import co.yixiang.modules.security.security.TokenUtil; import co.yixiang.modules.security.security.vo.AuthUser; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java index f9e66bb1..9dd4c453 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/security/rest/OnlineController.java @@ -5,7 +5,7 @@ */ package co.yixiang.modules.security.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.security.service.OnlineUserService; import io.swagger.annotations.Api; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java index 3806018b..51c7341f 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DeptController.java @@ -9,7 +9,7 @@ import cn.hutool.core.collection.CollectionUtil; import co.yixiang.config.DataScope; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.system.domain.Dept; import co.yixiang.modules.system.service.DeptService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java index 8f192840..56dcc127 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictController.java @@ -7,7 +7,7 @@ package co.yixiang.modules.system.rest; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.dict.domain.Dict; import co.yixiang.modules.dict.service.DictService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java index a9dc7627..646dea1c 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/DictDetailController.java @@ -6,7 +6,7 @@ package co.yixiang.modules.system.rest; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.dict.domain.DictDetail; import co.yixiang.modules.dict.service.DictDetailService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/JobController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/JobController.java index 73dc26c0..55703e55 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/JobController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/JobController.java @@ -8,7 +8,7 @@ package co.yixiang.modules.system.rest; import co.yixiang.config.DataScope; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.system.domain.Job; import co.yixiang.modules.system.service.JobService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/MenuController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/MenuController.java index d53731db..da3c8a3f 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/MenuController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/MenuController.java @@ -7,7 +7,7 @@ package co.yixiang.modules.system.rest; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.system.domain.Menu; import co.yixiang.modules.system.service.MenuService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/RoleController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/RoleController.java index e869472b..688962bc 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/RoleController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/RoleController.java @@ -8,7 +8,7 @@ package co.yixiang.modules.system.rest; import cn.hutool.core.lang.Dict; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.system.domain.Role; import co.yixiang.modules.system.service.RoleService; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java index b9c301c0..e388edcf 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/rest/SysUserController.java @@ -11,7 +11,7 @@ import co.yixiang.config.DataScope; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.system.domain.User; import co.yixiang.modules.system.domain.vo.UserPassVo; @@ -21,8 +21,8 @@ import co.yixiang.modules.system.service.UserService; import co.yixiang.modules.system.service.dto.RoleSmallDto; import co.yixiang.modules.system.service.dto.UserDto; import co.yixiang.modules.system.service.dto.UserQueryCriteria; -import co.yixiang.tools.domain.VerificationCode; -import co.yixiang.tools.service.VerificationCodeService; +import co.yixiang.modules.tools.domain.VerificationCode; +import co.yixiang.modules.tools.service.VerificationCodeService; import co.yixiang.utils.PageUtil; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.YshopConstant; diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java index c8518ee5..ffa2b9bf 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java @@ -166,8 +166,8 @@ public class DeptServiceImpl extends BaseServiceImpl implement */ @Override public void delDepts(List deptIds){ - int jobCount = jobMapper.selectCount(Wrappers.lambdaQuery().in(Job::getDeptId,deptIds)); - int roleCount = rolesDeptsMapper.selectCount(Wrappers.lambdaQuery() + Long jobCount = jobMapper.selectCount(Wrappers.lambdaQuery().in(Job::getDeptId,deptIds)); + Long roleCount = rolesDeptsMapper.selectCount(Wrappers.lambdaQuery() .in(RolesDepts::getDeptId,deptIds)); if(jobCount > 0) { throw new BadRequestException( "所选部门中存在与岗位关联，请取消关联后再试"); diff --git a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java index b0f9d23e..486efffc 100644 --- a/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java +++ b/yshop-admin/src/main/java/co/yixiang/modules/system/service/impl/MenuServiceImpl.java @@ -313,8 +313,8 @@ public class MenuServiceImpl extends BaseServiceImpl implement throw new EntityExistException(Menu.class,"name",resources.getName()); } - if(StringUtils.isNotBlank(resources.getComponentName())&&resources.getType()!=1&& !resources.getIFrame()){ - int menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count(); + if (StringUtils.isNotBlank(resources.getComponentName()) && resources.getType() != 1 && !resources.getIFrame()) { + Long menuCount = this.lambdaQuery().eq(Menu::getComponentName,resources.getComponentName()).count(); if(menuCount > 1) { throw new YshopException("请保持菜单组件名称唯一"); } diff --git a/yshop-admin/src/main/resources/config/application-dev.yml b/yshop-admin/src/main/resources/config/application-dev.yml index de875921..f6abea01 100644 --- a/yshop-admin/src/main/resources/config/application-dev.yml +++ b/yshop-admin/src/main/resources/config/application-dev.yml @@ -87,7 +87,7 @@ swagger: enabled: true title: yshop商城管理后台API serverUrl: - version: 3.2 + version: 3.3 # 文件存储路径 file: diff --git a/yshop-admin/src/main/resources/config/application-docker.yml b/yshop-admin/src/main/resources/config/application-docker.yml index bb1a6824..2e415537 100644 --- a/yshop-admin/src/main/resources/config/application-docker.yml +++ b/yshop-admin/src/main/resources/config/application-docker.yml @@ -94,7 +94,7 @@ swagger: enabled: true title: yshop商城管理后台API serverUrl: http://127.0.0.1:8000 - version: 3.2 + version: 3.3 file: diff --git a/yshop-admin/src/main/resources/config/application-prod.yml b/yshop-admin/src/main/resources/config/application-prod.yml index 274878ef..b4219165 100644 --- a/yshop-admin/src/main/resources/config/application-prod.yml +++ b/yshop-admin/src/main/resources/config/application-prod.yml @@ -6,7 +6,7 @@ spring: druid: type: com.alibaba.druid.pool.DruidDataSource driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3366/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: yshopb2c password: bkfGfAimifjPZtNE @@ -94,7 +94,7 @@ swagger: enabled: false title: yshop商城管理后台API serverUrl: http://127.0.0.1:8000 - version: 3.2 + version: 3.3 file: diff --git a/yshop-admin/src/main/resources/config/application.yml b/yshop-admin/src/main/resources/config/application.yml index ca98f4d3..9779b8f3 100644 --- a/yshop-admin/src/main/resources/config/application.yml +++ b/yshop-admin/src/main/resources/config/application.yml @@ -2,6 +2,8 @@ server: port: 8001 spring: + main: + allow-circular-references: true freemarker: check-template-location: false profiles: @@ -47,7 +49,7 @@ smms: yshop: # 配置 - version: 3.2 + version: 3.3 apiUrl: http://127.0.0.1:8009/api logging: diff --git a/yshop-admin/src/main/resources/logback.xml b/yshop-admin/src/main/resources/logback-spring.xml similarity index 100% rename from yshop-admin/src/main/resources/logback.xml rename to yshop-admin/src/main/resources/logback-spring.xml diff --git a/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl b/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl index 49aa00e6..20b464fa 100644 --- a/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl +++ b/yshop-admin/src/main/resources/template/generator/admin/ControllerP.ftl @@ -10,7 +10,7 @@ package ${package}.rest; import java.util.Arrays; import co.yixiang.dozer.service.IGenerator; import lombok.AllArgsConstructor; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import ${package}.domain.${className}; import ${package}.service.${className}Service; import ${package}.service.dto.${className}QueryCriteria; diff --git a/yshop-app/Dockerfile b/yshop-app/Dockerfile index 08bcb7f3..87ebc546 100644 --- a/yshop-app/Dockerfile +++ b/yshop-app/Dockerfile @@ -13,6 +13,6 @@ WORKDIR /yshop-app EXPOSE 8008 -ADD ./target/yshop-app-3.2.jar ./ +ADD ./target/yshop-app-3.3.jar ./ -CMD java $JAVA_OPTS -jar yshop-app-3.2.jar --spring.profiles.active=docker +CMD java $JAVA_OPTS -jar yshop-app-3.3.jar --spring.profiles.active=docker diff --git a/yshop-app/pom.xml b/yshop-app/pom.xml index 46d040d2..212654c3 100644 --- a/yshop-app/pom.xml +++ b/yshop-app/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -21,7 +21,7 @@ co.yixiang yshop-weixin - 3.2 + 3.3 org.springframework.boot @@ -33,7 +33,7 @@ co.yixiang yshop-message - 3.2 + 3.3 co.yixiang diff --git a/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java b/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java index e11332aa..9e78116f 100644 --- a/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java +++ b/yshop-app/src/main/java/co/yixiang/common/aspect/AppLogAspect.java @@ -6,8 +6,8 @@ package co.yixiang.common.aspect; import co.yixiang.common.bean.LocalUser; -import co.yixiang.logging.domain.Log; -import co.yixiang.logging.service.LogService; +import co.yixiang.modules.logging.domain.Log; +import co.yixiang.modules.logging.service.LogService; import co.yixiang.utils.RequestHolder; import co.yixiang.utils.StringUtils; import co.yixiang.utils.ThrowableUtil; @@ -42,7 +42,7 @@ public class AppLogAspect { /** * 配置切入点 */ - @Pointcut("@annotation(co.yixiang.logging.aop.log.AppLog)") + @Pointcut("@annotation(co.yixiang.modules.logging.aop.log.AppLog)") public void logPointcut() { // 该方法无方法体,主要为了让同类中其他方法使用此切入点 } diff --git a/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java b/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java index 55a367c6..0ffdfaf5 100644 --- a/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java +++ b/yshop-app/src/main/java/co/yixiang/common/config/MybatisPlusConfig.java @@ -9,7 +9,9 @@ package co.yixiang.common.config; -import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -24,7 +26,10 @@ public class MybatisPlusConfig { * mybatis-plus分页插件 */ @Bean - public PaginationInterceptor paginationInterceptor() { - return new PaginationInterceptor(); + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); + return interceptor; } + } diff --git a/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java b/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java index 9cc18d2b..3f1915d3 100644 --- a/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java +++ b/yshop-app/src/main/java/co/yixiang/common/interceptor/PermissionInterceptor.java @@ -21,8 +21,8 @@ import com.auth0.jwt.interfaces.Claim; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.StringUtils; import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.handler.HandlerInterceptorAdapter; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -34,7 +34,7 @@ import java.util.Optional; * @author hupeng * @date 2020-04-30 */ -public class PermissionInterceptor extends HandlerInterceptorAdapter { +public class PermissionInterceptor implements HandlerInterceptor { @Autowired private YxUserService userService; @@ -54,7 +54,7 @@ public class PermissionInterceptor extends HandlerInterceptorAdapter { } String bearerToken = request.getHeader("Authorization"); - if (StringUtils.isEmpty(bearerToken)) { + if (!StringUtils.hasLength(bearerToken)) { throw new UnAuthenticatedException(ApiCode.UNAUTHORIZED); } @@ -105,13 +105,13 @@ public class PermissionInterceptor extends HandlerInterceptorAdapter { @Override public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { - super.postHandle(request, response, handler, modelAndView); + HandlerInterceptor.super.postHandle(request, response, handler, modelAndView); } @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { LocalUser.clear(); - super.afterCompletion(request, response, handler, ex); + HandlerInterceptor.super.afterCompletion(request, response, handler, ex); } private Optional getAuthCheck(Object handler) { diff --git a/yshop-app/src/main/java/co/yixiang/common/util/RedisLock.java b/yshop-app/src/main/java/co/yixiang/common/util/RedisLock.java index 0a98a6d9..a57dfb13 100644 --- a/yshop-app/src/main/java/co/yixiang/common/util/RedisLock.java +++ b/yshop-app/src/main/java/co/yixiang/common/util/RedisLock.java @@ -8,19 +8,19 @@ */ package co.yixiang.common.util; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisCallback; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; -import redis.clients.jedis.Jedis; -import redis.clients.jedis.params.SetParams; -import java.util.Collections; +import java.util.concurrent.TimeUnit; /** * Redis 分布式锁实现 */ @Service +@Slf4j public class RedisLock { private static final Long RELEASE_SUCCESS = 1L; @@ -46,15 +46,31 @@ public class RedisLock { * @return */ public boolean tryLock(String lockKey, String clientId, long seconds) { - return redisTemplate.execute((RedisCallback) redisConnection -> { - Jedis jedis = (Jedis) redisConnection.getNativeConnection(); - SetParams setParams = new SetParams(); - String result = jedis.set(lockKey, clientId, setParams.nx().px(seconds)); - if (LOCK_SUCCESS.equals(result)) { + //return redisTemplate.execute((RedisCallback) redisConnection -> { + // Jedis jedis = (Jedis) redisConnection.getNativeConnection(); + // SetParams setParams = new SetParams(); + // String result = jedis.set(lockKey, clientId, setParams.nx().px(seconds)); + // if (LOCK_SUCCESS.equals(result)) { + // return true; + // } + // return false; + //}); + if(redisTemplate.opsForValue().setIfAbsent(lockKey,clientId)){ + return true; + } + String currentValue = redisTemplate.opsForValue().get(lockKey); + + if(!StringUtils.isEmpty(currentValue) && + Long.parseLong(currentValue) 0) { + redisTemplate.expire(lockKey, seconds, TimeUnit.SECONDS); + } + if(!StringUtils.isEmpty(oldValue)&& oldValue.equals(currentValue)){ return true; } - return false; - }); + } + return false; } /** @@ -65,14 +81,24 @@ public class RedisLock { * @return */ public boolean releaseLock(String lockKey, String clientId) { - return redisTemplate.execute((RedisCallback) redisConnection -> { - Jedis jedis = (Jedis) redisConnection.getNativeConnection(); - Object result = jedis.eval(RELEASE_LOCK_SCRIPT, Collections.singletonList(lockKey), - Collections.singletonList(clientId)); - if (RELEASE_SUCCESS.equals(result)) { - return true; + //return redisTemplate.execute((RedisCallback) redisConnection -> { + // Jedis jedis = (Jedis) redisConnection.getNativeConnection(); + // Object result = jedis.eval(RELEASE_LOCK_SCRIPT, Collections.singletonList(lockKey), + // Collections.singletonList(clientId)); + // if (RELEASE_SUCCESS.equals(result)) { + // return true; + // } + // return false; + //}); + try { + String currentValue = redisTemplate.opsForValue().get(lockKey); + if (!StringUtils.isEmpty(currentValue) && currentValue.equals(clientId)) { + redisTemplate.opsForValue().getOperations().delete(lockKey); } + return true; + } catch (Exception e){ + log.error("【redis分布式锁异常】{}",e); return false; - }); + } } } diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 94a02ffb..a94921f2 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -13,7 +13,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; @@ -54,7 +54,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.Collections; import java.util.List; import java.util.Map; diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index e0c6d97d..17f2668d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; @@ -23,7 +23,6 @@ import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.activity.vo.CombinationQueryVo; import co.yixiang.modules.activity.vo.PinkInfoVo; import co.yixiang.modules.activity.vo.StoreCombinationVo; -import co.yixiang.modules.activity.vo.YxStoreCombinationQueryVo; import co.yixiang.modules.product.service.YxStoreProductRelationService; import co.yixiang.modules.services.CreatShareProductService; import co.yixiang.modules.shop.service.YxSystemConfigService; @@ -45,8 +44,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.util.Collections; -import java.util.List; import java.util.Map; /** diff --git a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 22ba9508..c1092057 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -13,7 +13,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.ShopConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java b/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java index ddd22d1b..a088d90e 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/cart/rest/StoreCartController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.cart.rest; import co.yixiang.annotation.Limit; import co.yixiang.api.ApiResult; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java index 71e675af..5a1b0cfa 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/coupon/rest/CouponController.java @@ -11,7 +11,7 @@ package co.yixiang.modules.coupon.rest; import cn.hutool.core.util.NumberUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java index 258a9518..6868a441 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/manage/rest/ShoperController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.modules.manage.param.OrderPriceParam; import co.yixiang.modules.manage.param.ShoperQueryParam; diff --git a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index 8b6c0842..0536508a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -17,7 +17,7 @@ import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.enums.*; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.modules.mp.domain.YxWechatTemplate; import co.yixiang.modules.mp.service.WeixinPayService; import co.yixiang.modules.mp.service.YxWechatTemplateService; @@ -36,9 +36,9 @@ import co.yixiang.modules.order.vo.YxStoreOrderQueryVo; import co.yixiang.modules.services.CreatShareProductService; import co.yixiang.modules.services.OrderSupplyService; import co.yixiang.modules.user.domain.YxUser; -import co.yixiang.tools.express.ExpressService; -import co.yixiang.tools.express.config.ExpressAutoConfiguration; -import co.yixiang.tools.express.dao.ExpressInfo; +import co.yixiang.modules.tools.express.ExpressService; +import co.yixiang.modules.tools.express.config.ExpressAutoConfiguration; +import co.yixiang.modules.tools.express.dao.ExpressInfo; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.vdurmont.emoji.EmojiParser; import io.swagger.annotations.Api; diff --git a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 2c4dc3d8..5fe8137a 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -18,7 +18,7 @@ import cn.hutool.extra.qrcode.QrCodeUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java index 1547d70d..5188376c 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserAddressController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.common.util.CityTreeUtil; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index b328c0cc..32d4a3e2 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -12,7 +12,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; @@ -155,7 +155,7 @@ public class UserBillController { map.put("list",yxUserService.getUserSpreadGrade(uid,param.getPage(),param.getLimit() ,param.getGrade(),param.getKeyword(),param.getSort())); - Map countMap = yxUserService.getSpreadCount(uid); + Map countMap = yxUserService.getSpreadCount(uid); map.put("total",countMap.get("first")); map.put("totalLevel",countMap.get("second")); return ApiResult.ok(map); diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java index d10c7b58..9d948757 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.user.rest; import co.yixiang.api.ApiResult; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.aop.NoRepeatSubmit; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; @@ -211,7 +211,7 @@ public class UserController { @ApiOperation(value = "开始签到",notes = "开始签到") public ApiResult signIntegral(){ YxUser yxUser = LocalUser.getUser(); - int integral = userSignService.sign(yxUser);; + int integral = userSignService.sign(yxUser); Map map = new LinkedHashMap<>(); map.put("integral",integral); diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java index 7cdc0922..8485c58d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserExtractController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.user.rest; import co.yixiang.api.ApiResult; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.SystemConfigConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java index 744008c0..f50048aa 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java @@ -12,7 +12,7 @@ import cn.hutool.core.bean.BeanUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.constant.ShopConstants; diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java index b06b5fa7..fb49ba0d 100644 --- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java +++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WxMaUserController.java @@ -14,7 +14,7 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; import co.yixiang.modules.user.domain.YxUser; @@ -24,12 +24,10 @@ import co.yixiang.modules.wechat.rest.param.WxPhoneParam; import co.yixiang.modules.mp.config.WxMaConfiguration; import co.yixiang.utils.RedisUtil; import co.yixiang.utils.RedisUtils; -import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.ShopKeyUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import me.chanjar.weixin.common.error.WxErrorException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; diff --git a/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java b/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java index 5fc4b31c..2c5bafb6 100644 --- a/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java +++ b/yshop-app/src/main/java/co/yixiang/sales/rest/StoreAfterSalesController.java @@ -6,7 +6,7 @@ import co.yixiang.api.ApiResult; import co.yixiang.api.YshopException; import co.yixiang.common.bean.LocalUser; import co.yixiang.common.interceptor.AuthCheck; -import co.yixiang.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.AppLog; import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.service.YxExpressService; import co.yixiang.modules.order.service.dto.YxExpressQueryCriteria; diff --git a/yshop-app/src/main/resources/config/application-dev.yml b/yshop-app/src/main/resources/config/application-dev.yml index 8ca258c4..12ad74ee 100644 --- a/yshop-app/src/main/resources/config/application-dev.yml +++ b/yshop-app/src/main/resources/config/application-dev.yml @@ -79,7 +79,7 @@ swagger: enabled: true title: yshop商城移动端API serverUrl: http://localhost:8009 - version: 3.2 + version: 3.3 # 文件存储路径 file: diff --git a/yshop-app/src/main/resources/config/application-docker.yml b/yshop-app/src/main/resources/config/application-docker.yml index 693dee42..729df76e 100644 --- a/yshop-app/src/main/resources/config/application-docker.yml +++ b/yshop-app/src/main/resources/config/application-docker.yml @@ -86,7 +86,7 @@ swagger: enabled: true title: yshop商城移动端API serverUrl: http://localhost:8009 - version: 3.2 + version: 3.3 # 文件存储路径 file: diff --git a/yshop-app/src/main/resources/config/application-prod.yml b/yshop-app/src/main/resources/config/application-prod.yml index 68eb52e8..fd1f6149 100644 --- a/yshop-app/src/main/resources/config/application-prod.yml +++ b/yshop-app/src/main/resources/config/application-prod.yml @@ -5,7 +5,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://localhost:3366/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull + url: jdbc:mysql://localhost:3306/yshopb2c?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull username: yshopb2c password: bkfGfAimifjPZtNE # 从库数据源 @@ -86,7 +86,7 @@ swagger: enabled: false title: yshop商城移动端API serverUrl: http://localhost:8009 - version: 3.2 + version: 3.3 # 文件存储路径 file: diff --git a/yshop-app/src/main/resources/config/application.yml b/yshop-app/src/main/resources/config/application.yml index 08663572..96ebd4a7 100644 --- a/yshop-app/src/main/resources/config/application.yml +++ b/yshop-app/src/main/resources/config/application.yml @@ -9,8 +9,12 @@ server: tomcat: uri-encoding: UTF-8 - spring: + mvc: + pathmatch: + matching-strategy: ant_path_matcher + main: + allow-circular-references: true freemarker: check-template-location: false profiles: @@ -69,7 +73,7 @@ logging: yshop: #相关配置 - version: 3.2 + version: 3.3 # 防止XSS攻击 xss: diff --git a/yshop-app/src/main/resources/logback.xml b/yshop-app/src/main/resources/logback-spring.xml similarity index 100% rename from yshop-app/src/main/resources/logback.xml rename to yshop-app/src/main/resources/logback-spring.xml diff --git a/yshop-common/pom.xml b/yshop-common/pom.xml index 54601282..240736ab 100644 --- a/yshop-common/pom.xml +++ b/yshop-common/pom.xml @@ -5,14 +5,14 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 yshop-common 公共模块 - 4.2.0 + 4.3.0 @@ -55,7 +55,7 @@ co.yixiang yshop-mproot - 3.2 + 3.3 org.apache.httpcomponents diff --git a/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java b/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java index 067f7c2e..85e1cdf5 100644 --- a/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java +++ b/yshop-common/src/main/java/co/yixiang/aspect/LimitAspect.java @@ -7,7 +7,6 @@ package co.yixiang.aspect; import co.yixiang.annotation.Limit; import co.yixiang.exception.BadLimitRequestException; -import co.yixiang.exception.BadRequestException; import co.yixiang.utils.RequestHolder; import co.yixiang.utils.StringUtils; import com.google.common.collect.ImmutableList; @@ -63,8 +62,8 @@ public class LimitAspect { ImmutableList keys = ImmutableList.of(StringUtils.join(limit.prefix(), "_", key, "_", request.getRequestURI().replaceAll("/","_"))); String luaScript = buildLuaScript(); - RedisScript redisScript = new DefaultRedisScript<>(luaScript, Number.class); - Number count = redisTemplate.execute(redisScript, keys, limit.count(), limit.period()); + RedisScript redisScript = new DefaultRedisScript<>(luaScript, Long.class); + Long count = redisTemplate.execute(redisScript, keys, limit.count(), limit.period()); if (null != count && count.intValue() <= limit.count()) { logger.info("第{}次访问key为 {}，描述为 [{}] 的接口", count, keys, limit.name()); return joinPoint.proceed(); diff --git a/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java b/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java index 07fbbc60..07ed8782 100644 --- a/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java +++ b/yshop-common/src/main/java/co/yixiang/dozer/service/EJBGenerator.java @@ -26,7 +26,7 @@ import java.util.stream.Collectors; * @version: 1.0 */ @Component -@Lazy(true) +@Lazy() public class EJBGenerator implements IGenerator { @Autowired diff --git a/yshop-generator/pom.xml b/yshop-generator/pom.xml index 56c6ff32..734825b7 100644 --- a/yshop-generator/pom.xml +++ b/yshop-generator/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -20,7 +20,7 @@ co.yixiang yshop-common - 3.2 + 3.3 diff --git a/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/ColumnConfig.java similarity index 95% rename from yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/domain/ColumnConfig.java index fffe761b..3f82bcd8 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/domain/ColumnConfig.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/ColumnConfig.java @@ -3,9 +3,9 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.domain; +package co.yixiang.modules.gen.domain; -import co.yixiang.gen.utils.GenUtil; +import co.yixiang.modules.gen.utils.GenUtil; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/GenConfig.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/domain/GenConfig.java index 428818e2..d4a058c5 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/domain/GenConfig.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/GenConfig.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.domain; +package co.yixiang.modules.gen.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/ColumnInfo.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/vo/ColumnInfo.java similarity index 95% rename from yshop-generator/src/main/java/co/yixiang/gen/domain/vo/ColumnInfo.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/domain/vo/ColumnInfo.java index d417a3d9..b04ca633 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/ColumnInfo.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/vo/ColumnInfo.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.domain.vo; +package co.yixiang.modules.gen.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/TableInfo.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/vo/TableInfo.java similarity index 94% rename from yshop-generator/src/main/java/co/yixiang/gen/domain/vo/TableInfo.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/domain/vo/TableInfo.java index 1167012a..89d080b0 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/domain/vo/TableInfo.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/domain/vo/TableInfo.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.domain.vo; +package co.yixiang.modules.gen.domain.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/rest/GenConfigController.java similarity index 91% rename from yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/rest/GenConfigController.java index 7d777f4e..71bffe70 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/rest/GenConfigController.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/rest/GenConfigController.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.rest; +package co.yixiang.modules.gen.rest; -import co.yixiang.gen.domain.GenConfig; -import co.yixiang.gen.service.GenConfigService; +import co.yixiang.modules.gen.domain.GenConfig; +import co.yixiang.modules.gen.service.GenConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/rest/GeneratorController.java similarity index 95% rename from yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/rest/GeneratorController.java index 487d9cbb..c98b40aa 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/rest/GeneratorController.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/rest/GeneratorController.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.rest; +package co.yixiang.modules.gen.rest; import co.yixiang.exception.BadRequestException; -import co.yixiang.gen.domain.ColumnConfig; -import co.yixiang.gen.service.GenConfigService; -import co.yixiang.gen.service.GeneratorService; +import co.yixiang.modules.gen.domain.ColumnConfig; +import co.yixiang.modules.gen.service.GenConfigService; +import co.yixiang.modules.gen.service.GeneratorService; import co.yixiang.utils.PageUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/GenConfigService.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/GenConfigService.java similarity index 85% rename from yshop-generator/src/main/java/co/yixiang/gen/service/GenConfigService.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/service/GenConfigService.java index 9437d21a..1080c0fa 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/GenConfigService.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/GenConfigService.java @@ -3,9 +3,9 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.service; +package co.yixiang.modules.gen.service; -import co.yixiang.gen.domain.GenConfig; +import co.yixiang.modules.gen.domain.GenConfig; /** * @author Zheng Jie diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/GeneratorService.java similarity index 93% rename from yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/service/GeneratorService.java index 1b326d92..588a36d7 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/GeneratorService.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/GeneratorService.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.service; +package co.yixiang.modules.gen.service; -import co.yixiang.gen.domain.ColumnConfig; -import co.yixiang.gen.domain.GenConfig; +import co.yixiang.modules.gen.domain.ColumnConfig; +import co.yixiang.modules.gen.domain.GenConfig; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/impl/GenConfigServiceImpl.java similarity index 89% rename from yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/service/impl/GenConfigServiceImpl.java index f054fb74..f376ab08 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GenConfigServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/impl/GenConfigServiceImpl.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.service.impl; +package co.yixiang.modules.gen.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; -import co.yixiang.gen.domain.GenConfig; -import co.yixiang.gen.service.GenConfigService; -import co.yixiang.gen.service.mapper.GenConfigMapper; +import co.yixiang.modules.gen.domain.GenConfig; +import co.yixiang.modules.gen.service.GenConfigService; +import co.yixiang.modules.gen.service.mapper.GenConfigMapper; import co.yixiang.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/impl/GeneratorServiceImpl.java similarity index 94% rename from yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/service/impl/GeneratorServiceImpl.java index 0f81af4c..7d925dca 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/impl/GeneratorServiceImpl.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/impl/GeneratorServiceImpl.java @@ -3,19 +3,19 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.service.impl; +package co.yixiang.modules.gen.service.impl; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ZipUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.exception.BadRequestException; -import co.yixiang.gen.domain.ColumnConfig; -import co.yixiang.gen.domain.GenConfig; -import co.yixiang.gen.domain.vo.TableInfo; -import co.yixiang.gen.service.GeneratorService; -import co.yixiang.gen.service.mapper.ColumnInfoMapper; -import co.yixiang.gen.utils.GenUtil; +import co.yixiang.modules.gen.domain.ColumnConfig; +import co.yixiang.modules.gen.domain.GenConfig; +import co.yixiang.modules.gen.domain.vo.TableInfo; +import co.yixiang.modules.gen.service.GeneratorService; +import co.yixiang.modules.gen.service.mapper.ColumnInfoMapper; +import co.yixiang.modules.gen.utils.GenUtil; import co.yixiang.utils.FileUtil; import co.yixiang.utils.PageUtil; import co.yixiang.utils.StringUtils; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/mapper/ColumnInfoMapper.java similarity index 91% rename from yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/service/mapper/ColumnInfoMapper.java index e041dd12..964f2e2d 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/ColumnInfoMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/mapper/ColumnInfoMapper.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.service.mapper; +package co.yixiang.modules.gen.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.gen.domain.ColumnConfig; -import co.yixiang.gen.domain.vo.TableInfo; +import co.yixiang.modules.gen.domain.ColumnConfig; +import co.yixiang.modules.gen.domain.vo.TableInfo; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/mapper/GenConfigMapper.java similarity index 76% rename from yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/service/mapper/GenConfigMapper.java index afb8f8ed..6c054886 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/service/mapper/GenConfigMapper.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/service/mapper/GenConfigMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.service.mapper; +package co.yixiang.modules.gen.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.gen.domain.GenConfig; +import co.yixiang.modules.gen.domain.GenConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/utils/ColUtil.java similarity index 96% rename from yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/utils/ColUtil.java index 7739c28b..1c9558a0 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/utils/ColUtil.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/utils/ColUtil.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.utils; +package co.yixiang.modules.gen.utils; import org.apache.commons.configuration.Configuration; import org.apache.commons.configuration.ConfigurationException; diff --git a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java b/yshop-generator/src/main/java/co/yixiang/modules/gen/utils/GenUtil.java similarity index 99% rename from yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java rename to yshop-generator/src/main/java/co/yixiang/modules/gen/utils/GenUtil.java index 23ca52be..24ab7f25 100644 --- a/yshop-generator/src/main/java/co/yixiang/gen/utils/GenUtil.java +++ b/yshop-generator/src/main/java/co/yixiang/modules/gen/utils/GenUtil.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.gen.utils; +package co.yixiang.modules.gen.utils; import cn.hutool.core.util.StrUtil; import cn.hutool.extra.template.Template; @@ -11,8 +11,8 @@ import cn.hutool.extra.template.TemplateConfig; import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateException; import cn.hutool.extra.template.TemplateUtil; -import co.yixiang.gen.domain.ColumnConfig; -import co.yixiang.gen.domain.GenConfig; +import co.yixiang.modules.gen.domain.ColumnConfig; +import co.yixiang.modules.gen.domain.GenConfig; import co.yixiang.utils.FileUtil; import co.yixiang.utils.StringUtils; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-logging/pom.xml b/yshop-logging/pom.xml index 7b556baf..bb9cfc1a 100644 --- a/yshop-logging/pom.xml +++ b/yshop-logging/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -16,12 +16,12 @@ co.yixiang yshop-common - 3.2 + 3.3 co.yixiang yshop-mproot - 3.2 + 3.3 compile diff --git a/yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/AppLog.java similarity index 90% rename from yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/AppLog.java index 9f80dc45..7659907b 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/aop/log/AppLog.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/AppLog.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.aop.log; +package co.yixiang.modules.logging.aop.log; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/aop/log/Log.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/Log.java similarity index 90% rename from yshop-logging/src/main/java/co/yixiang/logging/aop/log/Log.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/Log.java index 1e1ae507..e2dfbf56 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/aop/log/Log.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/aop/log/Log.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.aop.log; +package co.yixiang.modules.logging.aop.log; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/aspect/LogAspect.java similarity index 93% rename from yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/aspect/LogAspect.java index abc7f42d..6fceda5f 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/aspect/LogAspect.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/aspect/LogAspect.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.aspect; +package co.yixiang.modules.logging.aspect; -import co.yixiang.logging.domain.Log; -import co.yixiang.logging.service.LogService; +import co.yixiang.modules.logging.domain.Log; +import co.yixiang.modules.logging.service.LogService; import co.yixiang.utils.RequestHolder; import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; @@ -42,7 +42,7 @@ public class LogAspect { /** * 配置切入点 */ - @Pointcut("@annotation(co.yixiang.logging.aop.log.Log)") + @Pointcut("@annotation(co.yixiang.modules.logging.aop.log.Log)") public void logPointcut() { // 该方法无方法体,主要为了让同类中其他方法使用此切入点 } diff --git a/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/domain/Log.java similarity index 96% rename from yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/domain/Log.java index 536cba5e..e47ecf90 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/domain/Log.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/domain/Log.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.domain; +package co.yixiang.modules.logging.domain; import co.yixiang.domain.BaseDomain; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/rest/LogController.java similarity index 95% rename from yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/rest/LogController.java index 66f6391a..af90bdb4 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/rest/LogController.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/rest/LogController.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.rest; +package co.yixiang.modules.logging.rest; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.logging.service.LogService; -import co.yixiang.logging.service.dto.LogQueryCriteria; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.logging.service.LogService; +import co.yixiang.modules.logging.service.dto.LogQueryCriteria; import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/LogService.java similarity index 93% rename from yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/service/LogService.java index fbded299..03b99da1 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/LogService.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/LogService.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.service; +package co.yixiang.modules.logging.service; import co.yixiang.common.service.BaseService; -import co.yixiang.logging.domain.Log; -import co.yixiang.logging.service.dto.LogQueryCriteria; +import co.yixiang.modules.logging.domain.Log; +import co.yixiang.modules.logging.service.dto.LogQueryCriteria; import org.aspectj.lang.ProceedingJoinPoint; import org.springframework.data.domain.Pageable; import org.springframework.scheduling.annotation.Async; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogErrorDTO.java similarity index 91% rename from yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogErrorDTO.java index 8ac20a32..a8c225da 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogErrorDTO.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogErrorDTO.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.service.dto; +package co.yixiang.modules.logging.service.dto; import lombok.Data; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogQueryCriteria.java similarity index 92% rename from yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogQueryCriteria.java index be0045d8..5e95d327 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogQueryCriteria.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogQueryCriteria.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.service.dto; +package co.yixiang.modules.logging.service.dto; import co.yixiang.annotation.Query; import lombok.Data; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogSmallDTO.java similarity index 90% rename from yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogSmallDTO.java index fe93bb93..aeb6b212 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/dto/LogSmallDTO.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/dto/LogSmallDTO.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.service.dto; +package co.yixiang.modules.logging.service.dto; import lombok.Data; diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/impl/LogServiceImpl.java similarity index 84% rename from yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/service/impl/LogServiceImpl.java index ccb3f1da..8b148867 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/impl/LogServiceImpl.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/impl/LogServiceImpl.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.service.impl; +package co.yixiang.modules.logging.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.ObjectUtil; @@ -11,13 +11,13 @@ import cn.hutool.json.JSONObject; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.AppLog; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.logging.service.LogService; -import co.yixiang.logging.service.dto.LogErrorDTO; -import co.yixiang.logging.service.dto.LogQueryCriteria; -import co.yixiang.logging.service.dto.LogSmallDTO; -import co.yixiang.logging.service.mapper.LogMapper; +import co.yixiang.modules.logging.aop.log.AppLog; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.logging.service.LogService; +import co.yixiang.modules.logging.service.dto.LogErrorDTO; +import co.yixiang.modules.logging.service.dto.LogQueryCriteria; +import co.yixiang.modules.logging.service.dto.LogSmallDTO; +import co.yixiang.modules.logging.service.mapper.LogMapper; import co.yixiang.utils.FileUtil; import co.yixiang.utils.StringUtils; import co.yixiang.utils.ValidationUtil; @@ -44,7 +44,7 @@ import java.util.Map; @SuppressWarnings("unchecked") @Service @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class LogServiceImpl extends BaseServiceImpl implements LogService { +public class LogServiceImpl extends BaseServiceImpl implements LogService { private final LogMapper logMapper; @@ -59,7 +59,7 @@ public class LogServiceImpl extends BaseServiceImpl page = new PageInfo<>(logMapper.findAllByPageable(nickname)); + PageInfo page = new PageInfo<>(logMapper.findAllByPageable(nickname)); Map map = new LinkedHashMap<>(2); map.put("content",page.getList()); map.put("totalElements",page.getTotal()); @@ -71,7 +71,7 @@ public class LogServiceImpl extends BaseServiceImpl page = new PageInfo<>(queryAll(criteria)); + PageInfo page = new PageInfo<>(queryAll(criteria)); Map map = new LinkedHashMap<>(2); String status = "ERROR"; if(status.equals(criteria.getLogType())){ @@ -84,14 +84,14 @@ public class LogServiceImpl extends BaseServiceImpl queryAll(LogQueryCriteria criteria) { - return baseMapper.selectList(QueryHelpPlus.getPredicate(co.yixiang.logging.domain.Log.class, criteria)); + public List queryAll(LogQueryCriteria criteria) { + return baseMapper.selectList(QueryHelpPlus.getPredicate(co.yixiang.modules.logging.domain.Log.class, criteria)); } @Override public Object queryAllByUser(LogQueryCriteria criteria, Pageable pageable) { getPage(pageable); - PageInfo page = new PageInfo<>(queryAll(criteria)); + PageInfo page = new PageInfo<>(queryAll(criteria)); Map map = new LinkedHashMap<>(2); map.put("content", generator.convert(page.getList(), LogSmallDTO.class)); map.put("totalElements", page.getTotal()); @@ -102,7 +102,7 @@ public class LogServiceImpl extends BaseServiceImpl logs, HttpServletResponse response) throws IOException { + public void download(List logs, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (co.yixiang.logging.domain.Log log : logs) { + for (co.yixiang.modules.logging.domain.Log log : logs) { Map map = new LinkedHashMap<>(); map.put("用户名", log.getUsername()); map.put("IP", log.getRequestIp()); diff --git a/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/mapper/LogMapper.java similarity index 92% rename from yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java rename to yshop-logging/src/main/java/co/yixiang/modules/logging/service/mapper/LogMapper.java index cd9533ac..df93bf4e 100644 --- a/yshop-logging/src/main/java/co/yixiang/logging/service/mapper/LogMapper.java +++ b/yshop-logging/src/main/java/co/yixiang/modules/logging/service/mapper/LogMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.logging.service.mapper; +package co.yixiang.modules.logging.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.logging.domain.Log; +import co.yixiang.modules.logging.domain.Log; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/yshop-mall/pom.xml b/yshop-mall/pom.xml index 3b00a342..87c70099 100644 --- a/yshop-mall/pom.xml +++ b/yshop-mall/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -16,7 +16,7 @@ co.yixiang yshop-tools - 3.2 + 3.3 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java index 9ba0d8d1..007f0800 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStoreBargainUserHelpService.java @@ -37,11 +37,12 @@ public interface YxStoreBargainUserHelpService extends BaseService * @param uid uid * @return int */ - int getUserValidCouponCount(Long uid); + Long getUserValidCouponCount(Long uid); void useCoupon(int id); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java index b96b3a5d..42ba23ac 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java @@ -55,10 +55,11 @@ public interface YxStorePinkService extends BaseService{ /** * 返回正在拼团的人数 + * * @param id 拼团id * @return int */ - int pinkIngCount(Long id); + Long pinkIngCount(Long id); /** * 创建拼团 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java index 14f7e918..0b0eb7aa 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCombinationDto.java @@ -46,13 +46,13 @@ public class YxStoreCombinationDto implements Serializable { private List sliderImage; //参与人数 - private Integer countPeopleAll; + private Long countPeopleAll; //成团人数 - private Integer countPeoplePink; + private Long countPeoplePink; //访问人数 - private Integer countPeopleBrowse; + private Long countPeopleBrowse; // 活动标题 private String title; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java index 7f98a065..0679c2a7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java @@ -81,5 +81,5 @@ public class YxStorePinkDto implements Serializable { /** * 参团人数 */ - private int countPeople; + private Long countPeople; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java index 7136e338..85204e28 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java @@ -206,7 +206,7 @@ public class YxStoreBargainServiceImpl extends BaseServiceImpl 0) { throw new YshopException("已领取过该优惠劵"); } @@ -110,7 +110,7 @@ public class YxStoreCouponIssueServiceImpl extends BaseServiceImpl list = yxStoreCouponIssueMapper .selecCoupontList(pageModel,type,productId); for (YxStoreCouponIssueQueryVo couponIssue : list) { - int count = this.couponCount(couponIssue.getId(),uid); + Long count = this.couponCount(couponIssue.getId(),uid); if(count > 0){ couponIssue.setIsUse(true); }else{ @@ -128,7 +128,7 @@ public class YxStoreCouponIssueServiceImpl extends BaseServiceImpllambdaQuery() + Long pinkCount = yxStorePinkMapper.selectCount(Wrappers.lambdaQuery() .eq(YxStorePink::getOrderId,order.getOrderId())); if(pinkCount > 0) { return; @@ -363,7 +364,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpli.eq(YxStorePink::getKId,id).or().eq(YxStorePink::getId,id)) @@ -503,7 +504,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl idAll) { - int count = this.lambdaQuery().in(YxStorePink::getId,idAll) + Long count = this.lambdaQuery().in(YxStorePink::getId,idAll) .eq(YxStorePink::getIsRefund,OrderInfoEnum.PINK_REFUND_STATUS_1.getValue()) .count(); if(count == 0) { @@ -631,12 +632,12 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl wrapper= new LambdaQueryWrapper<>(); wrapper.eq(YxStorePink::getKId,kid) .eq(YxStorePink::getIsRefund, OrderInfoEnum.PINK_REFUND_STATUS_0.getValue()); //加上团长自己 - int count = yxStorePinkMapper.selectCount(wrapper) + 1; + Long count = yxStorePinkMapper.selectCount(wrapper) + 1; return people - count; } @@ -657,7 +658,7 @@ public class YxStorePinkServiceImpl extends BaseServiceImpl().eq(YxStorePink::getCid,i.getCid()))); + i.setCountPeople(this.count(new LambdaQueryWrapper().eq(YxStorePink::getCid,i.getCid()))); }); map.put("content", yxStorePinkDtos); map.put("totalElements", page.getTotal()); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainCountVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainCountVo.java index d17392f9..e05c9de0 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainCountVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainCountVo.java @@ -14,7 +14,7 @@ import java.io.Serializable; @Builder public class BargainCountVo implements Serializable { private Double alreadyPrice; - private Integer count; + private Long count; private Integer pricePercent; private Integer status; private Double price; //剩余的砍价金额 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java index dc5b2f64..69f5f9be 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/BargainVo.java @@ -17,5 +17,5 @@ import java.io.Serializable; public class BargainVo implements Serializable { private YxStoreBargainQueryVo bargain; private YxUserQueryVo userInfo; - private Integer bargainSumCount;//砍价支付成功订单数量 + private Long bargainSumCount;//砍价支付成功订单数量 } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java index ee64097c..e533d26c 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/PinkInfoVo.java @@ -43,7 +43,7 @@ public class PinkInfoVo implements Serializable { private String storeCombinationHost; @ApiModelProperty(value = "是否在团内 0不在 1在") - private Integer userBool = 0; + private Integer userBool; @ApiModelProperty(value = "拼团用户信息") private YxUserQueryVo userInfo; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java index cdb41611..705f187f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreCombinationVo.java @@ -41,7 +41,7 @@ public class StoreCombinationVo implements Serializable { private YxStoreProductReplyQueryVo reply; @ApiModelProperty(value = "拼团评论总条数") - private Integer replyCount = 0; + private Long replyCount; @ApiModelProperty(value = "拼团好评比例") private String replyChance; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java index a86b2952..d4196fec 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/StoreSeckillVo.java @@ -31,7 +31,7 @@ public class StoreSeckillVo implements Serializable { private YxStoreProductReplyQueryVo reply; @ApiModelProperty(value = "秒杀产品评论数量") - private Integer replyCount; + private Long replyCount; @ApiModelProperty(value = "秒杀产品信息") private YxStoreSeckillQueryVo storeInfo; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/TopCountVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/TopCountVo.java index b56f1294..737e786e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/TopCountVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/TopCountVo.java @@ -15,7 +15,7 @@ import java.io.Serializable; public class TopCountVo implements Serializable { private Integer lookCount; private Integer shareCount; - private Integer userCount; + private Long userCount; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainQueryVo.java index 57e606e9..ba54f0bd 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/activity/vo/YxStoreBargainQueryVo.java @@ -111,7 +111,7 @@ public class YxStoreBargainQueryVo implements Serializable { private Integer share; @ApiModelProperty(value = "砍价产品参与人数") - private Integer people; + private Long people; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java b/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java index b3d0e6bb..a45009fc 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/cart/vo/YxStoreCartQueryVo.java @@ -72,6 +72,6 @@ public class YxStoreCartQueryVo implements Serializable { private String unique; @ApiModelProperty(value = "是否评价") - private Integer isReply; + private Long isReply; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/OrderTimeDataDto.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/OrderTimeDataDto.java index dedb66bd..2061187a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/OrderTimeDataDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/dto/OrderTimeDataDto.java @@ -26,8 +26,8 @@ public class OrderTimeDataDto implements Serializable { private Integer lastWeekCount;//上周 private Double lastWeekPrice; //上周 - private Integer userCount; - private Integer orderCount; + private Long userCount; + private Long orderCount; private Double priceCount; - private Integer goodsCount; + private Long goodsCount; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 05eed878..a936206f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -75,9 +75,9 @@ import co.yixiang.modules.user.service.YxUserLevelService; import co.yixiang.modules.user.service.YxUserService; import co.yixiang.modules.user.service.dto.YxUserDto; import co.yixiang.modules.user.vo.YxUserQueryVo; -import co.yixiang.tools.domain.AlipayConfig; -import co.yixiang.tools.domain.vo.TradeVo; -import co.yixiang.tools.service.AlipayConfigService; +import co.yixiang.modules.tools.domain.AlipayConfig; +import co.yixiang.modules.tools.domain.vo.TradeVo; +import co.yixiang.modules.tools.service.AlipayConfigService; import co.yixiang.utils.FileUtil; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtils; @@ -597,7 +597,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpllambdaQuery() + Long count = productReplyService.count(Wrappers.lambdaQuery() .eq(YxStoreProductReply::getOid, orderCartInfo.getOid()) .eq(YxStoreProductReply::getProductId, orderCartInfo.getProductId())); if (count > 0) { @@ -618,9 +618,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl().eq(YxStoreProductReply::getOid, orderCartInfo.getOid())); + Long replyCount = productReplyService.count(new LambdaQueryWrapper().eq(YxStoreProductReply::getOid, orderCartInfo.getOid())); //购买商品数量 - int cartCount = storeOrderCartInfoService.count(new LambdaQueryWrapper().eq(YxStoreOrderCartInfo::getOid, orderCartInfo.getOid())); + Long cartCount = storeOrderCartInfoService.count(new LambdaQueryWrapper().eq(YxStoreOrderCartInfo::getOid, orderCartInfo.getOid())); if (replyCount == cartCount) { YxStoreOrder storeOrder = new YxStoreOrder(); storeOrder.setStatus(OrderInfoEnum.STATUS_3.getValue()); @@ -1316,7 +1316,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperThree = new LambdaQueryWrapper<>(); @@ -1339,7 +1339,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperFour = new LambdaQueryWrapper<>(); @@ -1349,7 +1349,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperFive = new LambdaQueryWrapper<>(); @@ -1359,7 +1359,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperSix = new LambdaQueryWrapper<>(); @@ -1369,7 +1369,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl wrapperSeven = new LambdaQueryWrapper<>(); @@ -1379,7 +1379,7 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpllambdaQuery() + Long count = shippingTemplatesFreeService.count(Wrappers.lambdaQuery() .eq(YxShippingTemplatesFree::getTempId, mapValue.getTempId()) .eq(YxShippingTemplatesFree::getCityId, mapValue.getCityId()) .le(YxShippingTemplatesFree::getNumber, mapValue.getNumber()) diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java b/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java index 474b32ba..e0fae038 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/service/mapper/StoreOrderMapper.java @@ -60,15 +60,15 @@ public interface StoreOrderMapper extends CoreMapper { Double sumTotalPrice(); @Select("SELECT IFNULL(sum(pay_price),0) as num," + - "DATE_FORMAT(create_time, '%m-%d') as time " + + "DATE_FORMAT(ANY_VALUE(create_time), '%m-%d') as time " + " FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= #{time}" + - " GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') " + - " ORDER BY create_time ASC") + " GROUP BY DATE_FORMAT(ANY_VALUE(create_time),'%Y-%m-%d') " + + " ORDER BY ANY_VALUE(create_time) ASC") List chartList(@Param("time") Date time); @Select("SELECT count(id) as num," + - "DATE_FORMAT(create_time, '%m-%d') as time " + + "DATE_FORMAT(ANY_VALUE(create_time), '%m-%d') as time " + " FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= #{time}" + - " GROUP BY DATE_FORMAT(create_time,'%Y-%m-%d') " + - " ORDER BY create_time ASC") + " GROUP BY DATE_FORMAT(ANY_VALUE(create_time),'%Y-%m-%d') " + + " ORDER BY ANY_VALUE(create_time) ASC") List chartListT(@Param("time") Date time); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ShoperOrderTimeDataVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ShoperOrderTimeDataVo.java index 68aa5f1c..5d824766 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ShoperOrderTimeDataVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/ShoperOrderTimeDataVo.java @@ -16,22 +16,22 @@ public class ShoperOrderTimeDataVo implements Serializable { private Double todayPrice; /**今日订单数*/ - private Integer todayCount; + private Long todayCount; /**昨日成交额*/ private Double proPrice; /**昨日订单数*/ - private Integer proCount; + private Long proCount; /**本月成交额*/ private Double monthPrice; /**本月订单数*/ - private Integer monthCount; + private Long monthCount; /**上周订单数*/ - private Integer lastWeekCount; + private Long lastWeekCount; /**上周成交额*/ private Double lastWeekPrice; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java index 63a1fec9..0e2e9cef 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/order/vo/UserOrderCountVo.java @@ -23,7 +23,7 @@ public class UserOrderCountVo implements Serializable { /**订单支付没有退款 数量*/ @ApiModelProperty(value = "订单支付没有退款数量") - private Integer orderCount; + private Long orderCount; /**订单支付没有退款 支付总金额*/ @ApiModelProperty(value = "订单支付没有退款支付总金额") @@ -31,25 +31,25 @@ public class UserOrderCountVo implements Serializable { /**订单待支付 数量*/ @ApiModelProperty(value = "订单待支付数量") - private Integer unpaidCount; + private Long unpaidCount; /**订单待发货数量*/ @ApiModelProperty(value = "订单待发货数量") - private Integer unshippedCount; + private Long unshippedCount; /**订单待收货数量*/ @ApiModelProperty(value = "订单待收货数量") - private Integer receivedCount; + private Long receivedCount; /**订单待评价数量*/ @ApiModelProperty(value = "订单待评价数量") - private Integer evaluatedCount; + private Long evaluatedCount; /**订单已完成数量*/ @ApiModelProperty(value = "订单已完成数量") - private Integer completeCount; + private Long completeCount; /**订单退款数量*/ @ApiModelProperty(value = "订单退款数量") - private Integer refundCount; + private Long refundCount; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java index 187cdf84..55fa2992 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/YxStoreProductReplyService.java @@ -58,11 +58,11 @@ public interface YxStoreProductReplyService extends BaseService getReplyList(long productId,int type,int page, int limit); - int getInfoCount(Integer oid, String unique); + Long getInfoCount(Integer oid, String unique); - int productReplyCount(long productId); + Long productReplyCount(long productId); - int replyCount(String unique); + Long replyCount(String unique); String replyPer(long productId); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrResultServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrResultServiceImpl.java index 8e797758..7fe6e4fc 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrResultServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrResultServiceImpl.java @@ -45,7 +45,7 @@ public class YxStoreProductAttrResultServiceImpl extends BaseServiceImpllambdaQuery() + long count = this.count(Wrappers.lambdaQuery() .eq(YxStoreProductAttrResult::getProductId,productId)); if(count > 0) { this.remove(Wrappers.lambdaQuery() diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java index f03d28bd..94df5cfa 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductAttrServiceImpl.java @@ -103,6 +103,14 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImpl stringList = new ArrayList<>(productFormatDto.getDetail().values()); Collections.sort(stringList); + YxStoreProductAttrValue oldAttrValue = storeProductAttrValueService.getOne(new LambdaQueryWrapper() + .eq(YxStoreProductAttrValue::getSku, productFormatDto.getSku()) + .eq(YxStoreProductAttrValue::getProductId, productId)); + + String unique = IdUtil.simpleUUID(); + if (Objects.nonNull(oldAttrValue)) { + unique = oldAttrValue.getUnique(); + } YxStoreProductAttrValue oldAttrValue = storeProductAttrValueService.getOne(new LambdaQueryWrapper() .eq(YxStoreProductAttrValue::getSku, productFormatDto.getSku()) @@ -135,7 +143,6 @@ public class YxStoreProductAttrServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxStoreProductRelation::getUid,uid) .eq(YxStoreProductRelation::getType,"collect") diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java index 3cf4e4e5..4f0d653f 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductReplyServiceImpl.java @@ -73,25 +73,25 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpllambdaQuery() + Long goodCount = this.baseMapper.selectCount(Wrappers.lambdaQuery() .eq(YxStoreProductReply::getProductId,productId) .eq(YxStoreProductReply::getProductScore,5)); //中评 - int inCount = this.baseMapper.selectCount(Wrappers.lambdaQuery() + Long inCount = this.baseMapper.selectCount(Wrappers.lambdaQuery() .eq(YxStoreProductReply::getProductId,productId) .lt(YxStoreProductReply::getProductScore,5) .gt(YxStoreProductReply::getProductScore,2)); //差评 - int poorCount = this.baseMapper.selectCount(Wrappers.lambdaQuery() + Long poorCount = this.baseMapper.selectCount(Wrappers.lambdaQuery() .eq(YxStoreProductReply::getProductId,productId) .lt(YxStoreProductReply::getProductScore,2)); @@ -185,14 +185,14 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(YxStoreProductReply::getUnique,unique).eq(YxStoreProductReply::getOid,oid); + public Long getInfoCount(Integer oid, String unique) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(YxStoreProductReply::getUnique, unique).eq(YxStoreProductReply::getOid, oid); return this.baseMapper.selectCount(wrapper); } @Override - public int productReplyCount(long productId) { + public Long productReplyCount(long productId) { return this.baseMapper.selectCount(Wrappers.lambdaQuery() .eq(YxStoreProductReply::getProductId,productId)); @@ -200,7 +200,7 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(YxStoreProductReply::getUnique,unique); return this.baseMapper.selectCount(wrapper); @@ -217,8 +217,8 @@ public class YxStoreProductReplyServiceImpl extends BaseServiceImpl 0){ return ""+NumberUtil.round(NumberUtil.mul(NumberUtil.div(productScoreCount,count),100),2); } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java index ed287723..5f1be85a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/product/service/impl/YxStoreProductServiceImpl.java @@ -325,7 +325,7 @@ public class YxStoreProductServiceImpl extends BaseServiceImpllambdaQuery().eq(YxStoreOrder::getOrderId, key)); - yxStoreOrder.setStatus(OrderInfoEnum.STATUS_0.getValue()); + // yxStoreOrder.setStatus(OrderInfoEnum.STATUS_0.getValue()); yxStoreOrder.setRefundStatus(OrderInfoEnum.STATUS_0.getValue()); storeOrderMapper.updateById(yxStoreOrder); @@ -323,7 +323,7 @@ public class StoreAfterSalesServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(YxSystemConfig::getMenuName,name); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(YxSystemConfig::getMenuName, name); YxSystemConfig systemConfig = this.baseMapper.selectOne(wrapper); - if(systemConfig == null) { + if (systemConfig == null) { return ""; } return systemConfig.getValue(); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java index fe0ad49e..17fb1b7b 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/template/service/impl/YxShippingTemplatesServiceImpl.java @@ -142,7 +142,7 @@ public class YxShippingTemplatesServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxShippingTemplatesFree::getTempId,tempId)); if(count > 0) { @@ -194,7 +194,7 @@ public class YxShippingTemplatesServiceImpl extends BaseServiceImpllambdaQuery() .eq(YxShippingTemplatesRegion::getTempId,tempId)); if(count > 0) { diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java index 0dfdf3f5..c417af2e 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/domain/YxUser.java @@ -147,7 +147,7 @@ public class YxUser extends BaseDomain { /** 下级人数 */ - private Integer spreadCount; + private Long spreadCount; diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java index a659a7fb..eaa38225 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxSystemUserTaskService.java @@ -29,11 +29,12 @@ public interface YxSystemUserTaskService extends BaseService{ /** * 获取已经完成的任务数量 + * * @param levelId 等级id - * @param uid uid + * @param uid uid * @return int */ - int getTaskComplete(int levelId,Long uid); + Long getTaskComplete(int levelId,Long uid); /** * 获取等级会员任务列表 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java index cac4c90d..693b3cf7 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserBillService.java @@ -12,7 +12,6 @@ import co.yixiang.common.service.BaseService; import co.yixiang.modules.user.domain.YxUserBill; import co.yixiang.modules.user.service.dto.YxUserBillDto; import co.yixiang.modules.user.service.dto.YxUserBillQueryCriteria; -import co.yixiang.modules.user.vo.BillVo; import co.yixiang.modules.user.vo.YxUserBillQueryVo; import org.springframework.data.domain.Pageable; @@ -53,7 +52,7 @@ public interface YxUserBillService extends BaseService{ void income(Long uid,String title,String category,String type,double number, double balance,String mark,String linkid); - int cumulativeAttendance(Long uid); + Long cumulativeAttendance(Long uid); /** * 获取推广订单列表 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java index 5951d658..4092f9ab 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/YxUserService.java @@ -47,10 +47,11 @@ public interface YxUserService extends BaseService{ /** * 统计分销人员 + * * @param uid uid * @return map */ - Map getSpreadCount(Long uid); + Map getSpreadCount(Long uid); /** * 获取我的分销下人员列表 diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/TaskDto.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/TaskDto.java index 4d0c0195..8d13a710 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/TaskDto.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/dto/TaskDto.java @@ -15,6 +15,6 @@ import java.util.List; @Data public class TaskDto implements Serializable { private List list; - private Integer reachCount; + private Long reachCount; private List task; } diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java index 31e7bb21..26d139ef 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxSystemUserTaskServiceImpl.java @@ -82,12 +82,13 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl list = this.lambdaQuery() .eq(YxSystemUserTask::getLevelId,levelId) .eq(YxSystemUserTask::getIsShow,ShopCommonEnum.SHOW_1.getValue()) @@ -95,10 +96,10 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl taskIds = list.stream().map(YxSystemUserTask::getId) .collect(Collectors.toList()); if(taskIds.isEmpty()) { - return 0; + return 0L; } - int count = yxUserTaskFinishMapper.selectCount(Wrappers.lambdaQuery() + Long count = yxUserTaskFinishMapper.selectCount(Wrappers.lambdaQuery() .in(YxUserTaskFinish::getTaskId,taskIds) .eq(YxUserTaskFinish::getUid,uid)); return count; @@ -136,7 +137,7 @@ public class YxSystemUserTaskServiceImpl extends BaseServiceImpl tidyTask(List task,Long uid) { for (YxSystemUserTaskQueryVo taskQueryVo : task) { - int count = userTaskFinishService.lambdaQuery() + Long count = userTaskFinishService.lambdaQuery() .eq(YxUserTaskFinish::getTaskId,taskQueryVo.getId()) .eq(YxUserTaskFinish::getUid,uid) .count(); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java index ccff6e36..a089e89a 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserBillServiceImpl.java @@ -41,7 +41,6 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.math.BigDecimal; import java.util.*; -import java.util.stream.Collectors; /** @@ -114,11 +113,12 @@ public class YxUserBillServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(YxUserBill::getUid,uid).eq(YxUserBill::getCategory,"integral") .eq(YxUserBill::getType,"sign").eq(YxUserBill::getPm,1); @@ -142,7 +142,7 @@ public class YxUserBillServiceImpl extends BaseServiceImpl pageModel = new Page<>(page, limit); List list = yxUserBillMapper.getBillOrderList(wrapper, pageModel); - int count = yxUserBillMapper.selectCount(Wrappers.lambdaQuery() + Long count = yxUserBillMapper.selectCount(Wrappers.lambdaQuery() .eq(YxUserBill::getUid, uid) .eq(YxUserBill::getType, BillDetailEnum.TYPE_2.getValue()) .eq(YxUserBill::getCategory, BillDetailEnum.CATEGORY_1.getValue())); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java index c181f0e1..76f377bb 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserLevelServiceImpl.java @@ -72,7 +72,7 @@ public class YxUserLevelServiceImpl extends BaseServiceImpl imple /** * 统计分销人员 + * * @param uid uid * @return map */ @Override - public Map getSpreadCount(Long uid) { - int countOne = yxUserMapper.selectCount(Wrappers.lambdaQuery() + public Map getSpreadCount(Long uid) { + Long countOne = yxUserMapper.selectCount(Wrappers.lambdaQuery() .eq(YxUser::getSpreadUid,uid)); - int countTwo = 0; + Long countTwo = 0L; List userList = yxUserMapper.selectList((Wrappers.lambdaQuery() .eq(YxUser::getSpreadUid,uid))); List userIds = userList.stream().map(YxUser::getUid) @@ -215,7 +216,7 @@ public class YxUserServiceImpl extends BaseServiceImpl imple .in(YxUser::getSpreadUid,userIds)); } - Map map = new LinkedHashMap<>(2); + Map map = new LinkedHashMap<>(2); map.put("first",countOne); //一级 map.put("second",countTwo);//二级 @@ -556,7 +557,7 @@ public class YxUserServiceImpl extends BaseServiceImpl imple * @param yxUser user */ private void setUserSpreadCount(YxUser yxUser) { - int count = yxUserMapper.selectCount(Wrappers.lambdaQuery() + Long count = yxUserMapper.selectCount(Wrappers.lambdaQuery() .eq(YxUser::getSpreadUid,yxUser.getUid())); yxUser.setSpreadCount(count); yxUserMapper.updateById(yxUser); diff --git a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java index f4c5f84e..99375435 100644 --- a/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java +++ b/yshop-mall/src/main/java/co/yixiang/modules/user/service/impl/YxUserSignServiceImpl.java @@ -87,8 +87,10 @@ public class YxUserSignServiceImpl extends BaseServiceImpl (list.size() - 1)){ userSignNum = 0; @@ -99,7 +101,7 @@ public class YxUserSignServiceImpl extends BaseServiceImpl map : list) { if(index == userSignNum){ - signNumber = Integer.valueOf(map.get("sign_num").toString()); + signNumber = Integer.parseInt(map.get("sign_num").toString()); break; } index++; @@ -162,7 +164,7 @@ public class YxUserSignServiceImpl extends BaseServiceImpl 0) { @@ -199,7 +201,7 @@ public class YxUserSignServiceImpl extends BaseServiceImpl yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -16,7 +16,7 @@ co.yixiang yshop-mall - 3.2 + 3.3 diff --git a/yshop-mproot/pom.xml b/yshop-mproot/pom.xml index 13d687df..e82b0d60 100644 --- a/yshop-mproot/pom.xml +++ b/yshop-mproot/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 MyBatisPlus模块 @@ -13,7 +13,7 @@ 0.10.6 - 3.4.2 + 3.5.1 @@ -26,7 +26,7 @@ com.github.pagehelper pagehelper-spring-boot-starter - 1.2.5 + 1.4.2 mybatis-spring diff --git a/yshop-shop/pom.xml b/yshop-shop/pom.xml index f9cba5dc..9d938852 100644 --- a/yshop-shop/pom.xml +++ b/yshop-shop/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -20,7 +20,7 @@ co.yixiang yshop-weixin - 3.2 + 3.3 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java index 9d91a777..a7da1827 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.ObjectUtil; import co.yixiang.api.YshopException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreBargain; import co.yixiang.modules.activity.service.YxStoreBargainService; import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java index 0d8fdec8..43a89dd7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java @@ -10,7 +10,7 @@ import cn.hutool.core.util.ObjectUtil; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.SpecTypeEnum; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreCombination; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.dto.YxStoreCombinationDto; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java index 47c73b25..ac1c2775 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java @@ -8,7 +8,7 @@ package co.yixiang.modules.activity.rest; import cn.hutool.core.util.StrUtil; import co.yixiang.api.YshopException; import co.yixiang.enums.CouponEnum; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreCoupon; import co.yixiang.modules.activity.service.YxStoreCouponService; import co.yixiang.modules.activity.service.dto.YxStoreCouponQueryCriteria; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java index b07ced09..0bb32407 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java @@ -5,7 +5,7 @@ */ package co.yixiang.modules.activity.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreCouponIssue; import co.yixiang.modules.activity.service.YxStoreCouponIssueService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueQueryCriteria; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java index eea77cdb..9013c6e2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.activity.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.service.YxStoreCouponIssueUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserQueryCriteria; import co.yixiang.modules.aop.ForbidSubmit; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java index 2813716c..14b35b7b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.activity.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.service.YxStoreCouponUserService; import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria; import io.swagger.annotations.Api; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java index cc595d3f..3fb1d90a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java @@ -5,7 +5,7 @@ */ package co.yixiang.modules.activity.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.service.YxStorePinkService; import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import io.swagger.annotations.Api; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java index 423ea51f..50d7b154 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java @@ -9,7 +9,7 @@ import cn.hutool.core.util.ObjectUtil; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.SpecTypeEnum; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxStoreSeckill; import co.yixiang.modules.activity.service.YxStoreSeckillService; import co.yixiang.modules.activity.service.dto.YxStoreSeckillDto; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java index 58f20377..1691a4f1 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.activity.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.modules.activity.service.YxUserExtractService; import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java b/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java index a824109f..31fb34ce 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/canvas/rest/StoreCanvasController.java @@ -14,13 +14,13 @@ import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.LocalStorageService; -import co.yixiang.tools.service.QiNiuService; -import co.yixiang.tools.service.dto.LocalStorageDto; +import co.yixiang.modules.tools.domain.QiniuContent; +import co.yixiang.modules.tools.service.LocalStorageService; +import co.yixiang.modules.tools.service.QiNiuService; +import co.yixiang.modules.tools.service.dto.LocalStorageDto; import co.yixiang.utils.RedisUtils; import lombok.AllArgsConstructor; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.canvas.domain.StoreCanvas; import co.yixiang.modules.canvas.service.StoreCanvasService; import org.springframework.http.HttpStatus; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java index 657fd4e7..fd6be2c3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/category/rest/StoreCategoryController.java @@ -11,7 +11,7 @@ package co.yixiang.modules.category.rest; import cn.hutool.core.util.StrUtil; import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.category.domain.YxStoreCategory; import co.yixiang.modules.category.service.YxStoreCategoryService; @@ -143,14 +143,14 @@ public class StoreCategoryController { * @param id 分类id */ private void delCheck(Integer id){ - int count = yxStoreCategoryService.lambdaQuery() + Long count = yxStoreCategoryService.lambdaQuery() .eq(YxStoreCategory::getPid,id) .count(); if(count > 0) { throw new YshopException("请先删除子分类"); } - int countP = yxStoreProductService.lambdaQuery() + Long countP = yxStoreProductService.lambdaQuery() .eq(YxStoreProduct::getCateId,id) .count(); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java b/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java index 22bcb8a2..3b229090 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/customer/rest/YxStoreCustomerController.java @@ -13,7 +13,7 @@ import co.yixiang.exception.BadRequestException; import co.yixiang.modules.aop.ForbidSubmit; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.AllArgsConstructor; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.customer.domain.YxStoreCustomer; import co.yixiang.modules.customer.service.YxStoreCustomerService; import co.yixiang.modules.customer.service.dto.YxStoreCustomerQueryCriteria; @@ -64,7 +64,7 @@ public class YxStoreCustomerController { @ApiOperation("新增customer") @PreAuthorize("@el.check('admin','yxStoreCustomer:add')") public ResponseEntity create(@Validated @RequestBody YxStoreCustomer resources){ - int count = yxStoreCustomerService.count(new LambdaQueryWrapper().eq(YxStoreCustomer::getOpenId, resources.getOpenId())); + Long count = yxStoreCustomerService.count(new LambdaQueryWrapper().eq(YxStoreCustomer::getOpenId, resources.getOpenId())); if (count > 0) { throw new BadRequestException("当前用户已存在，请勿重复提交"); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java index b3c3fe43..437e4dd3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/order/rest/StoreOrderController.java @@ -19,7 +19,7 @@ import co.yixiang.enums.OrderLogEnum; import co.yixiang.enums.ShipperCodeEnum; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.order.domain.YxStoreOrder; import co.yixiang.modules.order.domain.YxStoreOrderStatus; @@ -27,9 +27,9 @@ import co.yixiang.modules.order.param.ExpressParam; import co.yixiang.modules.order.service.YxStoreOrderService; import co.yixiang.modules.order.service.YxStoreOrderStatusService; import co.yixiang.modules.order.service.dto.*; -import co.yixiang.tools.express.ExpressService; -import co.yixiang.tools.express.config.ExpressAutoConfiguration; -import co.yixiang.tools.express.dao.ExpressInfo; +import co.yixiang.modules.tools.express.ExpressService; +import co.yixiang.modules.tools.express.config.ExpressAutoConfiguration; +import co.yixiang.modules.tools.express.dao.ExpressInfo; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.Api; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java index 85309a8b..94f5b829 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductController.java @@ -13,11 +13,10 @@ import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.ShopCommonEnum; import co.yixiang.enums.SpecTypeEnum; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.category.domain.YxStoreCategory; import co.yixiang.modules.category.service.YxStoreCategoryService; -import co.yixiang.modules.category.service.dto.YxStoreCategoryDto; import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.domain.YxStoreProductAttrResult; import co.yixiang.modules.product.domain.YxStoreProductAttrValue; @@ -35,8 +34,6 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; -import com.google.common.collect.Maps; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.BeanUtils; @@ -45,7 +42,6 @@ import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java index d2f8a853..7ef5d9a6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductReplyController.java @@ -9,7 +9,7 @@ package co.yixiang.modules.product.rest; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.product.domain.YxStoreProductReply; import co.yixiang.modules.product.service.YxStoreProductReplyService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java index b5190d9a..cdc8f615 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/product/rest/StoreProductRuleController.java @@ -9,11 +9,10 @@ package co.yixiang.modules.product.rest; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.product.domain.YxStoreProductRule; import co.yixiang.modules.product.service.YxStoreProductRuleService; -import co.yixiang.modules.product.service.dto.YxStoreProductRuleDto; import co.yixiang.modules.product.service.dto.YxStoreProductRuleQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java b/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java index 2b547bd4..9a01660e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/sales/StoreAfterSalesController.java @@ -1,9 +1,7 @@ package co.yixiang.modules.sales; -import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.domain.PageResult; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.mp.service.WeixinPayService; import co.yixiang.modules.sales.domain.StoreAfterSales; import co.yixiang.modules.sales.param.SalesCheckDto; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java index 7a48b338..6d1b41f3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.shop.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.order.domain.YxExpress; import co.yixiang.modules.order.service.YxExpressService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java index 3c9ef515..e6cc5d08 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java @@ -9,7 +9,7 @@ package co.yixiang.modules.shop.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxMaterial; import co.yixiang.modules.shop.service.YxMaterialService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java index 239b2b54..4f791d17 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.shop.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxMaterialGroup; import co.yixiang.modules.shop.service.YxMaterialGroupService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java index 1a606514..60702150 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java @@ -11,7 +11,7 @@ package co.yixiang.modules.shop.rest; import cn.hutool.core.util.ObjectUtil; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemConfig; import co.yixiang.modules.shop.service.YxSystemConfigService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java index 6a331ae1..f41574ad 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java @@ -9,7 +9,7 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import co.yixiang.constant.ShopConstants; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemGroupData; import co.yixiang.modules.shop.service.YxSystemGroupDataService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java index 72da1ee3..8cbfe7fa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java @@ -5,20 +5,14 @@ */ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpUtil; -import cn.hutool.json.JSONUtil; -import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; -import co.yixiang.utils.RedisUtil; -import co.yixiang.utils.ShopKeyUtils; import co.yixiang.utils.location.GetTencentLocationVO; import co.yixiang.utils.location.LocationUtils; import com.alibaba.fastjson.JSON; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java index 127d491c..e16eaaaf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java @@ -9,7 +9,7 @@ package co.yixiang.modules.shop.rest; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxAppVersionController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxAppVersionController.java index 6af4a770..9fb371f4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxAppVersionController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxAppVersionController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.shop.rest; import co.yixiang.domain.PageResult; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxAppVersion; import co.yixiang.modules.shop.service.YxAppVersionService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductRelationController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductRelationController.java index 639b87ab..e9d15303 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductRelationController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreProductRelationController.java @@ -11,7 +11,7 @@ import java.util.Arrays; import co.yixiang.dozer.service.IGenerator; import co.yixiang.modules.aop.ForbidSubmit; import lombok.AllArgsConstructor; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.product.domain.YxStoreProductRelation; import co.yixiang.modules.product.service.YxStoreProductRelationService; import co.yixiang.modules.product.service.dto.YxStoreProductRelationQueryCriteria; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java index f54c4d16..ef34ab4c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/template/rest/ShippingTemplatesController.java @@ -11,7 +11,7 @@ package co.yixiang.modules.template.rest; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.product.domain.YxStoreProduct; import co.yixiang.modules.product.service.YxStoreProductService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java index 4a497319..02e2dc29 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/MemberController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.user.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.user.domain.YxUser; import co.yixiang.modules.user.service.YxUserService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java index 1cffd7d4..9fa1af3c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserLevelController.java @@ -5,7 +5,7 @@ */ package co.yixiang.modules.user.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.shop.domain.YxSystemUserLevel; import co.yixiang.modules.user.service.YxSystemUserLevelService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java index 49bab01a..fc1932ec 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/SystemUserTaskController.java @@ -5,7 +5,7 @@ */ package co.yixiang.modules.user.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.user.domain.YxSystemUserTask; import co.yixiang.modules.user.service.YxSystemUserTaskService; import co.yixiang.modules.user.service.dto.YxSystemUserTaskQueryCriteria; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java index 40f5c09d..9b1df9e6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserBillController.java @@ -8,7 +8,7 @@ */ package co.yixiang.modules.user.rest; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.user.service.YxUserBillService; import co.yixiang.modules.user.service.dto.YxUserBillQueryCriteria; import io.swagger.annotations.Api; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java index 3838ad69..52ae36f9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/user/rest/UserRechargeController.java @@ -6,7 +6,7 @@ package co.yixiang.modules.user.rest; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.user.service.YxUserRechargeService; import co.yixiang.modules.user.service.dto.YxUserRechargeDto; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java index ed8904c0..0f609ccc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveController.java @@ -10,7 +10,7 @@ package co.yixiang.modules.wechat.rest; import co.yixiang.constant.ShopConstants; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.mp.domain.YxWechatLive; import co.yixiang.modules.mp.service.YxWechatLiveService; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java index 50a650ee..ed39c15d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/wechat/rest/YxWechatLiveGoodsController.java @@ -9,7 +9,7 @@ package co.yixiang.modules.wechat.rest; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; +import co.yixiang.modules.logging.aop.log.Log; import co.yixiang.modules.aop.ForbidSubmit; import co.yixiang.modules.mp.domain.YxWechatLiveGoods; import co.yixiang.modules.mp.service.YxWechatLiveGoodsService; diff --git a/yshop-tools/pom.xml b/yshop-tools/pom.xml index 5ccb3f84..d6c1dac0 100644 --- a/yshop-tools/pom.xml +++ b/yshop-tools/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -23,7 +23,7 @@ co.yixiang yshop-logging - 3.2 + 3.3 diff --git a/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/config/MultipartConfig.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/config/MultipartConfig.java index d54e4929..8869b2d6 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/config/MultipartConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/config/MultipartConfig.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.config; +package co.yixiang.modules.tools.config; import org.springframework.boot.web.servlet.MultipartConfigFactory; import org.springframework.context.annotation.Bean; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/AlipayConfig.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/AlipayConfig.java index facbe84c..73cd74af 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/AlipayConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/AlipayConfig.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/EmailConfig.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/EmailConfig.java index fa3b2c8d..db483449 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/EmailConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/EmailConfig.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/LocalStorage.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/LocalStorage.java index bf5a7c88..37926643 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/LocalStorage.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/LocalStorage.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/Picture.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/Picture.java index 1631e223..26e4da7a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/Picture.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/Picture.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuConfig.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuConfig.java index 5cfe3f5f..d17928d8 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuConfig.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuConfig.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuContent.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuContent.java index 0ae1577d..ef8629a7 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/QiniuContent.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/QiniuContent.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/VerificationCode.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/VerificationCode.java index ecd08b36..8a4ecc8f 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/VerificationCode.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/VerificationCode.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain; +package co.yixiang.modules.tools.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/EmailVo.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/EmailVo.java index 1a286960..4311e983 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/EmailVo.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/EmailVo.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain.vo; +package co.yixiang.modules.tools.domain.vo; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/TradeVo.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/TradeVo.java index 80ffaa4b..bea53a47 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/domain/vo/TradeVo.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/domain/vo/TradeVo.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.domain.vo; +package co.yixiang.modules.tools.domain.vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/ExpressService.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/express/ExpressService.java index cb062169..8a202909 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/ExpressService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/ExpressService.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.express; +package co.yixiang.modules.tools.express; import cn.hutool.http.HttpUtil; import co.yixiang.enums.ShipperCodeEnum; -import co.yixiang.tools.express.config.ExpressProperties; -import co.yixiang.tools.express.dao.ExpressInfo; +import co.yixiang.modules.tools.express.dao.ExpressInfo; +import co.yixiang.modules.tools.express.config.ExpressProperties; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -63,7 +63,7 @@ public class ExpressService implements Serializable { * @param ShipperCode * @return */ - public ExpressInfo getExpressInfo(String OrderCode,String ShipperCode, String LogisticCode,String lastFourNumber) { + public ExpressInfo getExpressInfo(String OrderCode, String ShipperCode, String LogisticCode, String lastFourNumber) { try { String result = getOrderTracesByJson(OrderCode,ShipperCode, LogisticCode,lastFourNumber); ObjectMapper objMap = new ObjectMapper(); diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressAutoConfiguration.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressAutoConfiguration.java index 2c440449..1d09b9e0 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressAutoConfiguration.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressAutoConfiguration.java @@ -6,12 +6,12 @@ * 购买后可获得全部源代码（禁止转卖、分享、上传到码云、github等开源平台） * 一经发现盗用、分享等行为，将追究法律责任，后果自负 */ -package co.yixiang.tools.express.config; +package co.yixiang.modules.tools.express.config; import co.yixiang.constant.ShopConstants; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.tools.express.ExpressService; +import co.yixiang.modules.tools.express.ExpressService; import co.yixiang.utils.RedisUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressProperties.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressProperties.java index 877d8c83..a992653d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/config/ExpressProperties.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/config/ExpressProperties.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.express.config; +package co.yixiang.modules.tools.express.config; import java.util.ArrayList; import java.util.List; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/ExpressInfo.java similarity index 96% rename from yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/ExpressInfo.java index b4f0e871..c4004088 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/dao/ExpressInfo.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/ExpressInfo.java @@ -6,7 +6,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.express.dao; +package co.yixiang.modules.tools.express.dao; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/Traces.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/Traces.java index 8ba2403d..c617834b 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/express/dao/Traces.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/express/dao/Traces.java @@ -6,7 +6,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.express.dao; +package co.yixiang.modules.tools.express.dao; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/AliPayController.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/AliPayController.java index 584de796..a18077d4 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/AliPayController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/AliPayController.java @@ -3,15 +3,15 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; import co.yixiang.annotation.AnonymousAccess; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.tools.domain.AlipayConfig; -import co.yixiang.tools.domain.vo.TradeVo; -import co.yixiang.tools.service.AlipayConfigService; -import co.yixiang.tools.utils.AliPayStatusEnum; -import co.yixiang.tools.utils.AlipayUtils; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.tools.domain.AlipayConfig; +import co.yixiang.modules.tools.domain.vo.TradeVo; +import co.yixiang.modules.tools.service.AlipayConfigService; +import co.yixiang.modules.tools.utils.AliPayStatusEnum; +import co.yixiang.modules.tools.utils.AlipayUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/EmailController.java similarity index 87% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/EmailController.java index 0fe415bd..594c6044 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/EmailController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/EmailController.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.tools.domain.EmailConfig; -import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.tools.service.EmailConfigService; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.tools.domain.EmailConfig; +import co.yixiang.modules.tools.domain.vo.EmailVo; +import co.yixiang.modules.tools.service.EmailConfigService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.http.HttpStatus; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/LocalStorageController.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/LocalStorageController.java index f3f052f6..ff0410ba 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/LocalStorageController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/LocalStorageController.java @@ -3,13 +3,13 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.tools.service.LocalStorageService; -import co.yixiang.tools.service.dto.LocalStorageDto; -import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.tools.service.LocalStorageService; +import co.yixiang.modules.tools.service.dto.LocalStorageDto; +import co.yixiang.modules.tools.service.dto.LocalStorageQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/PictureController.java similarity index 90% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/PictureController.java index 4444ca7f..9efd04d6 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/PictureController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/PictureController.java @@ -3,14 +3,14 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.tools.domain.Picture; -import co.yixiang.tools.service.PictureService; -import co.yixiang.tools.service.dto.PictureDto; -import co.yixiang.tools.service.dto.PictureQueryCriteria; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.tools.service.dto.PictureDto; +import co.yixiang.modules.tools.domain.Picture; +import co.yixiang.modules.tools.service.PictureService; +import co.yixiang.modules.tools.service.dto.PictureQueryCriteria; import co.yixiang.utils.SecurityUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/QiniuController.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/QiniuController.java index c166bc27..73b84f09 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/QiniuController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/QiniuController.java @@ -3,13 +3,13 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; -import co.yixiang.logging.aop.log.Log; -import co.yixiang.tools.domain.QiniuConfig; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.QiNiuService; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.logging.aop.log.Log; +import co.yixiang.modules.tools.domain.QiniuConfig; +import co.yixiang.modules.tools.domain.QiniuContent; +import co.yixiang.modules.tools.service.QiNiuService; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/UploadController.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/UploadController.java index 67210a6d..5c504f08 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/UploadController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/UploadController.java @@ -3,18 +3,17 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.api.YshopException; import co.yixiang.constant.ShopConstants; import co.yixiang.constant.SystemConfigConstants; import co.yixiang.enums.ShopCommonEnum; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.LocalStorageService; -import co.yixiang.tools.service.QiNiuService; -import co.yixiang.tools.service.dto.LocalStorageDto; +import co.yixiang.modules.tools.service.dto.LocalStorageDto; +import co.yixiang.modules.tools.domain.QiniuContent; +import co.yixiang.modules.tools.service.LocalStorageService; +import co.yixiang.modules.tools.service.QiNiuService; import co.yixiang.utils.RedisUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/VerificationCodeController.java similarity index 89% rename from yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/rest/VerificationCodeController.java index ad032c9b..4f13eec0 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/rest/VerificationCodeController.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/rest/VerificationCodeController.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.rest; +package co.yixiang.modules.tools.rest; -import co.yixiang.tools.domain.VerificationCode; -import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.tools.service.EmailConfigService; -import co.yixiang.tools.service.VerificationCodeService; +import co.yixiang.modules.tools.domain.VerificationCode; +import co.yixiang.modules.tools.domain.vo.EmailVo; +import co.yixiang.modules.tools.service.EmailConfigService; +import co.yixiang.modules.tools.service.VerificationCodeService; import co.yixiang.utils.YshopConstant; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/AlipayConfigService.java similarity index 87% rename from yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/AlipayConfigService.java index 9efee282..996146f7 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/AlipayConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/AlipayConfigService.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.tools.domain.AlipayConfig; -import co.yixiang.tools.domain.vo.TradeVo; +import co.yixiang.modules.tools.domain.AlipayConfig; +import co.yixiang.modules.tools.domain.vo.TradeVo; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/EmailConfigService.java similarity index 85% rename from yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/EmailConfigService.java index 3ff2df5d..2371d865 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/EmailConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/EmailConfigService.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.tools.domain.EmailConfig; -import co.yixiang.tools.domain.vo.EmailVo; +import co.yixiang.modules.tools.domain.EmailConfig; +import co.yixiang.modules.tools.domain.vo.EmailVo; import org.springframework.scheduling.annotation.Async; /** diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/LocalStorageService.java similarity index 87% rename from yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/LocalStorageService.java index 90d01688..bf8333f3 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/LocalStorageService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/LocalStorageService.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.tools.domain.LocalStorage; -import co.yixiang.tools.service.dto.LocalStorageDto; -import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; +import co.yixiang.modules.tools.service.dto.LocalStorageDto; +import co.yixiang.modules.tools.service.dto.LocalStorageQueryCriteria; +import co.yixiang.modules.tools.domain.LocalStorage; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/PictureService.java similarity index 87% rename from yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/PictureService.java index a2722257..3f1e1ef0 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/PictureService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/PictureService.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.tools.domain.Picture; -import co.yixiang.tools.service.dto.PictureDto; -import co.yixiang.tools.service.dto.PictureQueryCriteria; +import co.yixiang.modules.tools.service.dto.PictureDto; +import co.yixiang.modules.tools.service.dto.PictureQueryCriteria; +import co.yixiang.modules.tools.domain.Picture; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiNiuService.java similarity index 91% rename from yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiNiuService.java index 85bcf988..9a120361 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/QiNiuService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiNiuService.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; -import co.yixiang.tools.domain.QiniuConfig; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.domain.QiniuConfig; +import co.yixiang.modules.tools.domain.QiniuContent; import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuConfigService.java similarity index 83% rename from yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuConfigService.java index aaf68a30..537da97c 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuConfigService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuConfigService.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.tools.domain.QiniuConfig; -import co.yixiang.tools.service.dto.QiniuConfigDto; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.service.dto.QiniuConfigDto; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.domain.QiniuConfig; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuContentService.java similarity index 82% rename from yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuContentService.java index 9a940bce..3a089a2d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/QiniuContentService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/QiniuContentService.java @@ -3,12 +3,12 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; import co.yixiang.common.service.BaseService; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.dto.QiniuContentDto; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.service.dto.QiniuContentDto; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.domain.QiniuContent; import org.springframework.data.domain.Pageable; import javax.servlet.http.HttpServletResponse; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/VerificationCodeService.java similarity index 74% rename from yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/VerificationCodeService.java index 6ec81c41..12383820 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/VerificationCodeService.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/VerificationCodeService.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service; +package co.yixiang.modules.tools.service; -import co.yixiang.tools.domain.VerificationCode; -import co.yixiang.tools.domain.vo.EmailVo; +import co.yixiang.modules.tools.domain.VerificationCode; +import co.yixiang.modules.tools.domain.vo.EmailVo; /** * @author hupeng diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageDto.java similarity index 91% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageDto.java index 3cce15ae..0cc913bc 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageDto.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageDto.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageQueryCriteria.java similarity index 90% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageQueryCriteria.java index fe978848..d5c07f12 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/LocalStorageQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/LocalStorageQueryCriteria.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import co.yixiang.annotation.Query; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureDto.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureDto.java index b2ada73b..2afbe2a7 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureDto.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureDto.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureQueryCriteria.java similarity index 80% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureQueryCriteria.java index b15fe8c1..2d52c61b 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/PictureQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/PictureQueryCriteria.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigDto.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigDto.java index e366d3e9..7ee5f4a2 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigDto.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigDto.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigQueryCriteria.java similarity index 81% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigQueryCriteria.java index d3545a80..9259b38d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuConfigQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuConfigQueryCriteria.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentDto.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentDto.java index 3448be78..a79394b4 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentDto.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentDto.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentQueryCriteria.java similarity index 81% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentQueryCriteria.java index 52ef5aa8..23defb92 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuContentQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuContentQueryCriteria.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuQueryCriteria.java similarity index 90% rename from yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuQueryCriteria.java index 267fc09b..57d95b86 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/dto/QiniuQueryCriteria.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/dto/QiniuQueryCriteria.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.dto; +package co.yixiang.modules.tools.service.dto; import co.yixiang.annotation.Query; import lombok.Data; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/AlipayConfigServiceImpl.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/AlipayConfigServiceImpl.java index 95f70683..a9823008 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/AlipayConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/AlipayConfigServiceImpl.java @@ -3,14 +3,14 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.domain.AlipayConfig; -import co.yixiang.tools.domain.vo.TradeVo; -import co.yixiang.tools.service.AlipayConfigService; -import co.yixiang.tools.service.mapper.AlipayConfigMapper; +import co.yixiang.modules.tools.domain.AlipayConfig; +import co.yixiang.modules.tools.domain.vo.TradeVo; +import co.yixiang.modules.tools.service.AlipayConfigService; +import co.yixiang.modules.tools.service.mapper.AlipayConfigMapper; import com.alipay.api.AlipayClient; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.request.AlipayTradePagePayRequest; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/EmailConfigServiceImpl.java similarity index 92% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/EmailConfigServiceImpl.java index cf0274c6..152e3dfb 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/EmailConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/EmailConfigServiceImpl.java @@ -3,17 +3,17 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import cn.hutool.extra.mail.Mail; import cn.hutool.extra.mail.MailAccount; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.domain.EmailConfig; -import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.tools.service.EmailConfigService; -import co.yixiang.tools.service.mapper.EmailConfigMapper; +import co.yixiang.modules.tools.domain.EmailConfig; +import co.yixiang.modules.tools.domain.vo.EmailVo; +import co.yixiang.modules.tools.service.EmailConfigService; +import co.yixiang.modules.tools.service.mapper.EmailConfigMapper; import co.yixiang.utils.EncryptUtils; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/LocalStorageServiceImpl.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/LocalStorageServiceImpl.java index 0dd33a06..9cd53414 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/LocalStorageServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/LocalStorageServiceImpl.java @@ -3,20 +3,19 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import cn.hutool.core.util.ObjectUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.domain.LocalStorage; -import co.yixiang.tools.service.LocalStorageService; -import co.yixiang.tools.service.dto.LocalStorageDto; -import co.yixiang.tools.service.dto.LocalStorageQueryCriteria; -import co.yixiang.tools.service.mapper.LocalStorageMapper; +import co.yixiang.modules.tools.domain.LocalStorage; +import co.yixiang.modules.tools.service.LocalStorageService; +import co.yixiang.modules.tools.service.dto.LocalStorageDto; +import co.yixiang.modules.tools.service.dto.LocalStorageQueryCriteria; +import co.yixiang.modules.tools.service.mapper.LocalStorageMapper; import co.yixiang.utils.FileUtil; -import co.yixiang.utils.SecurityUtils; import co.yixiang.utils.StringUtils; import com.github.pagehelper.PageInfo; import org.springframework.beans.BeanUtils; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/PictureServiceImpl.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/PictureServiceImpl.java index c26eb492..1f6d5dd4 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/PictureServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/PictureServiceImpl.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpUtil; @@ -13,11 +13,11 @@ import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.domain.Picture; -import co.yixiang.tools.service.PictureService; -import co.yixiang.tools.service.dto.PictureDto; -import co.yixiang.tools.service.dto.PictureQueryCriteria; -import co.yixiang.tools.service.mapper.PictureMapper; +import co.yixiang.modules.tools.domain.Picture; +import co.yixiang.modules.tools.service.PictureService; +import co.yixiang.modules.tools.service.dto.PictureDto; +import co.yixiang.modules.tools.service.dto.PictureQueryCriteria; +import co.yixiang.modules.tools.service.mapper.PictureMapper; import co.yixiang.utils.FileUtil; import co.yixiang.utils.TranslatorUtil; import co.yixiang.utils.ValidationUtil; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiNiuServiceImpl.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiNiuServiceImpl.java index ccf2c1d8..beee1499 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiNiuServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiNiuServiceImpl.java @@ -3,17 +3,17 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.domain.QiniuConfig; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.QiNiuService; -import co.yixiang.tools.service.QiniuConfigService; -import co.yixiang.tools.service.QiniuContentService; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; -import co.yixiang.tools.utils.QiNiuUtil; +import co.yixiang.modules.tools.domain.QiniuConfig; +import co.yixiang.modules.tools.domain.QiniuContent; +import co.yixiang.modules.tools.service.QiNiuService; +import co.yixiang.modules.tools.service.QiniuConfigService; +import co.yixiang.modules.tools.service.QiniuContentService; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; +import co.yixiang.modules.tools.utils.QiNiuUtil; import co.yixiang.utils.FileUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuConfigServiceImpl.java similarity index 89% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuConfigServiceImpl.java index 74f0cabf..e0ca9c12 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuConfigServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuConfigServiceImpl.java @@ -3,16 +3,16 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.tools.domain.QiniuConfig; -import co.yixiang.tools.service.QiniuConfigService; -import co.yixiang.tools.service.dto.QiniuConfigDto; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; -import co.yixiang.tools.service.mapper.QiniuConfigMapper; +import co.yixiang.modules.tools.service.mapper.QiniuConfigMapper; +import co.yixiang.modules.tools.domain.QiniuConfig; +import co.yixiang.modules.tools.service.QiniuConfigService; +import co.yixiang.modules.tools.service.dto.QiniuConfigDto; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; import co.yixiang.utils.FileUtil; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuContentServiceImpl.java similarity index 88% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuContentServiceImpl.java index 702177ec..d98445fd 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/QiniuContentServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/QiniuContentServiceImpl.java @@ -3,16 +3,16 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.dozer.service.IGenerator; -import co.yixiang.tools.domain.QiniuContent; -import co.yixiang.tools.service.QiniuContentService; -import co.yixiang.tools.service.dto.QiniuContentDto; -import co.yixiang.tools.service.dto.QiniuQueryCriteria; -import co.yixiang.tools.service.mapper.QiniuContentMapper; +import co.yixiang.modules.tools.service.mapper.QiniuContentMapper; +import co.yixiang.modules.tools.domain.QiniuContent; +import co.yixiang.modules.tools.service.QiniuContentService; +import co.yixiang.modules.tools.service.dto.QiniuContentDto; +import co.yixiang.modules.tools.service.dto.QiniuQueryCriteria; import co.yixiang.utils.FileUtil; import com.github.pagehelper.PageInfo; import lombok.AllArgsConstructor; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/VerificationCodeServiceImpl.java similarity index 93% rename from yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/VerificationCodeServiceImpl.java index 497b55fc..8bd23159 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/impl/VerificationCodeServiceImpl.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/impl/VerificationCodeServiceImpl.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.impl; +package co.yixiang.modules.tools.service.impl; import cn.hutool.core.lang.Dict; import cn.hutool.core.util.RandomUtil; @@ -13,10 +13,10 @@ import cn.hutool.extra.template.TemplateEngine; import cn.hutool.extra.template.TemplateUtil; import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.exception.BadRequestException; -import co.yixiang.tools.domain.VerificationCode; -import co.yixiang.tools.domain.vo.EmailVo; -import co.yixiang.tools.service.VerificationCodeService; -import co.yixiang.tools.service.mapper.VerificationCodeMapper; +import co.yixiang.modules.tools.service.mapper.VerificationCodeMapper; +import co.yixiang.modules.tools.domain.VerificationCode; +import co.yixiang.modules.tools.domain.vo.EmailVo; +import co.yixiang.modules.tools.service.VerificationCodeService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.commons.lang3.concurrent.BasicThreadFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/AlipayConfigMapper.java similarity index 78% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/AlipayConfigMapper.java index da889752..4a0b08c3 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/AlipayConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/AlipayConfigMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.modules.tools.domain.AlipayConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/EmailConfigMapper.java similarity index 78% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/EmailConfigMapper.java index 70f27747..1bb0b2ff 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/EmailConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/EmailConfigMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.EmailConfig; +import co.yixiang.modules.tools.domain.EmailConfig; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/LocalStorageMapper.java similarity index 78% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/LocalStorageMapper.java index be1aa268..9ad4c56d 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/LocalStorageMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/LocalStorageMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.LocalStorage; +import co.yixiang.modules.tools.domain.LocalStorage; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/PictureMapper.java similarity index 78% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/PictureMapper.java index 444b0df7..672a3ff3 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/PictureMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/PictureMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.Picture; +import co.yixiang.modules.tools.domain.Picture; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuConfigMapper.java similarity index 84% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuConfigMapper.java index 07288eea..16496193 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuConfigMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuConfigMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.QiniuConfig; +import co.yixiang.modules.tools.domain.QiniuConfig; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Update; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuContentMapper.java similarity index 78% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuContentMapper.java index f97f0bf6..95f6130e 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/QiniuContentMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/QiniuContentMapper.java @@ -3,10 +3,10 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.QiniuContent; +import co.yixiang.modules.tools.domain.QiniuContent; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/VerificationCodeMapper.java similarity index 75% rename from yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/VerificationCodeMapper.java index 4a787c5b..1c2a8c0f 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/service/mapper/VerificationCodeMapper.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/service/mapper/VerificationCodeMapper.java @@ -3,11 +3,11 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.service.mapper; +package co.yixiang.modules.tools.service.mapper; import co.yixiang.common.mapper.CoreMapper; -import co.yixiang.tools.domain.VerificationCode; +import co.yixiang.modules.tools.domain.VerificationCode; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AliPayStatusEnum.java similarity index 94% rename from yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AliPayStatusEnum.java index a3c67985..5e575454 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/utils/AliPayStatusEnum.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AliPayStatusEnum.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.utils; +package co.yixiang.modules.tools.utils; /** * 支付状态 diff --git a/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AlipayUtils.java similarity index 95% rename from yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AlipayUtils.java index 5686b22c..170f9274 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/utils/AlipayUtils.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/AlipayUtils.java @@ -3,9 +3,9 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.utils; +package co.yixiang.modules.tools.utils; -import co.yixiang.tools.domain.AlipayConfig; +import co.yixiang.modules.tools.domain.AlipayConfig; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; import org.springframework.stereotype.Component; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/JacksonUtil.java similarity index 99% rename from yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/utils/JacksonUtil.java index 39bc566f..511bd57a 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/utils/JacksonUtil.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/JacksonUtil.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.utils; +package co.yixiang.modules.tools.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/QiNiuUtil.java similarity index 97% rename from yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java rename to yshop-tools/src/main/java/co/yixiang/modules/tools/utils/QiNiuUtil.java index 2ccf4bbf..ce349fd9 100644 --- a/yshop-tools/src/main/java/co/yixiang/tools/utils/QiNiuUtil.java +++ b/yshop-tools/src/main/java/co/yixiang/modules/tools/utils/QiNiuUtil.java @@ -3,7 +3,7 @@ * All rights reserved, Designed By www.yixiang.co */ -package co.yixiang.tools.utils; +package co.yixiang.modules.tools.utils; import co.yixiang.utils.FileUtil; import com.qiniu.storage.Region; diff --git a/yshop-weixin/pom.xml b/yshop-weixin/pom.xml index d1fd3ad9..cdfae60a 100644 --- a/yshop-weixin/pom.xml +++ b/yshop-weixin/pom.xml @@ -5,7 +5,7 @@ yshop co.yixiang - 3.2 + 3.3 4.0.0 @@ -13,10 +13,15 @@ 微信模块 + + com.github.binarywang + wx-java-miniapp-spring-boot-starter + 4.3.0 + co.yixiang yshop-mall - 3.2 + 3.3 diff --git a/yshop-weixin/src/main/resources/META-INF/spring.factories b/yshop-weixin/src/main/resources/META-INF/spring.factories new file mode 100644 index 00000000..9128c34c --- /dev/null +++ b/yshop-weixin/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.binarywang.spring.starter.wxjava.miniapp.config.WxMaAutoConfiguration