Skip to content

Commit b5f3819

Browse files
author
zhengzhihao
committed
修改fastjson版本
1 parent 5701a2c commit b5f3819

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@
126126
<dependency>
127127
<groupId>com.alibaba</groupId>
128128
<artifactId>fastjson</artifactId>
129-
<version>1.1.26</version>
129+
<version>1.2.61</version>
130130
</dependency>
131131
</dependencies>
132132

src/main/java/com/changyu/foryou/PortraitApplication.java renamed to src/main/java/com/changyu/foryou/Application.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
@SpringBootApplication
1414
@PropertySource("application.properties")
15-
public class PortraitApplication extends SpringBootServletInitializer {
15+
public class Application extends SpringBootServletInitializer {
1616

1717
@Bean
1818
public MultipartConfigElement multipartConfigElement() {
@@ -29,10 +29,10 @@ public MultipartConfigElement multipartConfigElement() {
2929

3030
@Override
3131
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
32-
return application.sources(PortraitApplication.class);
32+
return application.sources(Application.class);
3333
}
3434

3535
public static void main(String[] args) {
36-
SpringApplication.run(PortraitApplication.class, args);
36+
SpringApplication.run(Application.class, args);
3737
}
3838
}

src/main/java/com/changyu/foryou/config/MybatisConfig.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.changyu.foryou.config;
22

33
import com.alibaba.druid.pool.DruidDataSource;
4-
import com.mysql.cj.jdbc.Driver;
54
import org.mybatis.spring.SqlSessionFactoryBean;
65
import org.mybatis.spring.mapper.MapperScannerConfigurer;
76
import org.springframework.context.annotation.Bean;
@@ -14,6 +13,8 @@
1413
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
1514
import org.springframework.transaction.annotation.EnableTransactionManagement;
1615

16+
import com.mysql.jdbc.Driver;
17+
1718
/**
1819
* Created by zhengzh on 2016/8/17.
1920
*/

src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#mybatis
2-
mybatis.type-aliases-package=com.nawaa.portrait.models
2+
mybatis.type-aliases-package=com.changyu.foryou.model
33
mybatis.mapper-locations=classpath:com/changyu/foryou/mapping/*.xml
44
mybatis.configuration.map-underscore-to-camel-case=false
55
mybatis.configuration.default-fetch-size=10
@@ -11,7 +11,7 @@ mybatis.config-location=classpath:mybatis.xml
1111
spring.datasource.url=jdbc:mysql://localhost:3306/foryou?useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&nullNamePatternMatchesAll=true
1212
spring.datasource.name=foryou
1313
spring.datasource.username=root
14-
spring.datasource.password=zc0829
14+
spring.datasource.password=******
1515
validationQuery=SELECT 1
1616

1717
server.port=8080

0 commit comments

Comments
 (0)