Browse Source

Modified scheduler config

- Additional config for staging and uat
- Set jdbc to psql
Chris Lim 9 years ago
parent
commit
5c13fe448d
3 changed files with 42 additions and 22 deletions
  1. 0 18
      crss-sched/crss-sched-dev.yml
  2. 38 0
      crss-sched/crss-sched-staging.yml
  3. 4 4
      crss-sched/crss-sched.yml

+ 0 - 18
crss-sched/crss-sched-dev.yml

@@ -20,17 +20,6 @@ spring:
       - "5672:5672"
       - "15672:15672"
 
-server:
-  port: 8085
-  undertow:
-    accesslog:
-      dir: target
-      enabled: true
-      pattern: combined
-  compression:
-    enabled: true
-    min-response-size: 1
-
 eureka:
   client:
     serviceUrl:
@@ -48,10 +37,3 @@ security:
       access-token-validity-seconds: 3600
     resource:
       userInfoUri: http://localhost:8082/user
-
-logging:
-  level:
-    com.pemc: DEBUG
-    com.netflix: WARN
-    org.springframework.cloud: WARN
-    org.hibernate.SQL: DEBUG

+ 38 - 0
crss-sched/crss-sched-staging.yml

@@ -1,2 +1,40 @@
+spring:
+  datasource:
+    url: jdbc:postgresql://192.168.241.62:5432/crss_sched
+    username: crss_sched
+    password: crss_sched
+    driverClassName: org.postgresql.Driver
+    hikari:
+      connectionTimeout: 10000
+      maximumPoolSize: 20
+  jpa:
+    database: POSTGRESQL
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect
+  rabbitmq:
+    host: pemc-oracle.ss.exist.com
+    ports:
+      - "5672:5672"
+      - "15672:15672"
+
 graylog:
   host: pemc.integration.exist.com
+
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://discovery:8080/eureka/
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://app:8080/admin/oauth/access_token
+      userAuthorizationUri: http://app:8080/admin/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://app:8080/admin/user

+ 4 - 4
crss-sched/crss-sched.yml

@@ -1,17 +1,17 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.235.6:1521:ORCL
+    url: jdbc:postgresql://192.168.235.6:5432/crss_sched
     username: crss_sched
     password: crss_sched
-    driverClassName: oracle.jdbc.OracleDriver
+    driverClassName: org.postgresql.Driver
     hikari:
       connectionTimeout: 10000
       maximumPoolSize: 20
   jpa:
-    database: ORACLE
+    database: POSTGRESQL
     properties:
       hibernate:
-        dialect: org.hibernate.dialect.Oracle10gDialect
+        dialect: org.hibernate.dialect.PostgreSQL94Dialect
   rabbitmq:
     host: pemc-oracle.ss.exist.com
     ports: