lihengming · vectooor · Apr 10, 2019
diff --git a/README.md b/README.md
@@ -1,6 +1,19 @@
 ![Licence](https://img.shields.io/badge/licence-none-green.svg)
 [![GitHub Release](https://img.shields.io/github/release/lihengming/spring-boot-api-project-seed.svg)](https://github.com/lihengming/spring-boot-api-project-seed/releases)
+
 ## 简介
+基于原来的工程改动太大，所以自己fork过来进行了修改。主要修改点如下：
+
+1、SprintBoot升级到目前最新版本，2.1.3；
+
+2、HttpMessageConverter改为默认的Jackson；
+
+3、打包自动化并且添加一些启动和停止脚本，打包成一个tar.gz包；
+
+4、添加了一个DEMO，原则上应该删除掉，懒，就懒得删了。
+
+<hr>
+
 Spring Boot API Project Seed 是一个基于Spring Boot & MyBatis的种子项目，用于快速构建中小型API、RESTful API项目，该种子项目已经有过多个真实项目的实践，稳定、简单、快速，使我们摆脱那些重复劳动，专注于业务代码的编写，减少加班。下面是一个简单的使用演示，看如何基于本项目在短短几十秒钟内实现一套简单的API，并运行提供服务。
 
 [![请选择超清](https://raw.githubusercontent.com/lihengming/java-codes/master/shared-resources/github-images/project-example-youku.png)](http://v.youku.com/v_show/id_XMjg1NjYwNDgxNg==.html?spm=a2h3j.8428770.3416059.1)
@@ -15,23 +28,23 @@ Spring Boot API Project Seed 是一个基于Spring Boot & MyBatis的种子项目
 - 集成MyBatis、通用Mapper插件、PageHelper分页插件，实现单表业务零SQL
 - 提供代码生成器根据表名生成对应的Model、Mapper、MapperXML、Service、ServiceImpl、Controller等基础代码，其中Controller模板默认提供POST和RESTful两套，根据需求在```CodeGenerator.genController(tableName)```方法中自己选择，默认使用POST模板。代码模板可根据实际项目的需求来扩展，由于每个公司业务都不太一样，所以只提供了一些比较基础、通用的模板，**主要是提供一个思路**来减少重复代码的编写，我在实际项目的使用中，其实根据公司业务的抽象编写了大量的模板。另外，使用模板也有助于保持团队代码风格的统一
 - 另有彩蛋，待你探索
- 
+
 ## 快速开始
 1. 克隆项目
 2. 对```test```包内的代码生成器```CodeGenerator```进行配置，主要是JDBC，因为要根据表名来生成代码
 3. 如果只是想根据上面的演示来亲自试试的话可以使用```test resources```目录下的```demo-user.sql```，否则忽略该步
 3. 输入表名，运行```CodeGenerator.main()```方法，生成基础代码（可能需要刷新项目目录才会出来）
 4. 根据业务在基础代码上进行扩展
 5. 对开发环境配置文件```application-dev.properties```进行配置，启动项目，Have Fun！
- 
+
 ## 开发建议
 - 表名，建议使用小写，多个单词使用下划线拼接
 - Model内成员变量建议与表字段数量对应，如需扩展成员变量（比如连表查询）建议创建DTO，否则需在扩展的成员变量上加```@Transient```注解，详情见[通用Mapper插件文档说明](https://mapperhelper.github.io/docs/2.use/)
 - 建议业务失败直接使用```ServiceException("message")```抛出，由统一异常处理器来封装业务失败的响应结果，比如```throw new ServiceException("该手机号已被注册")```，会直接被封装为```{"code":400,"message":"该手机号已被注册"}```返回，无需自己处理，尽情抛出
 - 需要工具类的话建议先从```apache-commons-*```和```guava```中找，实在没有再造轮子或引入类库，尽量精简项目
 - 开发规范建议遵循阿里巴巴Java开发手册（[最新版下载](https://github.com/alibaba/p3c))
 - 建议在公司内部使用[ShowDoc](https://github.com/star7th/showdoc)、[SpringFox-Swagger2](https://github.com/springfox/springfox) 、[RAP](https://github.com/thx/RAP)等开源项目来编写、管理API文档
- 
+
 ## 技术选型&文档
 - Spring Boot（[查看Spring Boot学习&使用指南](http://www.jianshu.com/p/1a9fd8936bd8)）
 - MyBatis（[查看官方中文文档](http://www.mybatis.org/mybatis-3/zh/index.html)）

diff --git a/pom.xml b/pom.xml
@@ -11,20 +11,33 @@
 
  <properties>
  <java.version>1.8</java.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+
+ <!--jackson-->
+ <jackson.version>2.9.8</jackson.version>
+
  </properties>
 
  <!-- Inherit defaults from Spring Boot -->
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.13.RELEASE</version>
+ <version>2.1.3.RELEASE</version>
  </parent>
 
  <dependencies>
  <!--Spring Boot依赖-->
  <dependency>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
  <dependency>
  <groupId>org.springframework.boot</groupId>
@@ -70,19 +83,38 @@
  <dependency>
  <groupId>tk.mybatis</groupId>
  <artifactId>mapper</artifactId>
- <version>3.4.2</version>
+ <version>4.1.5</version>
  </dependency>
  <dependency>
  <groupId>com.github.pagehelper</groupId>
  <artifactId>pagehelper</artifactId>
  <version>4.2.1</version>
  </dependency>
  <!--阿里 FastJson依赖-->
- <dependency>
+ <!--<dependency>
  <groupId>com.alibaba</groupId>
  <artifactId>fastjson</artifactId>
  <version>1.2.47</version>
+ </dependency>-->
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-xml</artifactId>
+ <version>${jackson.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ </exclusion>
+ </exclusions>
  </dependency>
+
  <!--阿里 Druid Spring Boot Starter依赖-->
  <dependency>
  <groupId>com.alibaba</groupId>
@@ -106,10 +138,6 @@
 
  <build>
  <plugins>
- <plugin>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-maven-plugin</artifactId>
- </plugin>
  <plugin>
  <artifactId>maven-compiler-plugin</artifactId>
  <configuration>
@@ -118,6 +146,83 @@
  <encoding>UTF-8</encoding>
  </configuration>
  </plugin>
+
+ <!--使用 maven-jar-plugin 修改 MANIFEST.MF-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <finalName>${project.artifactId}-${project.version}</finalName>
+ <excludes>
+ <exclude>*.xml</exclude>
+ <exclude>*.properties</exclude>
+ <exclude>*/*.xml</exclude>
+ </excludes>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <mainClass>com.company.project.AppStarter</mainClass>
+ <!--classpath加前缀，需要与assembly.xml中的outputDirectory保持一致-->
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ <!--<manifestEntries>
+ <Class-Path>./</Class-Path>
+ </manifestEntries>-->
+ </archive>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>${project.artifactId}</artifactId>
+ <version>${project.version}</version>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <finalName>seed-test</finalName>
+ <descriptors>
+ <descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- 打包发布时，跳过单元测试 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+
  </plugins>
  </build>
 

diff --git a/src/main/assembly/assembly.xml b/src/main/assembly/assembly.xml
@@ -0,0 +1,55 @@
+<!--
+ - Copyright 1999-2011 Alibaba Group.
+ - 
+ - 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.
+-->
+<assembly>
+ <id>assembly</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <!-- 压缩包下是否生成和项目名相同的根目录 -->
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/assembly/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>src/main/resources/</directory>
+ <!--<includes>
+ <include>*.properties</include>
+ </includes>-->
+ <outputDirectory>config</outputDirectory>
+ <fileMode>0644</fileMode>
+ </fileSet>
+
+ <!-- 把项目自己编译出来的jar文件，打包进gz文件的根目录 -->
+ <fileSet>
+ <directory>${project.build.directory}</directory>
+ <outputDirectory>.</outputDirectory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <!-- 不使用项目的artifact，第三方jar不要解压，打包进zip文件的lib目录 -->
+ <useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>lib</outputDirectory>
+ </dependencySet>
+ </dependencySets>
+</assembly>
diff --git a/src/main/assembly/bin/dump.sh b/src/main/assembly/bin/dump.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+cd `dirname $0`
+BIN_DIR=`pwd`
+cd ..
+DEPLOY_DIR=`pwd`
+CONF_DIR=${DEPLOY_DIR}/config
+
+SERVER_NAME=`sed '/server.servlet.application-display-name/!d;s/.*=//' config/application.properties | tr -d '\r'`
+LOGS_FILE=`sed '/logging.path/!d;s/.*=//' config/application.properties | tr -d '\r'`
+
+if [ -z "$SERVER_NAME" ]; then
+ SERVER_NAME=`hostname`
+fi
+
+PIDS=`ps -ef | grep java | grep "$CONF_DIR" |awk '{print $2}'`
+if [ -z "$PIDS" ]; then
+ echo "ERROR: The $SERVER_NAME does not started!"
+ exit 1
+fi
+
+LOGS_DIR=""
+if [ -n "$LOGS_FILE" ]; then
+ LOGS_DIR=`dirname ${LOGS_FILE}`
+else
+ LOGS_DIR=$HOME/logs
+fi
+if [ ! -d ${LOGS_DIR} ]; then
+ mkdir ${LOGS_DIR}
+fi
+DUMP_DIR=${LOGS_DIR}/dump-${SERVER_NAME}
+if [ ! -d ${DUMP_DIR} ]; then
+ mkdir ${DUMP_DIR}
+fi
+DUMP_DATE=`date +%Y%m%d%H%M%S`
+DATE_DIR=${DUMP_DIR}/${DUMP_DATE}
+if [ ! -d ${DATE_DIR} ]; then
+ mkdir ${DATE_DIR}
+fi
+
+echo -e "Dumping the $SERVER_NAME ...\c"
+for PID in ${PIDS} ; do
+ jstack ${PID} > ${DATE_DIR}/jstack-${PID}.dump 2>&1
+ echo -e ".\c"
+ jinfo ${PID} > ${DATE_DIR}/jinfo-${PID}.dump 2>&1
+ echo -e ".\c"
+ jstat -gcutil ${PID} > ${DATE_DIR}/jstat-gcutil-${PID}.dump 2>&1
+ echo -e ".\c"
+ jstat -gccapacity ${PID} > ${DATE_DIR}/jstat-gccapacity-${PID}.dump 2>&1
+ echo -e ".\c"
+ jmap ${PID} > ${DATE_DIR}/jmap-${PID}.dump 2>&1
+ echo -e ".\c"
+ jmap -heap ${PID} > ${DATE_DIR}/jmap-heap-${PID}.dump 2>&1
+ echo -e ".\c"
+ jmap -histo ${PID} > ${DATE_DIR}/jmap-histo-${PID}.dump 2>&1
+ echo -e ".\c"
+ if [ -r /usr/sbin/lsof ]; then
+ /usr/sbin/lsof -p ${PID} > ${DATE_DIR}/lsof-${PID}.dump
+ echo -e ".\c"
+ fi
+done
+
+if [ -r /bin/netstat ]; then
+/bin/netstat -an > ${DATE_DIR}/netstat.dump 2>&1
+echo -e ".\c"
+fi
+if [ -r /usr/bin/iostat ]; then
+/usr/bin/iostat > ${DATE_DIR}/iostat.dump 2>&1
+echo -e ".\c"
+fi
+if [ -r /usr/bin/mpstat ]; then
+/usr/bin/mpstat > ${DATE_DIR}/mpstat.dump 2>&1
+echo -e ".\c"
+fi
+if [ -r /usr/bin/vmstat ]; then
+/usr/bin/vmstat > ${DATE_DIR}/vmstat.dump 2>&1
+echo -e ".\c"
+fi
+if [ -r /usr/bin/free ]; then
+/usr/bin/free -t > ${DATE_DIR}/free.dump 2>&1
+echo -e ".\c"
+fi
+if [ -r /usr/bin/sar ]; then
+/usr/bin/sar > ${DATE_DIR}/sar.dump 2>&1
+echo -e ".\c"
+fi
+if [ -r /usr/bin/uptime ]; then
+/usr/bin/uptime > ${DATE_DIR}/uptime.dump 2>&1
+echo -e ".\c"
+fi
+
+echo "OK!"
+echo "DUMP: $DATE_DIR"
diff --git a/src/main/assembly/bin/restart.sh b/src/main/assembly/bin/restart.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+cd `dirname $0`
+./stop.sh
+./start.sh
diff --git a/src/main/assembly/bin/server.sh b/src/main/assembly/bin/server.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+cd `dirname $0`
+if [ "$1" = "start" ]; then
+ ./start.sh
+else
+ if [ "$1" = "stop" ]; then
+ ./stop.sh
+ else
+ if [ "$1" = "debug" ]; then
+ ./start.sh debug
+ else
+ if [ "$1" = "restart" ]; then
+ ./restart.sh
+ else
+ if [ "$1" = "dump" ]; then
+ ./dump.sh
+ else
+ echo "ERROR: Please input argument: start or stop or debug or restart or dump"
+ exit 1
+ fi
+ fi
+ fi
+ fi
+fi