update pom and yml

include: springboot mp-plus change tomcat to undertown

update pom and yml
include: springboot mp-plus change tomcat to undertown
1f3adafd · zhfish · 7cefff99 · 1f3adafd · 1f3adafd · 1f3adafd
Commit 1f3adafd authored Jan 14, 2018 by zhfish
8 changed files
--- a/guns-admin/pom.xml
+++ b/guns-admin/pom.xml
@@ -150,6 +150,26 @@
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-lang3</artifactId>
        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-http</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-miniapp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-pay</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.binarywang</groupId>
+            <artifactId>weixin-java-mp</artifactId>
+        </dependency>
    </dependencies>
    <build>

--- a/guns-admin/src/main/java/com/stylefeng/guns/common/constant/enums/Status.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/common/constant/enums/Status.java
+package com.stylefeng.guns.common.constant.enums;
+import com.baomidou.mybatisplus.enums.IEnum;
+import java.io.Serializable;
+/**
+ * 通用的业务状态
+ *
+ * @author zhfish
+ */
+public enum Status implements IEnum{
+    未启用(0),
+    启用(1);
+    private int value;
+    Status(final int value) {
+        this.value = value;
+    }
+    @Override
+    public Serializable getValue() {
+        return this.value;
+    }
+    @Override
+    public String toString(){
+        switch (this.value) {
+            case 0:
+                return "未启用";
+            case 1:
+                return "启用";
+        }
+        return "未启用";
+    }
+}
--- a/guns-admin/src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
+++ b/guns-admin/src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
 package com.stylefeng.guns.config;
 import com.alibaba.druid.pool.DruidDataSource;
+import com.baomidou.mybatisplus.plugins.OptimisticLockerInterceptor;
 import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
 import com.stylefeng.guns.common.constant.DSEnum;
 import com.stylefeng.guns.core.datascope.DataScopeInterceptor;
@@ -104,4 +105,11 @@ public class MybatisPlusConfig {
    public DataScopeInterceptor dataScopeInterceptor() {
        return new DataScopeInterceptor();
    }
+    /*
+     * 乐观锁mybatis插件
+     */
+    @Bean
+    public OptimisticLockerInterceptor optimisticLockerInterceptor() { return new OptimisticLockerInterceptor(); }
 }
--- a/guns-admin/src/main/resources/application.yml
+++ b/guns-admin/src/main/resources/application.yml
@@ -62,10 +62,14 @@ spring:
 mybatis-plus:
  mapper-locations: classpath*:com/stylefeng/guns/**/mapping/*.xml
  typeAliasesPackage: com.stylefeng.guns.common.persistence.model
+  typeEnumsPackage: com.stylefeng.guns.common.constant.enums
  global-config:
    id-type: 0  #0:数据库ID自增   1:用户输入id  2:全局唯一id(IdWorker)  3:全局唯一ID(uuid)
    db-column-underline: false
    refresh-mapper: true
+    logic-delete-value: 0
+    logic-not-delete-value: 1
+    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
  configuration:
    map-underscore-to-camel-case: false
    cache-enabled: true #配置的缓存的全局开关

--- a/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultFastjsonConfig.java
+++ b/guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultFastjsonConfig.java
@@ -5,7 +5,7 @@ import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.serializer.ToStringSerializer;
 import com.alibaba.fastjson.serializer.ValueFilter;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter4;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
@@ -26,13 +26,13 @@ import java.util.List;
 */
 @Configuration("defaultFastjsonConfig")
 @ConditionalOnClass(com.alibaba.fastjson.JSON.class)
-@ConditionalOnMissingBean(FastJsonHttpMessageConverter4.class)
+@ConditionalOnMissingBean(FastJsonHttpMessageConverter.class)
 @ConditionalOnWebApplication
 public class DefaultFastjsonConfig {
    @Bean
-    public FastJsonHttpMessageConverter4 fastJsonHttpMessageConverter() {
+    public FastJsonHttpMessageConverter fastJsonHttpMessageConverter() {
-        FastJsonHttpMessageConverter4 converter = new FastJsonHttpMessageConverter4();
+        FastJsonHttpMessageConverter converter = new FastJsonHttpMessageConverter();
        converter.setFastJsonConfig(fastjsonConfig());
        converter.setSupportedMediaTypes(getSupportedMediaType());
        return converter;
@@ -45,7 +45,8 @@ public class DefaultFastjsonConfig {
        FastJsonConfig fastJsonConfig = new FastJsonConfig();
        fastJsonConfig.setSerializerFeatures(
                SerializerFeature.PrettyFormat,
-                SerializerFeature.WriteMapNullValue
+                SerializerFeature.WriteMapNullValue,
+                SerializerFeature.WriteEnumUsingToString
        );
        fastJsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
        ValueFilter valueFilter = new ValueFilter() {

--- a/guns-parent/pom.xml
+++ b/guns-parent/pom.xml
@@ -18,7 +18,7 @@
    <parent>
        <groupId>org.springframework.boot</groupId>
        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.3.RELEASE</version>
+        <version>1.5.9.RELEASE</version>
    </parent>
    <properties>
@@ -26,10 +26,10 @@
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
        <guns.version>1.0.0-SNAPSHOT</guns.version>
-        <mybatisplus-spring-boot-starter.version>1.0.4</mybatisplus-spring-boot-starter.version>
+        <mybatisplus-spring-boot-starter.version>1.0.5</mybatisplus-spring-boot-starter.version>
        <shiro.version>1.4.0</shiro.version>
-        <mybatis-plus.version>2.1.0</mybatis-plus.version>
+        <mybatis-plus.version>2.1.8</mybatis-plus.version>
-        <fastjson.version>1.2.41</fastjson.version>
+        <fastjson.version>1.2.44</fastjson.version>
        <commons.io.version>2.5</commons.io.version>
        <velocity.version>1.7</velocity.version>
        <kaptcha.version>2.3.2</kaptcha.version>
@@ -43,7 +43,7 @@
        <mysql-connector-java.version>5.1.38</mysql-connector-java.version>
        <jwt.version>0.7.0</jwt.version>
        <flowable.version>6.2.0</flowable.version>
-        <hutool.version>3.3.0</hutool.version>
+        <hutool.version>4.0.0</hutool.version>
        <mp-sdk.version>2.9.0</mp-sdk.version>
    </properties>
@@ -69,7 +69,7 @@
            <dependency>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-dependencies</artifactId>
-                <version>1.5.3.RELEASE</version>
+                <version>1.5.9.RELEASE</version>
                <type>pom</type>
                <scope>import</scope>
            </dependency>
@@ -170,12 +170,12 @@
                <version>${jwt.version}</version>
            </dependency>
            <dependency>
-                <groupId>com.xiaoleilu</groupId>
+                <groupId>cn.hutool</groupId>
                <artifactId>hutool-core</artifactId>
                <version>${hutool.version}</version>
            </dependency>
            <dependency>
-                <groupId>com.xiaoleilu</groupId>
+                <groupId>cn.hutool</groupId>
                <artifactId>hutool-http</artifactId>
                <version>${hutool.version}</version>
            </dependency>
@@ -212,7 +212,7 @@
                <plugin>
                    <groupId>org.springframework.boot</groupId>
                    <artifactId>spring-boot-maven-plugin</artifactId>
-                    <version>1.5.3.RELEASE</version>
+                    <version>1.5.9.RELEASE</version>
                </plugin>
            </plugins>
        </pluginManagement>

--- a/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/converter/WithSignMessageConverter.java
+++ b/guns-rest/src/main/java/com/stylefeng/guns/rest/modular/auth/converter/WithSignMessageConverter.java
 package com.stylefeng.guns.rest.modular.auth.converter;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter4;
+import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
 import com.stylefeng.guns.core.exception.GunsException;
 import com.stylefeng.guns.core.support.HttpKit;
 import com.stylefeng.guns.core.util.MD5Util;
@@ -23,7 +23,7 @@ import java.lang.reflect.Type;
 * @author fengshuonan
 * @date 2017-08-25 15:42
 */
-public class WithSignMessageConverter extends FastJsonHttpMessageConverter4 {
+public class WithSignMessageConverter extends FastJsonHttpMessageConverter {
    @Autowired
    JwtProperties jwtProperties;

--- a/guns-rest/src/main/resources/application.yml
+++ b/guns-rest/src/main/resources/application.yml
@@ -27,6 +27,12 @@ mybatis-plus:
 #    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 spring:
+  undertown:
+    io-threads: 2
+    worker-threads: 20
+    buffer-size: 1024
+    buffers-per-region: 1024
+    direct-buffers: true
  datasource:
      url: jdbc:mysql://127.0.0.1:3306/rest?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull
      username: root