Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
52131ee4
Commit
52131ee4
authored
Feb 22, 2018
by
stylefeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新配置
parent
5edc1033
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
22 additions
and
12 deletions
+22
-12
guns-admin/src/main/java/com/stylefeng/guns/config/FlowableConfig.java
+3
-1
guns-admin/src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
+0
-1
guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
+0
-1
guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsFlowableProperties.java
+10
-4
guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java
+9
-3
guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java
+0
-1
guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
+0
-1
No files found.
guns-admin/src/main/java/com/stylefeng/guns/config/FlowableConfig.java
View file @
52131ee4
...
...
@@ -39,11 +39,13 @@ public class FlowableConfig extends AbstractProcessEngineAutoConfiguration {
return
dataSource
;
}
/**
* spring-flowable拓展配置
*/
@Bean
public
SpringProcessEngineConfiguration
springProcessEngineConfiguration
(
PlatformTransactionManager
transactionManager
,
SpringAsyncExecutor
springAsyncExecutor
)
throws
IOException
{
SpringProcessEngineConfiguration
configuration
=
this
.
baseSpringProcessEngineConfiguration
(
flowableDataSource
(),
transactionManager
,
springAsyncExecutor
);
configuration
.
setActivityFontName
(
"宋体"
);
configuration
.
setLabelFontName
(
"宋体"
);
...
...
guns-admin/src/main/java/com/stylefeng/guns/config/MybatisPlusConfig.java
View file @
52131ee4
...
...
@@ -35,7 +35,6 @@ public class MybatisPlusConfig {
@Autowired
MutiDataSourceProperties
mutiDataSourceProperties
;
/**
* 另一个数据源
*/
...
...
guns-admin/src/main/java/com/stylefeng/guns/config/SpringSessionConfig.java
View file @
52131ee4
...
...
@@ -12,5 +12,4 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@ConditionalOnProperty
(
prefix
=
"guns"
,
name
=
"spring-session-open"
,
havingValue
=
"true"
)
public
class
SpringSessionConfig
{
}
guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsFlowableProperties.java
View file @
52131ee4
...
...
@@ -5,7 +5,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
import
org.springframework.context.annotation.Configuration
;
/**
* flow的配置
* flow
able工作流的
的配置
*
* @author fengshuonan
* @date 2017-12-02 23:18
...
...
@@ -16,13 +16,19 @@ public class GunsFlowableProperties {
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
username
=
"root"
;
//默认多数据源的数据库密码
/**
* 默认多数据源的数据库密码
*/
private
String
password
=
"root"
;
public
void
config
(
DruidDataSource
dataSource
)
{
...
...
guns-admin/src/main/java/com/stylefeng/guns/config/properties/GunsProperties.java
View file @
52131ee4
...
...
@@ -30,9 +30,15 @@ public class GunsProperties {
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
()
{
//如果没有写文件上传路径,保存到临时目录
...
...
@@ -44,7 +50,7 @@ public class GunsProperties {
fileUploadPath
=
fileUploadPath
+
File
.
separator
;
}
//判断目录存不存在,不存在得加上
if
(
haveCreatePath
==
false
)
{
if
(
!
haveCreatePath
)
{
File
file
=
new
File
(
fileUploadPath
);
file
.
mkdirs
();
haveCreatePath
=
true
;
...
...
guns-admin/src/main/java/com/stylefeng/guns/config/web/ShiroConfig.java
View file @
52131ee4
...
...
@@ -78,7 +78,6 @@ public class ShiroConfig {
return
sessionManager
;
}
/**
* 缓存管理器 使用Ehcache实现
*/
...
...
guns-admin/src/main/java/com/stylefeng/guns/config/web/WebConfig.java
View file @
52131ee4
...
...
@@ -66,7 +66,6 @@ public class WebConfig {
return
new
DruidStatInterceptor
();
}
@Bean
public
JdkRegexpMethodPointcut
druidStatPointcut
(){
JdkRegexpMethodPointcut
druidStatPointcut
=
new
JdkRegexpMethodPointcut
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment