purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级springboot版本依赖到2.0，修复部分文件内容乱码，加入配置文件为properties

Browse Source
This commit is contained in:
cjl
2019-01-11 08:58:44 +08:00
parent c43441fe3a
commit 5b5f144abf
14 changed files with 845 additions and 899 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
src/main/java/com/jsh/erp/config/DbConfig.java
View File

@@ -1,97 +0,0 @@
package com.jsh.erp.config;
import com.alibaba.druid.pool.DruidDataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Primary;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.sql.DataSource;
@Configuration
@EnableTransactionManagement(proxyTargetClass = true)
public class DbConfig {
private static final Logger logger = LoggerFactory.getLogger(DbConfig.class);
@Bean(name = "erpDatasource")
@Primary
public DataSource erpDatasource(ErpDatasourceProperties properties){
try {
DruidDataSource datasource = new DruidDataSource();
datasource.setDriverClassName(properties.driverClassName);
datasource.setUrl(properties.url);
datasource.setUsername(properties.username);
datasource.setPassword(properties.password);
datasource.setInitialSize(1);
datasource.setMinIdle(1);
datasource.setMaxWait(60000);
datasource.setMaxActive(5);
datasource.setTimeBetweenEvictionRunsMillis(60000);
datasource.setValidationQuery("select '1'");
datasource.setTestOnBorrow(false);
datasource.setTestOnReturn(false);
datasource.setTestWhileIdle(true);
datasource.setPoolPreparedStatements(true);
datasource.setMaxOpenPreparedStatements(20);
datasource.setMinEvictableIdleTimeMillis(300000);
datasource.init();
return datasource;
}catch (Exception e){
logger.error("服务启动失败，jsh_erp数据库Datasource初始化失败:"+e.getMessage());
throw new IllegalArgumentException(e);
}
}
@Bean
@Primary
public JdbcTemplate jdbcTemplate(@Qualifier("erpDatasource") DataSource dataSource) {
return new JdbcTemplate(dataSource);
}
@Configuration
@ConfigurationProperties(prefix = "erpDatasource")
public static class ErpDatasourceProperties {
private String driverClassName;
private String url;
private String username;
private String password;
public String getDriverClassName() {
return driverClassName;
}
public void setDriverClassName(String driverClassName) {
this.driverClassName = driverClassName;
}
public String getUrl() {
return url;
}
public void setUrl(String url) {
this.url = url;
}
public String getUsername() {
return username;
}
public void setUsername(String username) {
this.username = username;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
}
}

71
src/main/java/com/jsh/erp/config/WebConfig.java
View File

@@ -1,40 +1,33 @@
package com.jsh.erp.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.embedded.ConfigurableEmbeddedServletContainer;
import org.springframework.boot.context.embedded.EmbeddedServletContainerCustomizer;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
import java.io.File;
@Configuration
public class WebConfig {
private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);
@Configuration
@ConfigurationProperties(prefix = "web.front")
public static class FrontEnd implements EmbeddedServletContainerCustomizer {
private File baseDir;
public File getBaseDir() {
return baseDir;
}
public void setBaseDir(File baseDir) {
this.baseDir = baseDir;
}
@Override
public void customize(ConfigurableEmbeddedServletContainer container) {
if (!baseDir.exists()) {
if (!baseDir.mkdir()) {
logger.info("create web.front base path:" + baseDir + " failed!already exists!");
} else {
logger.info("create web.front base path:" + baseDir + " success!");
}
}
container.setDocumentRoot(baseDir);
}
}
package com.jsh.erp.config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.web.server.WebServerFactoryCustomizer;
import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
import org.springframework.context.annotation.Configuration;
import java.io.File;
//@Configuration
public class WebConfig {
private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);
@Configuration
public static class FrontEnd implements WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> {
@Value("${web.front.baseDir}")
private File baseDir;
@Override
public void customize(ConfigurableServletWebServerFactory factory) {
if (!baseDir.exists()) {
if (!baseDir.mkdir()) {
logger.info("create web.front base path:" + baseDir + " failed!already exists!");
} else {
logger.info("create web.front base path:" + baseDir + " success!");
}
}
factory.setDocumentRoot(baseDir);
}
}
}