R11/release11-tools-mocked-services
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaning properties

Browse Source
This commit is contained in:
Szakalakamaka
2020-11-04 15:16:38 +01:00
parent 435551c25f
commit eb3c5a8ade
9 changed files with 43 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
.idea/workspace.xml generated
View File

@@ -25,9 +25,13 @@
<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-PROD.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/bootstrap-PROD.yml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/bootstrap.properties" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/bootstrap.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/bootstrap.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/target/classes/data-access.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/data-access.properties" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -267,20 +271,6 @@
<option name="presentableId" value="Default" />
<updated>1598862102028</updated>
</task>
<task id="LOCAL-00064" summary="jenkins - testing remote deploy">
<created>1601370283197</created>
<option name="number" value="00064" />
<option name="presentableId" value="LOCAL-00064" />
<option name="project" value="LOCAL" />
<updated>1601370283199</updated>
</task>
<task id="LOCAL-00065" summary="jenkins - testing remote deploy">
<created>1601371391685</created>
<option name="number" value="00065" />
<option name="presentableId" value="LOCAL-00065" />
<option name="project" value="LOCAL" />
<updated>1601371391685</updated>
</task>
<task id="LOCAL-00066" summary="jenkins - testing remote deploy">
<created>1601377932874</created>
<option name="number" value="00066" />
@@ -610,7 +600,21 @@
<option name="project" value="LOCAL" />
<updated>1604492445352</updated>
</task>
<option name="localTasksCounter" value="113" />
<task id="LOCAL-00113" summary="changing eureka address">
<created>1604494455420</created>
<option name="number" value="00113" />
<option name="presentableId" value="LOCAL-00113" />
<option name="project" value="LOCAL" />
<updated>1604494455420</updated>
</task>
<task id="LOCAL-00114" summary="changing eureka address">
<created>1604494472482</created>
<option name="number" value="00114" />
<option name="presentableId" value="LOCAL-00114" />
<option name="project" value="LOCAL" />
<updated>1604494472482</updated>
</task>
<option name="localTasksCounter" value="115" />
<servers />
</component>
<component name="UnknownFeatures">
@@ -708,41 +712,41 @@
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1602662342585" />
<state x="2606" y="235" key="FileChooserDialogImpl/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1603885972656" />
<state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1602147205037" />
<state width="1877" height="102" key="GridCell.Tab.0.bottom" timestamp="1604428762541">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1877" height="315" key="GridCell.Tab.0.bottom" timestamp="1604499277524">
<screen x="1920" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.bottom/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085479" />
<state width="1877" height="102" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="233" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
<state width="1875" height="151" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
<state width="1493" height="315" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.bottom/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" />
<state width="1493" height="217" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="102" key="GridCell.Tab.0.center" timestamp="1604428762541">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1877" height="315" key="GridCell.Tab.0.center" timestamp="1604499277524">
<screen x="1920" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.center/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" />
<state width="1877" height="102" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="233" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
<state width="1875" height="151" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
<state width="1493" height="315" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.center/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" />
<state width="1493" height="217" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="102" key="GridCell.Tab.0.left" timestamp="1604428762541">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1877" height="315" key="GridCell.Tab.0.left" timestamp="1604499277524">
<screen x="1920" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.left/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" />
<state width="1877" height="102" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="233" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
<state width="1875" height="151" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
<state width="1493" height="315" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.left/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" />
<state width="1493" height="217" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="102" key="GridCell.Tab.0.right" timestamp="1604428762541">
<screen x="1920" y="0" width="1920" height="1040" />
<state width="1877" height="315" key="GridCell.Tab.0.right" timestamp="1604499277524">
<screen x="1920" y="0" width="1920" height="1160" />
</state>
<state width="1877" height="239" key="GridCell.Tab.0.right/-1920.0.1536.832/0.0.1920.1040@0.0.1920.1040" timestamp="1600275797041" />
<state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@0.0.1536.824" timestamp="1604413085478" />
<state width="1877" height="102" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1040@1920.0.1920.1040" timestamp="1604428762541" />
<state width="1493" height="233" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604328635480" />
<state width="1875" height="151" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604317001880" />
<state width="1493" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494395906" />
<state width="1877" height="315" key="GridCell.Tab.0.right/0.0.1536.824/1920.0.1920.1160@1920.0.1920.1160" timestamp="1604499277524" />
<state width="1493" height="217" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1602147432366" />
<state width="1877" height="297" key="GridCell.Tab.1.bottom" timestamp="1602672852817">
<screen x="1920" y="0" width="1920" height="1160" />
@@ -790,12 +794,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="204" key="Vcs.Push.Dialog.v2" timestamp="1604492451517">
<screen x="1920" y="0" width="1920" height="1160" />
<state x="361" y="145" key="Vcs.Push.Dialog.v2" timestamp="1604494473937">
<screen x="0" y="0" width="1536" height="824" />
</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="361" y="145" key="Vcs.Push.Dialog.v2/0.0.1536.824/1920.0.1920.1160@0.0.1536.824" timestamp="1604494473937" />
<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">

4
src/main/resources/application.properties
View File

@@ -1,9 +1,7 @@
#environment:
eureka.client.service-url.defaultZone=http://netflix:eureka@eureka:8761/eureka/
server.port = 8097
spring.application.name = klaus
spring.cloud.discovery.enabled=true
eureka.client.service-url.defaultZone=http://netflix:eureka@localhost:8761/eureka/
spring.cloud.config.discovery.service-id = klaus-config-service
#spring.cloud.config.fail-fast=true
#spring.cloud.config.username = SpringConfigUsername

18
src/main/resources/bootstrap-PROD.yml
View File

@@ -1,18 +0,0 @@
spring:
profiles:
active: PROD
application:
name: klaus
cloud:
spring:
cloud:
config:
fail-fast: false
uri: http://s5000xvn.zipper.release11.com:8888
retry:
max-attempts: 20
max-interval: 15000
initial-interval: 10000
server:
port: 8097

12
src/main/resources/bootstrap.properties
View File

@@ -1,12 +0,0 @@
#environment:
spring.cloud.config.discovery.service-id = klaus-config-service
#spring.cloud.config.retry.initial-interval = 1500
#spring.cloud.config.retry.multiplier = 1.5
#spring.cloud.config.retry.max-attempts = 10000
#spring.cloud.config.retry.max-intervals = 1000
#spring.cloud.config.username = SpringConfigUsername
#spring.cloud.config.password = SpringConfigPassword
eureka.instance.preferIpAddress = true

6
src/main/resources/bootstrap.yml
View File

@@ -1,6 +1,4 @@
spring:
# profiles:
# active: DEV
application:
name: klaus
cloud:
@@ -9,9 +7,7 @@ spring:
config:
uri: http://s5000xvn.zipper.release11.com:8888
retry:
max-attempts: 20
max-attempts: 10
max-interval: 15000
initial-interval: 10000
server:
port: 8097

18
target/classes/bootstrap-PROD.yml
View File

@@ -1,18 +0,0 @@
spring:
profiles:
active: PROD
application:
name: klaus
cloud:
spring:
cloud:
config:
fail-fast: false
uri: http://s5000xvn.zipper.release11.com:8888
retry:
max-attempts: 20
max-interval: 15000
initial-interval: 10000
server:
port: 8097

12
target/classes/bootstrap.properties
View File

@@ -1,12 +0,0 @@
#environment:
spring.cloud.config.discovery.service-id = klaus-config-service
#spring.cloud.config.retry.initial-interval = 1500
#spring.cloud.config.retry.multiplier = 1.5
#spring.cloud.config.retry.max-attempts = 10000
#spring.cloud.config.retry.max-intervals = 1000
#spring.cloud.config.username = SpringConfigUsername
#spring.cloud.config.password = SpringConfigPassword
eureka.instance.preferIpAddress = true

4
target/classes/bootstrap.yml
View File

@@ -1,6 +1,4 @@
spring:
# profiles:
# active: DEV
application:
name: klaus
cloud:
@@ -12,6 +10,4 @@ spring:
max-attempts: 20
max-interval: 15000
initial-interval: 10000
server:
port: 8097

2
target/classes/data-access.properties
View File

@@ -1,2 +1,2 @@
redis.host = redis
redis.host = localhost
redis.port = 6379