Merge pull request #41 from geekidea/dev

💻 1.2.3.RELEASE CentOS快速安装项目运行环境，快速构建/运维部署/启动项目

Author: springboot-plus

deploy/deploy.sh

@@ -1,2 +1,69 @@
 #! /bin/shell
 
+# Copyright 2019-2029 geekidea(https://github.com/geekidea)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#======================================================================
+# 1. 下载或更新spring-boot-plus版本库
+# 2. maven打包
+# 3. 运行spring-boot-plus
+# 4. 访问项目
+# author: geekidea
+# date: 2019-9-6
+#======================================================================
+
+# 版本库路径
+PROJECT_REPO="https://github.com/geekidea/spring-boot-plus.git"
+# 项目名称
+PROJECT_NAME="spring-boot-plus"
+# 当前时间
+NOW=$(date --date='0 days ago' "+%Y-%m-%d-%H-%M-%S")
+echo "${NOW}"
+
+# 1. 下载或更新spring-boot-plus版本库
+# 先判断当前目录下是否有spring-boot-plus目录
+# 如果有，则执行git pull
+# 如果没有，则clone
+if [ ! -d "/spring-boot-plus" ]; then
+  git clone ${PROJECT_REPO}
+else
+  git pull
+fi
+
+# 2. maven打包
+cd $(PROJECT_NAME)
+mvn clean package -Ptest
+
+# 3. 停服
+# cd到项目源代码同级目录
+cd ../
+# 停服
+sh ${PROJECT_NAME}-server/bin/shutdown.sh
+
+# 4. 移动spring-boot-plus-server-assembly.tar.gz到项目同级目录下
+# 备份上一次的server
+echo "${NOW}"
+mv ${PROJECT_NAME}-server ${PROJECT_NAME}-server-"${NOW}"
+# 移动最新打包的server到项目同级目录下
+mv ${PROJECT_NAME}/target/${PROJECT_NAME}-server-assembly.tar.gz ../../
+
+# 5. 运行spring-boot-plus
+tar -zxvf ${PROJECT_NAME}-server-assembly.tar.gz
+cd ${PROJECT_NAME}-server/bin
+sh restart.sh
+
+# 6. 访问项目
+# 输出项目日志
+# http://localhost:8888/docs
+

docs/bin/install/download-install-all.sh

@@ -0,0 +1,33 @@
+#! /bin/shell
+
+# Copyright 2019-2029 geekidea(https://github.com/geekidea)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#======================================================================
+# 先下载按照脚本，多次执行该脚本，会覆盖以下下载的文件
+# 快速安装jdk/git/maven/redis/mysql
+#
+# author: geekidea
+# date: 2019-8-29
+#======================================================================
+
+
+wget -O install-all.sh https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-all.sh
+wget -O install-jdk.sh  https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-jdk.sh
+wget -O install-git.sh  https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-git.sh
+wget -O install-maven.sh  https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-maven.sh
+wget -O install-redis.sh  https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-redis.sh
+wget -O install-mysql.sh  https://raw.githubusercontent.com/geekidea/spring-boot-plus/master/docs/bin/install/install-mysql.sh
+
+sh install-all.sh

docs/bin/install/install-mysql.sh

@@ -56,7 +56,10 @@ echo "${PWD}"
 # 登陆
 mysql -uroot -p${PWD}
 
+# 进入到mysql命令行时，修改密码
 # 修改密码
-# ALTER USER 'root'@'localhost' IDENTIFIED BY 'MyNewPass4!';
-
+# ALTER USER 'root'@'localhost' IDENTIFIED BY 'Springbootplus666!';
 
+# 使用新密码登陆
+# exit
+# mysql -uroot -pSpringbootplus666!

pom.xml

@@ -21,7 +21,7 @@
 
     <groupId>io.geekidea</groupId>
     <artifactId>spring-boot-plus</artifactId>
-    <version>1.2.2.RELEASE</version>
+    <version>1.2.3.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>spring-boot-plus</name>
@@ -339,6 +339,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
+                    <finalName>${project.build.finalName}-server</finalName>
                     <descriptors>
                         <descriptor>src/main/assembly/assembly.xml</descriptor>
                     </descriptors>

src/main/assembly/assembly.xml

@@ -17,13 +17,14 @@
 
 <assembly>
     <!-- 可自定义，这里指定的是项目环境 -->
-    <!-- spring-boot-plus-1.0.1-RELEASE-local.tar.gz  -->
-    <id>${project.version}-${profileActive}</id>
+    <!-- spring-boot-plus-server-1.0.1-RELEASE-local.tar.gz  -->
+    <!-- <id>${project.version}-${profileActive}</id> -->
+    <id>assembly</id>
 
     <!-- 打包的类型，如果有N个，将会打N个类型的包 -->
     <formats>
         <format>tar.gz</format>
-        <format>zip</format>
+        <!-- <format>zip</format> -->
     </formats>
 
     <includeBaseDirectory>true</includeBaseDirectory>

src/main/resources/config/application-test.yml

@@ -17,7 +17,7 @@ spring:
   datasource:
     url: jdbc:mysql://localhost:3306/spring_boot_plus?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password: Springbootplus666!
 
   # Redis配置
   redis: