Merge pull request #79 from geekidea/dev

Dev
geekidea · Oct 14, 2019 · 9f43ae1 · 9f43ae1
2 parents 918f824 + f4fba82
commit 9f43ae1
Show file tree

Hide file tree

Showing 100 changed files with 1,592 additions and 1,189 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # 更新日志 CHANGELOG
 
+
+## [V1.3.1-RELEASE] 2019.10.15
+
+###  ⭐️  New Features
+- Xss跨站脚本工具处理
+- CORS跨域配置
+
+### ⚡️ Optimization
+- 代码生成器可自定义配置生成哪些文件
+- 请求路径filter配置，配置文件属性名称调整
+- Aop切点优化，`Aop` JSON参数输出优化
+- 可配置是否生成`Validation`验证代码
+- 优化`controller`,`entity`模版生成
+- 优化代码生成器 CodeGenerator
+- 调整 `aop`, `filter`,`interceptor`,`controller`,`param`,`vo`代码目录结构
+
+### 📝 Added/Modified
+- Add `XssFilter`,`XssHttpServletRequestWrapper`,`XssJacksonDeserializer`,`XssJacksonSerializer`
+- Add `SpringBootPlusCorsProperties`
+- Update `JacksonConfig`
+- Update `LogAop`,`RequestPathFilter`,`ShiroConfig`
+
+### 🐞  Bug Fixes
+- fix druid控制面板无法访问问题
+
+### 📔  Documentation
+- [https://springboot.plus/guide/xss.html](https://springboot.plus/guide/xss.html)
+- [https://springboot.plus/guide/cors.html](https://springboot.plus/guide/cors.html)
+
+### 🔨 Dependency Upgrades
+- Upgrade to `spring-boot` 2.1.9.RELEASE
+- Upgrade to `Fastjson` 1.2.62
+- Upgrade to `hutool` 4.6.10
+- Add `commons-text` 1.8
+
 ## [V1.3.0-RELEASE] 2019.10.06
 
 ###  ⭐️  New Features
@@ -60,7 +95,7 @@
 - [spring-boot-plus java docs](http://geekidea.io/spring-boot-plus-apidocs/)
 
 ### 🔨 Dependency Upgrades
-- Upgrade to `springboot` 2.1.8.RELEASE
+- Upgrade to `springboot` 2.1.9.RELEASE
 - Upgrade to `Mybatis` 3.5.2
 - Upgrade to `Mybatis Plus` 3.2.0
 - Upgrade to `Alibaba Druid` 1.1.20

diff --git a/README-zh.md b/README-zh.md
@@ -9,10 +9,10 @@
 
 <p align="center">  
   <a href="https://github.com/geekidea/spring-boot-plus/">
-    <img alt="spring-boot-plus version" src="https://img.shields.io/badge/spring--boot--plus-1.3.0--RELEASE-blue">
+    <img alt="spring-boot-plus version" src="https://img.shields.io/badge/spring--boot--plus-1.3.1.RELEASE-blue">
   </a>
   <a href="https://github.com/spring-projects/spring-boot">
-    <img alt="spring boot version" src="https://img.shields.io/badge/spring%20boot-2.1.8.RELEASE-brightgreen">
+    <img alt="spring boot version" src="https://img.shields.io/badge/spring%20boot-2.1.9.RELEASE-brightgreen">
   </a>
   <a href="https://www.apache.org/licenses/LICENSE-2.0">
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
@@ -58,8 +58,8 @@ Redis | 3.2+ |  |
 ### 技术选型 
 技术 | 版本 |  备注
 -|-|-
-Spring Boot | 2.1.8.RELEASE | 最新发布稳定版 |
-Spring Framework | 5.1.9.RELEASE | 最新发布稳定版 |
+Spring Boot | 2.1.9.RELEASE | 最新发布稳定版 |
+Spring Framework | 5.1.10.RELEASE | 最新发布稳定版 |
 Mybatis | 3.5.2 | 持久层框架 |
 Mybatis Plus | 3.2.0 | mybatis增强框架 |
 Alibaba Druid | 1.1.20 | 数据源 |
@@ -73,7 +73,7 @@ reflections | 0.9.11 | 反射工具包 |
 hibernate-validator | 6.0.17.Final | 后台参数校验注解 |
 Shiro | 1.4.1 | 权限控制 |
 JWT | 3.8.3 | JSON WEB TOKEN |
-hutool-all | 4.6.4 | 常用工具集 |
+hutool-all | 4.6.10 | 常用工具集 |
 lombok | 1.18.8 | 注解生成Java Bean等工具 |
 mapstruct | 1.3.0.Final | 对象属性复制工具 |
 

diff --git a/README.md b/README.md
@@ -9,10 +9,10 @@
 
 <p align="center">  
   <a href="https://github.com/geekidea/spring-boot-plus/">
-    <img alt="spring-boot-plus version" src="https://img.shields.io/badge/spring--boot--plus-1.3.0--RELEASE-blue">
+    <img alt="spring-boot-plus version" src="https://img.shields.io/badge/spring--boot--plus-1.3.1.RELEASE-blue">
   </a>
   <a href="https://github.com/spring-projects/spring-boot">
-    <img alt="spring boot version" src="https://img.shields.io/badge/spring%20boot-2.1.8.RELEASE-brightgreen">
+    <img alt="spring boot version" src="https://img.shields.io/badge/spring%20boot-2.1.9.RELEASE-brightgreen">
   </a>
   <a href="https://www.apache.org/licenses/LICENSE-2.0">
     <img alt="code style" src="https://img.shields.io/badge/license-Apache%202-4EB1BA.svg?style=flat-square">
@@ -60,8 +60,8 @@ Redis | 3.2+ |  |
 ### Technology stack 
 Component| Version |  Remark
 -|-|-
-Spring Boot | 2.1.8.RELEASE | Latest release stable version |
-Spring Framework | 5.1.9.RELEASE | Latest release stable version |
+Spring Boot | 2.1.9.RELEASE | Latest release stable version |
+Spring Framework | 5.1.10.RELEASE | Latest release stable version |
 Mybatis | 3.5.2 | DAO Framework |
 Mybatis Plus | 3.2.0 | mybatis Enhanced framework |
 Alibaba Druid | 1.1.20 | Data source |
@@ -75,7 +75,7 @@ reflections | 0.9.11 | Reflection Toolkit  |
 hibernate-validator | 6.0.17.Final | Validator toolkit |
 Shiro | 1.4.1 | Permission control |
 JWT | 3.8.3 | JSON WEB TOKEN |
-hutool-all | 4.6.4 | Common toolset |
+hutool-all | 4.6.10 | Common toolset |
 lombok | 1.18.8 | Automatically plugs |
 mapstruct | 1.3.0.Final | Object property replication tool |
 

diff --git a/deploy/deploy.sh b/deploy/deploy.sh
@@ -43,7 +43,7 @@ else
 
   if [[ ! $PULL_RESULT == *up-to-date* ]]
   then
-    echo "Update code..."
+    echo "update code..."
     IS_UPDATE=1
   fi
 fi
@@ -52,10 +52,18 @@ pwd
 
 # 2. maven打包
 mvn clean
-mvn clean package -Ptest
+mvn package -Ptest
+
+pwd
+# 判断是否生成成功
+if [ ! -f "target/spring-boot-plus-server-assembly.tar.gz" ]; then
+  echo "maven build fail"
+  exit
+fi
 
 # 3. 停服
 cd ..
+pwd
 
 if [ -d "spring-boot-plus-server" ]; then
   sh spring-boot-plus-server/bin/shutdown.sh
@@ -70,20 +78,22 @@ fi
 
 if [[ $IS_UPDATE == 1 ]]
 then
-	echo "Back spring-boot-plus-server..."
+	echo "back spring-boot-plus-server..."
   mv spring-boot-plus-server spring-boot-plus-server-back/spring-boot-plus-server-back-"${NOW}"
+  echo "back success"
 fi
 
-echo "Copy spring-boot-plus-server-assembly.tar.gz..."
+echo "copy spring-boot-plus-server-assembly.tar.gz..."
 # 复制到项目同级目录，如果有，则覆盖
 cp -r -f spring-boot-plus/target/spring-boot-plus-server-assembly.tar.gz spring-boot-plus-server-assembly.tar.gz
+echo "copy success"
 
+pwd
 # 5. 运行spring-boot-plus
 tar -zxvf spring-boot-plus-server-assembly.tar.gz
-cd spring-boot-plus-server/bin
-sh restart.sh
+echo "tar.gz decompression success"
 
-# 6. 访问项目
-# 输出项目日志
-# http://localhost:8888/docs
+pwd
+sh spring-boot-plus-server/bin/shutdown.sh
+sh spring-boot-plus-server/bin/startup.sh
 
diff --git a/docs/db/mysql_spring_boot_plus.sql b/docs/db/mysql_spring_boot_plus.sql
@@ -32,7 +32,7 @@ CREATE TABLE `ip`  (
   `ip_start_num` bigint(20) NOT NULL,
   `ip_end_num` bigint(20) NOT NULL,
   PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB AUTO_INCREMENT = 526718 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB AUTO_INCREMENT = 526718 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'IP地址'  ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Table structure for sys_log

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 
     <groupId>io.geekidea</groupId>
     <artifactId>spring-boot-plus</artifactId>
-    <version>1.3.0.RELEASE</version>
+    <version>1.3.1.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-plus</name>
@@ -45,26 +45,26 @@
         <utf8>UTF-8</utf8>
         <project.build.sourceEncoding>${utf8}</project.build.sourceEncoding>
         <project.reporting.outputEncoding>${utf8}</project.reporting.outputEncoding>
-        <project-parent.version>${parent.version}</project-parent.version>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.1.0.RELEASE</spring-boot.version>
+        <spring-boot.version>2.1.9.RELEASE</spring-boot.version>
+        <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
         <mybatis-plus-boot-starter.version>3.2.0</mybatis-plus-boot-starter.version>
-        <fastjson.version>1.2.60</fastjson.version>
         <swagger2.version>2.6.1</swagger2.version>
         <commons-lang3.version>3.9</commons-lang3.version>
         <commons-collections4.version>4.4</commons-collections4.version>
+        <commons-io.version>2.6</commons-io.version>
+        <commons-codec.version>1.13</commons-codec.version>
+        <commons-net.version>3.6</commons-net.version>
+        <commons-pool2.version>2.7.0</commons-pool2.version>
+        <commons-text.version>1.8</commons-text.version>
+        <fastjson.version>1.2.62</fastjson.version>
         <velocity.version>1.7</velocity.version>
         <mysql.version>5.1.47</mysql.version>
         <druid.version>1.1.20</druid.version>
-        <commons-io.version>2.6</commons-io.version>
         <reflections.version>0.9.11</reflections.version>
-        <commons-codec.version>1.13</commons-codec.version>
-        <commons-net.version>3.6</commons-net.version>
         <jansi.version>1.18</jansi.version>
         <lombok.version>1.18.8</lombok.version>
-        <commons-pool2.version>2.7.0</commons-pool2.version>
-        <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
-        <hutool.version>4.6.4</hutool.version>
+        <hutool.version>4.6.10</hutool.version>
         <junit.version>4.12</junit.version>
         <ini4j.version>0.5.4</ini4j.version>
         <mapstruct.version>1.3.0.Final</mapstruct.version>
@@ -301,6 +301,14 @@
         </dependency>
         <!-- Shiro+JWT end -->
 
+        <!-- XSS -->
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>${commons-text.version}</version>
+        </dependency>
+
+
     </dependencies>
 
 
@@ -486,6 +494,7 @@
             <name>Spring Milestones</name>
             <url>https://maven.aliyun.com/repository/spring</url>
         </repository>
+        <!-- 中央仓库 -->
         <repository>
             <id>central</id>
             <name>maven-central</name>

diff --git a/src/bin/startup.sh b/src/bin/startup.sh
@@ -122,7 +122,7 @@ STARTUP_LOG="${STARTUP_LOG}application background startup command: nohup java ${
 #======================================================================
 # 执行启动命令：后台启动项目,并将日志输出到项目根目录下的logs文件夹下
 #======================================================================
-nohup java ${JAVA_OPT} -jar ${BASE_PATH}/lib/${APPLICATION_JAR} --spring.config.location=${CONFIG_DIR} > ${LOG_PATH} 2>&1 &
+nohup java ${JAVA_OPT} -jar ${BASE_PATH}/lib/${APPLICATION_JAR} --spring.config.location=${CONFIG_DIR} --logging.config=${CONFIG_DIR}logback.xml > ${LOG_PATH} 2>&1 &
 
 
 # 进程ID

diff --git a/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java b/src/main/java/io/geekidea/springbootplus/SpringBootPlusApplication.java
@@ -22,6 +22,7 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.ServletComponentScan;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
@@ -39,6 +40,7 @@
 @EnableConfigurationProperties
 @EnableAdminServer
 @MapperScan({"io.geekidea.springbootplus.**.mapper"})
+@ServletComponentScan
 @SpringBootApplication
 public class SpringBootPlusApplication {