DONT COMMIT

crss-meterprocess-app/crss-meterprocess-app-dev.yml

@@ -1,27 +1,27 @@
 spring:
   crss-main:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_meterprocess
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_meterprocess
+      username: postgres
+      password: postgres
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-registration:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_reg
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_reg
+      username: postgres
+      password: postgres
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
       validation-query: SELECT 1
   crss-nmms:
     datasource:
-      jdbcUrl: jdbc:postgresql://192.168.236.2:5432/crss_nmms
-      username: admin
-      password: password
+      jdbcUrl: jdbc:postgresql://localhost:5432/crss_nmms
+      username: postgres
+      password: postgres
       driverClassName: org.postgresql.Driver
       maxPoolSize: 5
       test-on-borrow: true
@@ -29,7 +29,7 @@ spring:
 
   jpa:
     show-sql: false
-    generate-ddl: true
+    generate-ddl: false
     properties:
       hibernate:
         generate_statistics: true
@@ -47,7 +47,7 @@ spring:
 #  change-log: classpath:/db/db.changelog-master.xml
 
 server:
-  port: 8081
+  port: 9091
   undertow:
     accesslog:
       dir: target
@@ -57,44 +57,52 @@ server:
     enabled: true
     min-response-size: 1
 
-#security:
-#  oauth2:
-#    client:
-#      accessTokenUri: http://localhost:8082/oauth/access_token
-#      userAuthorizationUri: http://localhost:8082/oauth/authorize
-#      clientId: crss
-#      clientSecret: crsssecret
-#      authorized-grant-types: authorization_code,refresh_token,password
-#      scope: openid
-#      access-token-validity-seconds: 3600
-#    resource:
-#      userInfoUri: http://localhost:8082/user
+eureka:
+  instance:
+    prefer-ip-address: true
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+#          healthcheck:
+#            enabled: true
+#    lease:
+#      duration: 5
+#  instance:
+#    leaseRenewalIntervalInSeconds: 1
+#    leaseExpirationDurationInSeconds: 2
+
+security:
+  oauth2:
+    client:
+      accessTokenUri: http://localhost:8082/oauth/access_token
+      userAuthorizationUri: http://localhost:8082/oauth/authorize
+      clientId: crss
+      clientSecret: crsssecret
+      authorized-grant-types: authorization_code,refresh_token,password
+      scope: openid
+      access-token-validity-seconds: 3600
+    resource:
+      userInfoUri: http://localhost:8082/user
 
 logging:
   level:
     com.pemc: DEBUG
     com.netflix: DEBUG
     org.springframework.cloud: DEBUG
+    org.apache.http: DEBUG
     org.hibernate.stat: debug
 
 dataflow:
-  url: http://spring-cloud-data-flow.marathon.l4lb.thisdcos.directory:9393
+  url: http://localhost:9393
 
 job:
   maxRun: 1
 
-security:
-  ignored: /**
-
-management:
-  security:
-    enabled: false
-
 sftp:
   credentials:
     username: pemc
     password: 123qwe
-    host: sftp.marathon.l4lb.thisdcos.directory
+    host: pemc-storage.southeastasia.cloudapp.azure.com
     port: 22
-    workingDirectory: /upload
-    privateKey:
+    workingDirectory: /home/pemc/upload
+    privateKey: