Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

PFM-5072: added changes to redirect to mdms-v2 branch #673

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

PFM-5072: added changes to redirect to mdms-v2 branch #673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7b2cf1
PFM-5072: added changes to redirect to mdms-v2 branch
Nov 30, 2023
a66e7aa
PFM-5072: added changes to redirect to mdms-v2 branch
Nov 30, 2023
d77cf4b
PFM-5072: added changes to redirect to mdms-v2 branch
Nov 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion business-services/billing-service/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ search.pagesize.default=100

#mdms urls
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#----------------------------- FLYWAY CONFIGURATIONS ------------------------------#
spring.flyway.url=jdbc:postgresql://localhost:5432/billingnew
Expand Down
2 changes: 1 addition & 1 deletion business-services/egov-apportion-service/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ persister.save.demand.apportion.response.topic=save-apportion-demand-response

#MDMS Config
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#Default apportion switch
egov.apportion.default.value.order=true
Expand Down
2 changes: 1 addition & 1 deletion business-services/egov-hrms/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ egov.services.data_sync_employee.required = false

#mdms urls
egov.mdms.host=https://dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search
#egov.mdms.search.endpoint=/egov-mdms-service-test/v1/_search

#filestore urls
Expand Down
2 changes: 1 addition & 1 deletion business-services/egov-hrms/src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ egov.services.common_workflows_service.searchpath=/egov-common-workflows/tasks/_

# MDMS SERVICE PATH
egov.services.egov_mdms.hostname=https://dev.digit.org/
egov.services.egov_mdms.searchpath=egov-mdms-service/v1/_search
egov.services.egov_mdms.searchpath=mdms-v2/v1/_search

# ERP SERVICE PATH
egov.services.eis_service.hostname=http://dev.digit.org
Expand Down
2 changes: 1 addition & 1 deletion core-services/egov-idgen/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ server.port=8088
management.endpoints.web.base-path=/

mdms.service.host=https://unified-dev.digit.org/
mdms.service.search.uri=egov-mdms-service/v1/_search
mdms.service.search.uri=mdms-v2/v1/_search

id.timezone=IST
sequence.format=%04d
6 changes: 3 additions & 3 deletions core-services/egov-user/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ mdms.roles.filter=[?(@.code IN [$code])]
mdms.roles.masterName=roles
mdms.roles.moduleName=ACCESSCONTROL-ROLES
mdms.host=https://unified-dev.digit.org
mdms.path=/egov-mdms-service/v1/_search
mdms.path=/mdms-v2/v1/_search
citizen.login.password.otp.enabled=true
employee.login.password.otp.enabled=false
citizen.login.password.otp.fixed.value=123456
Expand Down Expand Up @@ -61,8 +61,8 @@ egov.enc.host=http://localhost:1234
egov.enc.encrypt.endpoint=/egov-enc-service/crypto/v1/_encrypt
egov.enc.decrypt.endpoint=/egov-enc-service/crypto/v1/_decrypt
#----------------MDMS config---------------------#
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.host=https://mgramseva-uat.psegs.in
egov.mdms.search.endpoint=/mdms-v2/v1/_search
egov.state.level.tenant.id=pb
#-----------Kafka Audit Topic Name------------#
kafka.topic.audit=audit_data
Expand Down
2 changes: 1 addition & 1 deletion ...ices/egov-user/src/test/java/org/egov/user/persistence/repository/UserRepositoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public void before() {

server = MockRestServiceServer.bindTo(restTemplate).build();

server.expect(once(), requestTo("http://localhost:8094/egov-mdms-service/v1/_search"))
server.expect(once(), requestTo("http://localhost:8094/mdms-v2/v1/_search"))
.andExpect(method(HttpMethod.POST))
.andRespond(withSuccess(new Resources().getFileContents("roleSearchValidatedResponse.json"),
MediaType.APPLICATION_JSON_UTF8));
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/echallan-calculator/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ egov.idgen.challanNum.format=CB-CH-[cy:yyyy-MM-dd]-[SEQ_EG_TL_APL]

#mdms urls
egov.mdms.host=https://13.71.65.215.nip.io/
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

egov.billingservice.host=http://localhost:8081
egov.bill.gen.endpoint=/billing-service/bill/v2/_fetchbill
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/echallan-services/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ egov.idgen.challanNum.format=EB-[fy:yyyy-yy]-[SEQ_EG_ECHALLAN_EXPENSE]

#mdms urls
egov.mdms.host=http://localhost:8094
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#challan Calculator
egov.echallan.calculator.host=http://localhost:8078
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/egov-user-event/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ app.timezone=UTC

#external module configs
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#egov.localisation.host=http://egov-localization:8080
egov.localisation.host=https://unified-dev.digit.org
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/egov-user-event/src/test/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ egov.services.common_workflows_service.searchpath=/egov-common-workflows/tasks/_

# MDMS SERVICE PATH
egov.services.egov_mdms.hostname=https://unified-dev.digit.org/
egov.services.egov_mdms.searchpath=egov-mdms-service/v1/_search
egov.services.egov_mdms.searchpath=mdms-v2/v1/_search

# ERP SERVICE PATH
egov.services.eis_service.hostname=https://unified-dev.digit.org
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/mgramseva-ifix-adapter/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ egov.ifix.refernce.adapter.host=http://ifix-reference-adapter.egov:8080/
egov.ifix.refernce.adapter.push.endpoint=ifix-reference-adapter/events/v1/_push
#mdms urls
egov.mdms.host=http://localhost:8089
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

#Billing service

Expand Down
2 changes: 1 addition & 1 deletion municipal-services/property-services/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ egov.localization.fallback.locale=en_IN

#mdms urls
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search

# billing service
egbs.host=http://billing-service:8080
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/vendor/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ egov.hrms.search.path=/_search
#mdms urls
egov.mdms.host=http://localhost:8094
#dev
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.mdms.search.endpoint=/mdms-v2/v1/_search
#local
#egov.mdms.search.endpoint=/egov-mdms-service-test/v1/_search
#Pagination
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/ws-calculator/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ egov.meterservice.createmeterconnection=save-ws-meter

#mdms urls
egov.mdms.host=http://localhost:8094/
egov.mdms.search.endpoint=egov-mdms-service/v1/_search
egov.mdms.search.endpoint=mdms-v2/v1/_search

# KAFKA SERVER CONFIGURATIONS
kafka.config.bootstrap_server_config=localhost:9092
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/ws-services/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ egov.property.searchendpoint=property-services/property/_search

#mdms urls
egov.mdms.host=http://localhost:8094/
egov.mdms.search.endpoint=egov-mdms-service/v1/_search
egov.mdms.search.endpoint=mdms-v2/v1/_search

# KAFKA SERVER CONFIGURATIONS
kafka.config.bootstrap_server_config=localhost:9092
Expand Down
2 changes: 1 addition & 1 deletion municipal-services/ws-services/target/classes/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ egov.property.searchendpoint=property-services/property/_search

#mdms urls
egov.mdms.host=http://localhost:8094/
egov.mdms.search.endpoint=egov-mdms-service/v1/_search
egov.mdms.search.endpoint=mdms-v2/v1/_search

# KAFKA SERVER CONFIGURATIONS
kafka.config.bootstrap_server_config=localhost:9092
Expand Down