ms group dev преди 6 години
родител
ревизия
03e2ac9b32
променени са 3 файла, в които са добавени 9 реда и са изтрити 5 реда
  1. 1 1
      src/main/resources/application-dev.yml
  2. 7 1
      src/main/resources/application-test.yml
  3. 1 3
      src/main/resources/application.yml

+ 1 - 1
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

+ 7 - 1
src/main/resources/application-test.yml

@@ -1 +1,7 @@
-mcms4.7.0 Oracle数据库暂不支持
+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

+ 1 - 3
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