diff --git a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/XssRequestWrapper.java b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/XssRequestWrapper.java index f5638d4..eaac793 100644 --- a/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/XssRequestWrapper.java +++ b/bonus-common/bonus-common-security/src/main/java/com/bonus/common/security/interceptor/XssRequestWrapper.java @@ -36,17 +36,21 @@ public class XssRequestWrapper extends HttpServletRequestWrapper { super(request); getParameterMap(); BufferedReader reader; - // reader = request.getReader(); - StringBuilder sb = new StringBuilder(); - char[] buf = new char[1024]; - int rd; -// while ((rd = reader.read(buf)) != -1) { -// sb.append(buf, 0, rd); -// } -// reader.close(); - streamParam = xssClean(sb.toString()); - setChecked(xssCleanNew(sb.toString()) && xssCleanNew(request.getQueryString())); - body = streamParam.getBytes(); + try { + reader = request.getReader(); + StringBuilder sb = new StringBuilder(); + char[] buf = new char[1024]; + int rd; + while ((rd = reader.read(buf)) != -1) { + sb.append(buf, 0, rd); + } + reader.close(); + streamParam = xssClean(sb.toString()); + setChecked(xssCleanNew(sb.toString()) && xssCleanNew(request.getQueryString())); + body = streamParam.getBytes(); + } catch (IOException e) { + log.error(e.getLocalizedMessage(),e); + } queryString = xssClean(request.getQueryString()); diff --git a/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f2ec3ca..93ac747 100644 --- a/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/bonus-common/bonus-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,5 +1,6 @@ com.bonus.common.security.config.WebMvcConfig com.bonus.common.security.service.TokenService +com.bonus.common.security.config.MyFilter com.bonus.common.security.aspect.PreAuthorizeAspect com.bonus.common.security.aspect.InnerAuthAspect com.bonus.common.security.handler.GlobalExceptionHandler diff --git a/bonus-modules/bonus-purchase/pom.xml b/bonus-modules/bonus-task/pom.xml similarity index 98% rename from bonus-modules/bonus-purchase/pom.xml rename to bonus-modules/bonus-task/pom.xml index c43ac80..6f7732e 100644 --- a/bonus-modules/bonus-purchase/pom.xml +++ b/bonus-modules/bonus-task/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - bonus-purchase + bonus-task 8 @@ -93,6 +93,7 @@ provided + diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/BonusPurchaseApplication.java b/bonus-modules/bonus-task/src/main/java/com/bonus/BonusPurchaseApplication.java similarity index 82% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/BonusPurchaseApplication.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/BonusPurchaseApplication.java index a3cc1ee..16609a2 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/BonusPurchaseApplication.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/BonusPurchaseApplication.java @@ -1,4 +1,4 @@ -package com.bonus.purchase; +package com.bonus; import com.bonus.common.security.annotation.EnableCustomConfig; import com.bonus.common.security.annotation.EnableRyFeignClients; @@ -15,11 +15,11 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @EnableCustomSwagger2 @EnableRyFeignClients @SpringBootApplication(exclude = {DataSourceAutoConfiguration.class }) -public class BonusPurchaseApplication { +public class BonusTaskApplication { public static void main(String[] args) { - SpringApplication.run(BonusPurchaseApplication.class, args); - System.out.println("(♥◠‿◠)ﾉﾞ bonus-purchase新购模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + + SpringApplication.run(BonusTaskApplication.class, args); + System.out.println("(♥◠‿◠)ﾉﾞ bonus-task任务模块启动成功 ლ(´ڡ`ლ)ﾞ \n" + " .-------. ____ __ \n" + " | _ _ \\ \\ \\ / / \n" + " | ( ' ) | \\ _. / ' \n" + diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmNoticeUserController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmNoticeUserController.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmNoticeUserController.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmNoticeUserController.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/BpmPurchaseInfoController.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/controller/PurchaseAcceptController.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmNoticeUser.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/domain/BpmNoticeUser.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmNoticeUser.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/domain/BpmNoticeUser.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmPurchaseInfo.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/domain/BpmPurchaseInfo.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmPurchaseInfo.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/domain/BpmPurchaseInfo.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/dto/PurchaseDto.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseDto.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/dto/PurchaseDto.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseDto.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/dto/PurchaseTaskDto.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseTaskDto.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/dto/PurchaseTaskDto.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/dto/PurchaseTaskDto.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmNoticeUserMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmNoticeUserMapper.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmNoticeUserMapper.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmNoticeUserMapper.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/BpmPurchaseInfoMapper.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/mapper/PurchaseAcceptMapper.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/PurchaseAcceptService.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmNoticeUserService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmNoticeUserService.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmNoticeUserService.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmNoticeUserService.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java similarity index 94% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java index d64b47b..e973004 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/BpmPurchaseInfoService.java @@ -7,18 +7,13 @@ import java.util.Map; import cn.hutool.core.bean.BeanUtil; import com.bonus.base.api.domain.MaType; import com.bonus.common.core.utils.StringHelper; -import com.bonus.common.security.auth.AuthLogic; -import com.bonus.common.security.auth.AuthUtil; import com.bonus.common.security.utils.SecurityUtils; -import com.bonus.purchase.domain.BpmTask; +import com.bonus.task.domain.BpmTask; import com.bonus.purchase.dto.PurchaseTaskDto; import com.bonus.purchase.mapper.BpmPurchaseInfoMapper; -import com.bonus.purchase.mapper.BpmTaskMapper; -import org.apache.ibatis.annotations.Param; +import com.bonus.task.mapper.BpmTaskMapper; import org.springframework.stereotype.Service; -import org.springframework.beans.factory.annotation.Autowired; - import com.bonus.purchase.domain.BpmPurchaseInfo; import javax.annotation.Resource; diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/service/impl/PurchaseAcceptServiceImpl.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/utils/Constants.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/utils/Constants.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/utils/Constants.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/vo/PurchaseVo.java b/bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java similarity index 100% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/vo/PurchaseVo.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/purchase/vo/PurchaseVo.java diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmTaskController.java b/bonus-modules/bonus-task/src/main/java/com/bonus/task/controller/BpmTaskController.java similarity index 90% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmTaskController.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/task/controller/BpmTaskController.java index 6a0b131..3fdb007 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/controller/BpmTaskController.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/task/controller/BpmTaskController.java @@ -1,14 +1,12 @@ -package com.bonus.purchase.controller; +package com.bonus.task.controller; import com.bonus.common.core.domain.ResultBean; import com.bonus.common.core.web.controller.BaseController; -import com.bonus.common.core.web.page.TableDataInfo; -import com.bonus.purchase.domain.BpmTask; -import com.bonus.purchase.service.impl.BpmTaskService; +import com.bonus.task.domain.BpmTask; +import com.bonus.task.service.BpmTaskService; import org.springframework.web.bind.annotation.*; import org.springframework.beans.factory.annotation.Autowired; import javax.validation.constraints.NotNull; -import java.util.List; /** * bpm_task任务表：新购任务、领料任务、退料任务、维修任务、报废任务、入库任务(bpm_task)表控制层 diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmTask.java b/bonus-modules/bonus-task/src/main/java/com/bonus/task/domain/BpmTask.java similarity index 98% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmTask.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/task/domain/BpmTask.java index fbf789c..4b13c68 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/domain/BpmTask.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/task/domain/BpmTask.java @@ -1,4 +1,4 @@ -package com.bonus.purchase.domain; +package com.bonus.task.domain; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmTaskMapper.java b/bonus-modules/bonus-task/src/main/java/com/bonus/task/mapper/BpmTaskMapper.java similarity index 94% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmTaskMapper.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/task/mapper/BpmTaskMapper.java index e3e28fe..e3e5de5 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/mapper/BpmTaskMapper.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/task/mapper/BpmTaskMapper.java @@ -1,6 +1,6 @@ -package com.bonus.purchase.mapper; +package com.bonus.task.mapper; -import com.bonus.purchase.domain.BpmTask; +import com.bonus.task.domain.BpmTask; import org.apache.ibatis.annotations.Mapper; /** diff --git a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmTaskService.java b/bonus-modules/bonus-task/src/main/java/com/bonus/task/service/BpmTaskService.java similarity index 90% rename from bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmTaskService.java rename to bonus-modules/bonus-task/src/main/java/com/bonus/task/service/BpmTaskService.java index 5235df6..1c09c2a 100644 --- a/bonus-modules/bonus-purchase/src/main/java/com/bonus/purchase/service/impl/BpmTaskService.java +++ b/bonus-modules/bonus-task/src/main/java/com/bonus/task/service/BpmTaskService.java @@ -1,11 +1,11 @@ -package com.bonus.purchase.service.impl; +package com.bonus.task.service; -import com.bonus.purchase.mapper.BpmTaskMapper; +import com.bonus.task.mapper.BpmTaskMapper; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; -import com.bonus.purchase.domain.BpmTask; +import com.bonus.task.domain.BpmTask; /** *@PackagePath: com.bonus.purchase *@author : 阮世耀 diff --git a/bonus-modules/bonus-purchase/src/main/resources/banner.txt b/bonus-modules/bonus-task/src/main/resources/banner.txt similarity index 100% rename from bonus-modules/bonus-purchase/src/main/resources/banner.txt rename to bonus-modules/bonus-task/src/main/resources/banner.txt diff --git a/bonus-modules/bonus-purchase/src/main/resources/logback.xml b/bonus-modules/bonus-task/src/main/resources/logback.xml similarity index 100% rename from bonus-modules/bonus-purchase/src/main/resources/logback.xml rename to bonus-modules/bonus-task/src/main/resources/logback.xml diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper/BpmNoticeUserMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmNoticeUserMapper.xml similarity index 100% rename from bonus-modules/bonus-purchase/src/main/resources/mapper/BpmNoticeUserMapper.xml rename to bonus-modules/bonus-task/src/main/resources/mapper/BpmNoticeUserMapper.xml diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper/BpmPurchaseInfoMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseInfoMapper.xml similarity index 100% rename from bonus-modules/bonus-purchase/src/main/resources/mapper/BpmPurchaseInfoMapper.xml rename to bonus-modules/bonus-task/src/main/resources/mapper/BpmPurchaseInfoMapper.xml diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper/BpmTaskMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/BpmTaskMapper.xml similarity index 96% rename from bonus-modules/bonus-purchase/src/main/resources/mapper/BpmTaskMapper.xml rename to bonus-modules/bonus-task/src/main/resources/mapper/BpmTaskMapper.xml index 8eef122..47eb8cb 100644 --- a/bonus-modules/bonus-purchase/src/main/resources/mapper/BpmTaskMapper.xml +++ b/bonus-modules/bonus-task/src/main/resources/mapper/BpmTaskMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -38,7 +38,7 @@ delete from bpm_task where id = #{id,jdbcType=INTEGER} - + insert into bpm_task (id, definition_id, parent_id, code, `status`, arrival_time, @@ -53,7 +53,7 @@ #{linkMan,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{companyId,jdbcType=INTEGER} ) - + insert into bpm_task @@ -151,7 +151,7 @@ - + update bpm_task @@ -200,7 +200,7 @@ where id = #{id,jdbcType=INTEGER} - + update bpm_task set definition_id = #{definitionId,jdbcType=INTEGER}, @@ -219,7 +219,7 @@ company_id = #{companyId,jdbcType=INTEGER} where id = #{id,jdbcType=INTEGER} - + insert into bpm_task (id, definition_id, parent_id, code, `status`, arrival_time, creator, create_time, @@ -248,7 +248,7 @@ phone = #{phone,jdbcType=VARCHAR}, company_id = #{companyId,jdbcType=INTEGER} - + insert into bpm_task diff --git a/bonus-modules/bonus-purchase/src/main/resources/mapper/PurchaseAcceptMapper.xml b/bonus-modules/bonus-task/src/main/resources/mapper/PurchaseAcceptMapper.xml similarity index 100% rename from bonus-modules/bonus-purchase/src/main/resources/mapper/PurchaseAcceptMapper.xml rename to bonus-modules/bonus-task/src/main/resources/mapper/PurchaseAcceptMapper.xml diff --git a/bonus-modules/pom.xml b/bonus-modules/pom.xml index 4c3e64f..f40dc6a 100644 --- a/bonus-modules/pom.xml +++ b/bonus-modules/pom.xml @@ -17,7 +17,7 @@ bonus-obs bonus-mongodb bonus-base - bonus-purchase + bonus-task bonus-modules