Merge pull request #47 from geekidea/dev

spring-boot-plusV1.2.3发布，CentOS快速安装环境/构建/部署/启动项目

Author: springboot-plus

CHANGELOG.md

@@ -1,60 +1,37 @@
 # 更新日志 CHANGELOG
 
-##
 ## [V1.2.3-RELEASE] 2019.09.09 :computer: 
+> spring-boot-plusV1.2.3发布，CentOS快速安装环境/构建/部署/启动项目
+
 ###  ⭐️  New Features
-# spring-boot-plusV1.2.3发布，CentOS快速安装环境/构建/部署/启动项目
-## 1. 下载安装脚本
-> 安装 `jdk`, `git`, `maven`, `redis`, `mysql`
-
-```bash
-wget -O download-install-all.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/dev/docs/bin/install/download-install-all.sh
-```
-
-## 2. 运行安装脚本
-```bash
-sh download-install-all.sh
-```
-
-## 3. 修改MySQL密码
-```bash
-ALTER USER 'root'@'localhost' IDENTIFIED BY 'Springbootplus666!';
-exit
-mysql -uroot -pSpringbootplus666!
-```
-
-## 4. 导入MySQL脚本
-```bash
-create database if not exists spring_boot_plus character set utf8mb4;
-use spring_boot_plus;
-source /root/mysql_spring_boot_plus.sql;
-show tables;
-exit
-```
-
-## 5. 下载部署脚本 `deploy.sh`
-```bash
-wget -O deploy.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/dev/deploy/deploy.sh
-```
-
-## 6. 执行脚本
-```bash
-sh deploy.sh
-```
-
-## 7.访问项目
-> SpringBootAdmin管理页面
-
-[http://localhost:8888](http://localhost:8888)
-
-> spring-boot-plus Swagger文档页面
-
-[http://localhost:8888/docs](http://localhost:8888/docs)
-
-## 8. 查看项目运行日志
-```bash
-tail -f -n 1000 /root/spring-boot-plus-server/logs/spring-boot-plus.log
-```
+- 项目运行环境安装脚本
+- CentOS快速构建/部署/启动项目脚本
+
+### ⚡️ Optimization
+- 优化 `maven-assembly-plugin` 项目打包插件
+	
+### 📝 Added/Modified
+Add [install-jdk.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-jdk.sh) yum安装`jdk8`脚本
+Add [install-git.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-git.sh) yum安装`git`脚本
+Add [install-maven.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-maven.sh) yum安装`maven`脚本
+Add [install-redis.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-redis.sh) yum安装`redis`脚本
+Add [install-mysql.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-mysql.sh) yum安装`mysql`脚本
+Add [install-all.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-all.sh) 安装所有环境脚本
+Add [download-install-all.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/download-install-all.sh) 下载并安装所有环境脚本
+Add [deploy.sh](https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/deploy/deploy.sh) 下载项目/构建/部署/启动项目脚本
+
+### 📔  Documentation
+[CentOS Quick Installation Environment / Build / Deploy / Launch Spring-boot-plus Project](https://github.com/geekidea/spring-boot-plus#centos-quick-installation-environment--build--deploy--launch-spring-boot-plus-project)
+
+### 🔨 Dependency Upgrades
+- Upgrade to `springboot` 2.1.8.RELEASE
+- Upgrade to `Mybatis` 3.5.2
+- Upgrade to `Mybatis Plus` 3.2.0
+- Upgrade to `Alibaba Druid` 1.1.20
+- Upgrade to `Fastjson` 1.2.60
+- Upgrade to `commons-codec` 1.13
+- Upgrade to `commons-collections` 4.4
+- Upgrade to `hutool-all` 4.6.4
 
 
 ## [V1.2.2-RELEASE] 2019.08.26 🏇 

README-zh.md

@@ -58,21 +58,21 @@ Redis | 3.2+ |  |
 ### 技术选型 
 技术 | 版本 |  备注
 -|-|-
-Spring Boot | 2.1.7.RELEASE | 最新发布稳定版 |
+Spring Boot | 2.1.8.RELEASE | 最新发布稳定版 |
 Spring Framework | 5.1.9.RELEASE | 最新发布稳定版 |
-Mybatis | 3.5.1 | 持久层框架 |
-Mybatis Plus | 3.1.2 | mybatis增强框架 |
-Alibaba Druid | 1.1.18 | 数据源 |
-Fastjson | 1.2.59 | JSON处理工具集 |
+Mybatis | 3.5.2 | 持久层框架 |
+Mybatis Plus | 3.2.0 | mybatis增强框架 |
+Alibaba Druid | 1.1.20 | 数据源 |
+Fastjson | 1.2.60 | JSON处理工具集 |
 swagger2 | 2.6.1 | api文档生成工具 |
 commons-lang3 | 3.9 | 常用工具包 |
 commons-io | 2.6 | IO工具包 |
-commons-codec | 1.12 | 加密解密等工具包 |
-commons-collections | 3.2.1 | 集合工具包 |
+commons-codec | 1.13 | 加密解密等工具包 |
+commons-collections4 | 4.4 | 集合工具包 |
 reflections | 0.9.11 | 反射工具包 |
 hibernate-validator | 6.0.17.Final | 后台参数校验注解 |
 jwt | 0.9.1 | json web token |
-hutool-all | 4.5.10 | 常用工具集 |
+hutool-all | 4.6.4 | 常用工具集 |
 lombok | 1.18.8 | 注解生成Java Bean等工具 |
 
 

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.2.2--RELEASE-blue">
+    <img alt="spring-boot-plus version" src="https://img.shields.io/badge/spring--boot--plus-1.2.3--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.7.RELEASE-brightgreen">
+    <img alt="spring boot version" src="https://img.shields.io/badge/spring%20boot-2.1.8.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,21 +58,21 @@ Redis | 3.2+ |  |
 ### Technology stack 
 Component| Version |  Remark
 -|-|-
-Spring Boot | 2.1.7.RELEASE | Latest release stable version |
+Spring Boot | 2.1.8.RELEASE | Latest release stable version |
 Spring Framework | 5.1.9.RELEASE | Latest release stable version |
-Mybatis | 3.5.1 | DAO Framework |
-Mybatis Plus | 3.1.2 | mybatis Enhanced framework |
-Alibaba Druid | 1.1.18 | Data source |
-Fastjson | 1.2.59 | JSON processing toolset |
+Mybatis | 3.5.2 | DAO Framework |
+Mybatis Plus | 3.2.0 | mybatis Enhanced framework |
+Alibaba Druid | 1.1.20 | Data source |
+Fastjson | 1.2.60 | JSON processing toolset |
 swagger2 | 2.6.1 | Api document generation tool |
 commons-lang3 | 3.9 | Apache language toolkit |
 commons-io | 2.6 | Apache IO Toolkit |
-commons-codec | 1.12 | Apache Toolkit such as encryption and decryption |
-commons-collections | 3.2.1 | Apache collections toolkit |
+commons-codec | 1.13 | Apache Toolkit such as encryption and decryption |
+commons-collections4 | 4.4 | Apache collections toolkit |
 reflections | 0.9.11 | Reflection Toolkit  |
 hibernate-validator | 6.0.17.Final | Validator toolkit |
 jwt | 0.9.1 | JSON WEB TOKEN |
-hutool-all | 4.5.10 | Common toolset |
+hutool-all | 4.6.4 | Common toolset |
 lombok | 1.18.8 | Automatically plugs |
 
 ## Getting started

deploy/deploy.sh

@@ -25,6 +25,8 @@
 
 NOW=$(date --date='0 days ago' "+%Y-%m-%d-%H-%M-%S")
 echo "${NOW}"
+PULL_RESULT=""
+IS_UPDATE=0
 
 # 1. 下载或更新spring-boot-plus版本库
 # 先判断当前目录下是否有spring-boot-plus目录
@@ -34,7 +36,17 @@ if [ ! -d "spring-boot-plus" ]; then
   git clone https://github.com/geekidea/spring-boot-plus.git
 else
   cd spring-boot-plus
-  git pull
+
+  # 拉取代码，并获取结果判断，是否有新的代码更新，如果有，则备份之前的server，否则替换
+  PULL_RESULT=$(git pull)
+  echo "${PULL_RESULT}"
+
+  if [[ ! $PULL_RESULT == *up-to-date* ]]
+  then
+    echo "Update code..."
+    IS_UPDATE=1
+  fi
+
 fi
 
 # 2. maven打包
@@ -53,9 +65,16 @@ fi
 if [ ! -d "spring-boot-plus-server-back" ]; then
   mkdir spring-boot-plus-server-back
 fi
-mv spring-boot-plus-server spring-boot-plus-server-back/spring-boot-plus-server-back-"${NOW}"
 
-cp spring-boot-plus/target/spring-boot-plus-server-assembly.tar.gz spring-boot-plus-server-assembly.tar.gz
+if [[ $IS_UPDATE == 1 ]]
+then
+	echo "Back spring-boot-plus-server..."
+  mv spring-boot-plus-server spring-boot-plus-server-back/spring-boot-plus-server-back-"${NOW}"
+fi
+
+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
 
 # 5. 运行spring-boot-plus
 tar -zxvf spring-boot-plus-server-assembly.tar.gz

docs/CHANGELOG_TEMPLATE.md

@@ -0,0 +1,15 @@
+## [Vx.x.x-RELEASE] xxxx.xx.xx 	💻 
+> 
+
+###  ⭐️  New Features
+
+### ⚡️ Optimization
+	
+### 📝 Added/Modified
+
+### 🐞  Bug Fixes
+
+### 📔  Documentation
+
+### 🔨 Dependency Upgrades
+

docs/bin/install/install-jdk.sh

@@ -17,7 +17,7 @@
 #======================================================================
 # 快速安装JDK
 # CentOS7 中已成功验证
-# 使用yum+rpm方式安装
+# 使用yum方式安装
 #
 # author: sy
 # date: 2019-8-29
@@ -38,7 +38,7 @@ if [ $? != 1 ]
 then
     echo "Not Found jdk"
     echo "Installing jdk..."
-    yum install -y maven
+    yum install -y java-1.8.0-openjdk
     hasJdk
     if [ $? != 1 ]
     then

pom.xml

@@ -46,23 +46,25 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <project-parent.version>${parent.version}</project-parent.version>
         <java.version>1.8</java.version>
-        <spring-boot.version>2.1.7.RELEASE</spring-boot.version>
-        <mybatis-plus-boot-starter.version>3.1.2</mybatis-plus-boot-starter.version>
-        <fastjson.version>1.2.59</fastjson.version>
+        <spring-boot.version>2.1.8.RELEASE</spring-boot.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>
         <velocity.version>1.7</velocity.version>
         <mysql.version>5.1.47</mysql.version>
-        <druid.version>1.1.18</druid.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.12</commons-codec.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.6.2</commons-pool2.version>
+        <commons-pool2.version>2.7.0</commons-pool2.version>
         <jwt.version>0.9.1</jwt.version>
         <spring-boot-admin.version>2.1.6</spring-boot-admin.version>
+        <hutool.version>4.6.4</hutool.version>
 
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
         <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
@@ -183,9 +185,9 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.1</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>${commons-collections4.version}</version>
         </dependency>
 
         <dependency>
@@ -243,7 +245,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
-            <version>4.5.10</version>
+            <version>${hutool.version}</version>
         </dependency>
 
         <!-- spring boot admin start -->