Commit 52131ee4 by stylefeng

更新配置

parent 5edc1033
...@@ -39,11 +39,13 @@ public class FlowableConfig extends AbstractProcessEngineAutoConfiguration { ...@@ -39,11 +39,13 @@ public class FlowableConfig extends AbstractProcessEngineAutoConfiguration {
return dataSource; return dataSource;
} }
/**
* spring-flowable拓展配置
*/
@Bean @Bean
public SpringProcessEngineConfiguration springProcessEngineConfiguration( public SpringProcessEngineConfiguration springProcessEngineConfiguration(
PlatformTransactionManager transactionManager, PlatformTransactionManager transactionManager,
SpringAsyncExecutor springAsyncExecutor) throws IOException { SpringAsyncExecutor springAsyncExecutor) throws IOException {
SpringProcessEngineConfiguration configuration = this.baseSpringProcessEngineConfiguration(flowableDataSource(), transactionManager, springAsyncExecutor); SpringProcessEngineConfiguration configuration = this.baseSpringProcessEngineConfiguration(flowableDataSource(), transactionManager, springAsyncExecutor);
configuration.setActivityFontName("宋体"); configuration.setActivityFontName("宋体");
configuration.setLabelFontName("宋体"); configuration.setLabelFontName("宋体");
......
...@@ -35,7 +35,6 @@ public class MybatisPlusConfig { ...@@ -35,7 +35,6 @@ public class MybatisPlusConfig {
@Autowired @Autowired
MutiDataSourceProperties mutiDataSourceProperties; MutiDataSourceProperties mutiDataSourceProperties;
/** /**
* 另一个数据源 * 另一个数据源
*/ */
......
...@@ -12,5 +12,4 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; ...@@ -12,5 +12,4 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "true") @ConditionalOnProperty(prefix = "guns", name = "spring-session-open", havingValue = "true")
public class SpringSessionConfig { public class SpringSessionConfig {
} }
...@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; ...@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
/** /**
* flow的配置 * flowable工作流的的配置
* *
* @author fengshuonan * @author fengshuonan
* @date 2017-12-02 23:18 * @date 2017-12-02 23:18
...@@ -16,13 +16,19 @@ public class GunsFlowableProperties { ...@@ -16,13 +16,19 @@ public class GunsFlowableProperties {
public static final String GUNS_FLOWABLE_DATASOURCE = "guns.flowable.datasource"; public static final String GUNS_FLOWABLE_DATASOURCE = "guns.flowable.datasource";
//默认多数据源的链接 /**
* 默认多数据源的链接
*/
private String url = "jdbc:mysql://127.0.0.1:3306/guns_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull"; private String url = "jdbc:mysql://127.0.0.1:3306/guns_flowable?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull";
//默认多数据源的数据库账号 /**
* 默认多数据源的数据库账号
*/
private String username = "root"; private String username = "root";
//默认多数据源的数据库密码 /**
* 默认多数据源的数据库密码
*/
private String password = "root"; private String password = "root";
public void config(DruidDataSource dataSource) { public void config(DruidDataSource dataSource) {
......
...@@ -30,9 +30,15 @@ public class GunsProperties { ...@@ -30,9 +30,15 @@ public class GunsProperties {
private Boolean springSessionOpen = false; private Boolean springSessionOpen = false;
private Integer sessionInvalidateTime = 30 * 60; //session 失效时间(默认为30分钟 单位:秒) /**
* session 失效时间(默认为30分钟 单位:秒)
*/
private Integer sessionInvalidateTime = 30 * 60;
private Integer sessionValidationInterval = 15 * 60; //session 验证失效时间(默认为15分钟 单位:秒) /**
* session 验证失效时间(默认为15分钟 单位:秒)
*/
private Integer sessionValidationInterval = 15 * 60;
public String getFileUploadPath() { public String getFileUploadPath() {
//如果没有写文件上传路径,保存到临时目录 //如果没有写文件上传路径,保存到临时目录
...@@ -44,7 +50,7 @@ public class GunsProperties { ...@@ -44,7 +50,7 @@ public class GunsProperties {
fileUploadPath = fileUploadPath + File.separator; fileUploadPath = fileUploadPath + File.separator;
} }
//判断目录存不存在,不存在得加上 //判断目录存不存在,不存在得加上
if (haveCreatePath == false) { if (!haveCreatePath) {
File file = new File(fileUploadPath); File file = new File(fileUploadPath);
file.mkdirs(); file.mkdirs();
haveCreatePath = true; haveCreatePath = true;
......
...@@ -78,7 +78,6 @@ public class ShiroConfig { ...@@ -78,7 +78,6 @@ public class ShiroConfig {
return sessionManager; return sessionManager;
} }
/** /**
* 缓存管理器 使用Ehcache实现 * 缓存管理器 使用Ehcache实现
*/ */
......
...@@ -66,7 +66,6 @@ public class WebConfig { ...@@ -66,7 +66,6 @@ public class WebConfig {
return new DruidStatInterceptor(); return new DruidStatInterceptor();
} }
@Bean @Bean
public JdkRegexpMethodPointcut druidStatPointcut(){ public JdkRegexpMethodPointcut druidStatPointcut(){
JdkRegexpMethodPointcut druidStatPointcut = new JdkRegexpMethodPointcut(); JdkRegexpMethodPointcut druidStatPointcut = new JdkRegexpMethodPointcut();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment