pure模块调整至task模块

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());
 

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

bonus-modules/bonus-task/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bonus-purchase</artifactId>
+    <artifactId>bonus-task</artifactId>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -93,6 +93,7 @@
             <scope>provided</scope>
         </dependency>
 
+
     </dependencies>
 
     <build>

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" +

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;

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)表控制层

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;

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;
 
 /**

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 : 阮世耀

bonus-modules/bonus-task/src/main/resources/mapper/BpmTaskMapper.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.bonus.purchase.mapper.BpmTaskMapper">
-  <resultMap id="BaseResultMap" type="com.bonus.purchase.domain.BpmTask">
+<mapper namespace="com.bonus.task.mapper.BpmTaskMapper">
+  <resultMap id="BaseResultMap" type="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     <!--@Table bpm_task-->
     <id column="id" jdbcType="INTEGER" property="id" />
@@ -38,7 +38,7 @@
     delete from bpm_task
     where id = #{id,jdbcType=INTEGER}
   </delete>
-  <insert id="insert" parameterType="com.bonus.purchase.domain.BpmTask">
+  <insert id="insert" parameterType="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     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>
-  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.bonus.purchase.domain.BpmTask">
+  <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     insert into bpm_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -151,7 +151,7 @@
       </if>
     </trim>
   </insert>
-  <update id="updateByPrimaryKeySelective" parameterType="com.bonus.purchase.domain.BpmTask">
+  <update id="updateByPrimaryKeySelective" parameterType="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     update bpm_task
     <set>
@@ -200,7 +200,7 @@
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.bonus.purchase.domain.BpmTask">
+  <update id="updateByPrimaryKey" parameterType="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     update bpm_task
     set definition_id = #{definitionId,jdbcType=INTEGER},
@@ -219,7 +219,7 @@
       company_id = #{companyId,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
-  <insert id="insertOrUpdate" parameterType="com.bonus.purchase.domain.BpmTask">
+  <insert id="insertOrUpdate" parameterType="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     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>
-  <insert id="insertOrUpdateSelective" parameterType="com.bonus.purchase.domain.BpmTask">
+  <insert id="insertOrUpdateSelective" parameterType="com.bonus.task.domain.BpmTask">
     <!--@mbg.generated-->
     insert into bpm_task
     <trim prefix="(" suffix=")" suffixOverrides=",">

bonus-modules/pom.xml

@@ -17,7 +17,7 @@
         <module>bonus-obs</module>
         <module>bonus-mongodb</module>
         <module>bonus-base</module>
-        <module>bonus-purchase</module>
+        <module>bonus-task</module>
     </modules>
 
     <artifactId>bonus-modules</artifactId>