diff --git a/pom.xml b/pom.xml index 3ba9f2c..69f6c3d 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ commons-fileupload commons-fileupload - 1.2.2 + 1.3.3 commons-io @@ -126,7 +126,7 @@ com.alibaba fastjson - 1.1.26 + 1.2.61 diff --git a/src/main/java/com/changyu/foryou/PortraitApplication.java b/src/main/java/com/changyu/foryou/Application.java similarity index 87% rename from src/main/java/com/changyu/foryou/PortraitApplication.java rename to src/main/java/com/changyu/foryou/Application.java index 7bd7b2e..39b8292 100644 --- a/src/main/java/com/changyu/foryou/PortraitApplication.java +++ b/src/main/java/com/changyu/foryou/Application.java @@ -12,7 +12,7 @@ @SpringBootApplication @PropertySource("application.properties") -public class PortraitApplication extends SpringBootServletInitializer { +public class Application extends SpringBootServletInitializer { @Bean public MultipartConfigElement multipartConfigElement() { @@ -29,10 +29,10 @@ public MultipartConfigElement multipartConfigElement() { @Override protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(PortraitApplication.class); + return application.sources(Application.class); } public static void main(String[] args) { - SpringApplication.run(PortraitApplication.class, args); + SpringApplication.run(Application.class, args); } } diff --git a/src/main/java/com/changyu/foryou/config/MybatisConfig.java b/src/main/java/com/changyu/foryou/config/MybatisConfig.java index 793d138..52a9e2d 100644 --- a/src/main/java/com/changyu/foryou/config/MybatisConfig.java +++ b/src/main/java/com/changyu/foryou/config/MybatisConfig.java @@ -1,7 +1,6 @@ package com.changyu.foryou.config; import com.alibaba.druid.pool.DruidDataSource; -import com.mysql.cj.jdbc.Driver; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.mapper.MapperScannerConfigurer; import org.springframework.context.annotation.Bean; @@ -14,6 +13,8 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; +import com.mysql.jdbc.Driver; + /** * Created by zhengzh on 2016/8/17. */ diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index e075af6..903b73c 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,5 +1,5 @@ #mybatis -mybatis.type-aliases-package=com.nawaa.portrait.models +mybatis.type-aliases-package=com.changyu.foryou.model mybatis.mapper-locations=classpath:com/changyu/foryou/mapping/*.xml mybatis.configuration.map-underscore-to-camel-case=false mybatis.configuration.default-fetch-size=10 @@ -11,7 +11,7 @@ mybatis.config-location=classpath:mybatis.xml spring.datasource.url=jdbc:mysql://localhost:3306/foryou?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&nullNamePatternMatchesAll=true spring.datasource.name=foryou spring.datasource.username=root -spring.datasource.password=zc0829 +spring.datasource.password=****** validationQuery=SELECT 1 server.port=8080 \ No newline at end of file