Service Discovery Removal

application.yml

@@ -60,10 +60,7 @@ spring:
 spring:
   profiles: docker
 security.server.url: http://app:8080/admin
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://discovery:8080/eureka/
+
 ---
 spring:
   profiles: staging

crss-admin/crss-admin-dev.yml

@@ -35,4 +35,4 @@ spring:
 server:
   port: 8082
 
-app.esignatures.root-folder: /crss/esig
+app.esignatures.root-folder: target/crss/esig

crss-reg/crss-reg-dev.yml

@@ -22,7 +22,7 @@ app:
     root-folder: target/crss/docmgt
   xdf:
     client-type: local  # OPTIONS:[local, ftp, sftp]
-    root-folder: /crss/xdf
+    root-folder: target/crss/docmgt
     auto-create-dir: true
     file-encoding: UTF-8
     file-exists-mode: fail  # OPTIONS:[append, append_no_flush, fail, ignore, replace]
@@ -31,3 +31,5 @@ app:
       port: 22
       username: crss
       password: crss
+service:
+  admin.url: http://localhost:8082

crss-reg/crss-reg.yml

@@ -46,3 +46,6 @@ server:
    #   DEFAULT_VIEW_INCLUSION: true
    serialization:
      write_dates_as_timestamps: false
+
+service:
+  admin.url: http://app:8080/admin

crss-ui/crss-ui.yml

@@ -1,4 +1,5 @@
 zuul:
+  host.socket-timeout-millis: 30000
   ignoredServices: '*'
   #default is Cookie,Set-Cookie,Authorization.
   #removed Authorization from senstiive headers
@@ -6,16 +7,29 @@ zuul:
   routes:
     admin:
       path: /admin/**
-      serviceId: crss-admin
+      serviceId: admin-service
     reg:
       path: /reg/**
-      serviceId: crss-reg
+      serviceId: registration-service
     metering:
       path: /metering/**
-      serviceId: crss-metering
+      serviceId: metering-service
     scheduler:
       path: /sched/**
-      serviceId: crss-sched
+      serviceId: scheduler-service
+
+admin-service:
+  ribbon:
+    listOfServers: http://admin:8080
+registration-service:
+  ribbon:
+    listOfServers: http://registration:8080
+metering-service:
+  ribbon:
+    listOfServers: http://metering:8080
+scheduler-service:
+  ribbon:
+    listOfServers: http://scheduler:8080
 
 hystrix:
   command:
@@ -24,6 +38,7 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 300000
+zuul.host.socket-timeout-millis: 30000
 
 ribbon:
   ConnectTimeout: 3000
@@ -50,3 +65,19 @@ server:
     buffer-size: 16384 # Socket buffer size. Default is 16kb
     io-threads: 16 # The number of I/O threads created for non-blocking tasks. (#CPU * 2)
     worker-threads: 128 # CPU * 16
+
+---
+spring:
+  profiles: dev
+admin-service:
+  ribbon:
+    listOfServers: http://localhost:8082
+registration-service:
+  ribbon:
+    listOfServers: http://localhost:8081
+metering-service:
+  ribbon:
+    listOfServers: http://localhost:8084
+scheduler-service:
+  ribbon:
+    listOfServers: http://localhost:8085