changing eureka address

2020-11-04 13:54:15 +01:00
parent f8a89002e5
commit c8615bec4f
5 changed files with 24 additions and 35 deletions
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -24,6 +24,10 @@
  <component name="ChangeListManager">
    <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/application.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/application.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap-PROD.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap-PROD.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -263,13 +267,6 @@
      <option name="presentableId" value="Default" />
      <updated>1598862102028</updated>
    </task>
-    <task id="LOCAL-00063" summary="clean before the build">
-      <created>1601301048201</created>
-      <option name="number" value="00063" />
-      <option name="presentableId" value="LOCAL-00063" />
-      <option name="project" value="LOCAL" />
-      <updated>1601301048201</updated>
-    </task>
    <task id="LOCAL-00064" summary="jenkins - testing remote deploy">
      <created>1601370283197</created>
      <option name="number" value="00064" />
@@ -606,7 +603,14 @@
      <option name="project" value="LOCAL" />
      <updated>1604428725798</updated>
    </task>
-    <option name="localTasksCounter" value="112" />
+    <task id="LOCAL-00112" summary="changing eureka address">
+      <created>1604492445347</created>
+      <option name="number" value="00112" />
+      <option name="presentableId" value="LOCAL-00112" />
+      <option name="project" value="LOCAL" />
+      <updated>1604492445352</updated>
+    </task>
+    <option name="localTasksCounter" value="113" />
    <servers />
  </component>
  <component name="UnknownFeatures">
@@ -626,7 +630,6 @@
  </component>
  <component name="VcsManagerConfiguration">
    <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="changing events describtion" />
    <MESSAGE value="swagger" />
    <MESSAGE value="KT in README.md" />
    <MESSAGE value="fabric8" />
@@ -651,7 +654,8 @@
    <MESSAGE value="adding profiles to bootstrap.yml" />
    <MESSAGE value="-  fix collisions between js script from main page and the application,&#10;- fix problem with special characters for etrack," />
    <MESSAGE value="- default message for user testing,&#10;- updating frontend" />
-    <option name="LAST_COMMIT_MESSAGE" value="- default message for user testing,&#10;- updating frontend" />
+    <MESSAGE value="changing eureka address" />
+    <option name="LAST_COMMIT_MESSAGE" value="changing eureka address" />
  </component>
  <component name="WindowStateProjectService">
    <state x="904" y="236" key="#Notifications" timestamp="1600868491636">
@@ -786,13 +790,13 @@
    </state>
    <state x="277" y="57" key="SettingsEditor/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1600935670743" />
    <state x="277" y="57" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1601975962923" />
-    <state x="2371" y="183" key="Vcs.Push.Dialog.v2" timestamp="1604428728268">
-      <screen x="1920" y="0" width="1920" height="1040" />
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2" timestamp="1604492451517">
+      <screen x="1920" y="0" width="1920" height="1160" />
    </state>
    <state x="451" y="183" key="Vcs.Push.Dialog.v2/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275760386" />
    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413405123" />
    <state x="2371" y="183" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428728268" />
-    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603886750020" />
+    <state x="2371" y="204" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604492451517" />
    <state x="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824@0.0.1536.824" timestamp="1602145235569" />
    <state width="968" height="528" key="XDebugger.FullValuePopup" timestamp="1602076898344">
      <screen x="1920" y="0" width="1920" height="1040" />
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,11 @@
 #environment:
+eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
+
 server.port = 8097
-endpoints.env.enabled = false
+spring.application.name = klaus
+spring.cloud.discovery.enabled=true
+spring.cloud.config.discovery.service-id = klaus-config-service
+#spring.cloud.config.fail-fast=true
 #spring.cloud.config.username = SpringConfigUsername
 #spring.cloud.config.password = SpringConfigPassword
 #logging:
@@ -8,8 +13,3 @@ spring.output.ansi.enabled = always
 logging.level.root=INFO
 logging.level.org.springframework.web=INFO
 logging.level.com.release11=INFO
-#operations
-release11.mocked-service.controller.delete = false
-release11.mocked-service.controller.getAll = false
-release11.mocked-service.controller.get = true
-release11.mocked-service.controller.set = true
--- a/src/main/resources/bootstrap-PROD.yml
+++ b/src/main/resources/bootstrap-PROD.yml
@@ -16,10 +16,3 @@ spring:
 server:
  port: 8097

-eureka:
-  client:
-    enabled: true
-    register-with-eureka: true
-    fetch-registry: true
-    serviceUrl:
-      defaultZone: http://netflix:eureka@eureka:8761/eureka
--- a/src/main/resources/bootstrap.properties
+++ b/src/main/resources/bootstrap.properties
@@ -1,7 +1,6 @@
 #environment:
 spring.cloud.config.discovery.service-id = klaus-config-service
 #spring.cloud.config.retry.initial-interval = 1500
-release11.mocked-service.controller.delete = true
 #spring.cloud.config.retry.multiplier = 1.5
 #spring.cloud.config.retry.max-attempts = 10000
 #spring.cloud.config.retry.max-intervals = 1000
--- a/src/main/resources/bootstrap.yml
+++ b/src/main/resources/bootstrap.yml
@@ -15,10 +15,3 @@ spring:
 server:
  port: 8097

-eureka:
-  client:
-    enabled: true
-    register-with-eureka: true
-    fetch-registry: true
-    serviceUrl:
-      defaultZone: http://netflix:eureka@eureka:8761/eureka