diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 28cd5320..6307caca 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/db-mcms?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true + url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true username: root password: root filters: wall,mergeStat diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index db7191b9..6307caca 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1 +1,7 @@ -mcms4.7.0 Oracle数据库暂不支持 \ No newline at end of file +spring: + datasource: + url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true + username: root + password: root + filters: wall,mergeStat + type: com.alibaba.druid.pool.DruidDataSource \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e219c8ad..a35e941b 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,6 +1,7 @@ server: port: 8080 servlet.context-path: /ms-mcms + servlet.session.timeout: 60M logging: level: @@ -9,9 +10,6 @@ ms: manager: path: /ms view-path: /WEB-INF/manager - session: - timeout: 1800000 - validation-interval: 120000 upload: path: /upload