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

Commit

Permalink
Merge pull request #569 from rahuldevgarg-egov/migrate_to_unified_dev
Browse files Browse the repository at this point in the history
fixed dev url
  • Loading branch information
rahuldevgarg authored Sep 11, 2023
2 parents 8df714c + 516647f commit 5c91e92
Show file tree
Hide file tree
Showing 23 changed files with 56 additions and 56 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ bs.demanddetail.audit.seq.name=seq_egbs_demanddetail_audit
#billing-service1.1

# localization url
egov.localization.host=https://unified-digit.org
egov.localization.host=https://unified-dev.digit.org
egov.localization.search.endpoint=/localization/messages/v1/_search

# Apportion url
Expand All @@ -124,7 +124,7 @@ search.pagesize.default=100
#billing-service1.1

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

#----------------------------- FLYWAY CONFIGURATIONS ------------------------------#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ persister.save.demand.apportion.request.topic=save-apportion-demand-request
persister.save.demand.apportion.response.topic=save-apportion-demand-response

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

#Default apportion switch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ server.port=8088

management.endpoints.web.base-path=/

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

id.timezone=IST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ persister.update.pg.txns=update-pg-txns
persister.save.pg.txnsDump=save-pg-txns-dump
persister.update.pg.txnsDump=update-pg-txns-dump
##----------------------------- ID GEN CONFIGURATIONS ------------------------------#
egov.idgen.host=https://unified-digit.org/
egov.idgen.host=https://unified-dev.digit.org/
egov.idgen.path=egov-idgen/id/_generate
egov.idgen.ack.name=pg.txnid
egov.idgen.ack.format=PB_PG_[cy:yyyy_MM_dd]_[SEQ_EG_PG_TXN]_[d{2}]
##----------------------------- BILLING SERVICE CONFIGURATIONS ------------------------------#
egov.billingservice.host=https://unified-digit.org/
egov.billingservice.host=https://unified-dev.digit.org/
egov.billingservice.path=billing-service/bill/_search
##----------------------------- COLLECTIONS SERVICE CONFIGURATIONS ------------------------------#
egov.collectionservice.host=http://localhost:8095/
Expand All @@ -59,7 +59,7 @@ egov.collectionservice.validate.path=collection-services/receipts/_validate
egov.collectionservice.payment.create.path=collection-services/payments/_create
egov.collectionservice.payment.validate.path=collection-services/payments/_validate
##----------------------------- EGF MASTER SERVICE CONFIGURATIONS ------------------------------#
egov.bankaccountservice.host=https://unified-digit.org/
egov.bankaccountservice.host=https://unified-dev.digit.org/
egov.bankaccountservice.path=egf-master/bankaccounts/_search
##----------------------------- EGOV COMMON MASTERS SERVICE CONFIGURATIONS ------------------------------#
egov.businessdetailsservice.host=http://localhost:8889
Expand Down Expand Up @@ -114,7 +114,7 @@ egov.userservice.search.path=user/_search
pg.is.user.create.enabled=true

#Notification
notification.url = https://unified-digit.org/
notification.url = https://unified-dev.digit.org/
notification.sms.enabled=true
kafka.topics.notification.sms=egov.core.notification.sms

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ egov.user.search.default.size=10
egov.otp.host=http://localhost:8089/
egov.services.otp.search_otp=otp/v1/_search
egov.services.otp.validate_otp=otp/v1/_validate
egov.services.accesscontrol.host=https://unified-digit.org
egov.services.accesscontrol.host=https://unified-dev.digit.org
egov.services.accesscontrol.action_search=/access/v1/actions/_search
egov.filestore.host=http://localhost:8083
egov.filestore.path=/filestore/v1/files/url
mdms.roles.filter=[?(@.code IN [$code])]
mdms.roles.masterName=roles
mdms.roles.moduleName=ACCESSCONTROL-ROLES
mdms.host=https://unified-digit.org
mdms.host=https://unified-dev.digit.org
mdms.path=/egov-mdms-service/v1/_search
citizen.login.password.otp.enabled=true
employee.login.password.otp.enabled=false
Expand All @@ -40,7 +40,7 @@ refresh.token.validity.in.minutes=20160
default.password.expiry.in.days=90
mobile.number.validation.workaround.enabled=false
roles.state.level.enabled=true
#user.service.host=https://unified-digit.org
#user.service.host=https://unified-dev.digit.org
egov.user.host=http://localhost:8081
citizen.registration.withlogin.enabled=true
#password-policy
Expand All @@ -61,7 +61,7 @@ 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-digit.org
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.state.level.tenant.id=pb
#-----------Kafka Audit Topic Name------------#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ max.invalid.login.attempts.period.minutes=30
max.invalid.login.attempts=5
kafka.config.bootstrap_server_config=localhost:9092
kafka.topic.audit=AuditData
egov.mdms.host=https://unified-digit.org
egov.mdms.host=https://unified-dev.digit.org
egov.mdms.search.endpoint=/egov-mdms-service/v1/_search
egov.state.level.tenant.id=pb
egov.enc.host=http://localhost:1234
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ sms.topic=egov.core.notification.sms.otp
email.topic=org.egov.core.notification.email
expiry.time.for.otp=3000

egov.localisation.host=https://unified-digit.org
egov.localisation.host=https://unified-dev.digit.org
egov.localisation.search.endpoint=/localization/messages/v1/_search
egov.localisation.tenantid.strip.suffix.count=1

Expand Down
2 changes: 1 addition & 1 deletion frontend/micro-ui/web/.env.sample
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SKIP_PREFLIGHT_CHECK=true
REACT_APP_STATE_LEVEL_TENANT_ID=pb
REACT_APP_PROXY_URL=https://works-unified-digit.org
REACT_APP_PROXY_URL=https://works-unified.digit.org
4 changes: 2 additions & 2 deletions frontend/micro-ui/web/micro-ui-internals/example/.env-fsm
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ SKIP_PREFLIGHT_CHECK=true
REACT_APP_USER_TYPE=
REACT_APP_EMPLOYEE_TOKEN=
REACT_APP_CITIZEN_TOKEN=
REACT_APP_PROXY_API=https://unified-unified-digit.org
REACT_APP_PROXY_ASSETS=https://unified-unified-digit.org
REACT_APP_PROXY_API=https://unified-unified.digit.org
REACT_APP_PROXY_ASSETS=https://unified-unified.digit.org
REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/egov-dev-assets/globalConfigsFSM.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ SKIP_PREFLIGHT_CHECK=true
REACT_APP_USER_TYPE=EMPLOYEE
REACT_APP_EMPLOYEE_TOKEN=c835932f-2ad4-4d05-83d6-49e0b8c59f8a
REACT_APP_CITIZEN_TOKEN=7cd58aae-30b3-41ed-a1b3-3417107a993c
REACT_APP_PROXY_API=https://works-unified-digit.org
REACT_APP_PROXY_ASSETS=https://works-unified-digit.org
REACT_APP_PROXY_API=https://works-unified.digit.org
REACT_APP_PROXY_ASSETS=https://works-unified.digit.org
REACT_APP_GLOBAL=https://s3.ap-south-1.amazonaws.com/works-dev-asset/globalConfigsWorks.js
REACT_APP_CONTEXT=works
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ app.timezone=UTC
#-------------------------- EXTERNAL API CONFIGURATIONS ---------------------------#

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

#egov.localisation.host=http://egov-localization:8080
egov.localisation.host=https://unified-digit.org
egov.localisation.host=https://unified-dev.digit.org
egov.localisation.search.endpoint=/localization/messages/v1/_search
egov.localisation.is.statelevel=false

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,25 @@ app.timezone=UTC
egov.services.data_sync_employee.required = false

# HR-EMPLOYEE (SELF) SERVICE PATH
egov.services.hr_employee_service.hostname=https://unified-digit.org
egov.services.hr_employee_service.hostname=https://unified-dev.digit.org
egov.services.hr_employee_service.basepath=/hr-employee-v2
egov.services.hr_employee_service.employee.createpath=/employees/_create
egov.services.hr_employee_service.default.password=abcdefgh

# USER SERVICE PATH
egov.services.users_service.hostname=https://unified-digit.org
egov.services.users_service.hostname=https://unified-dev.digit.org
egov.services.users_service.users.basepath=/user
egov.services.users_service.users.searchpath=/v1/_search
egov.services.users_service.users.createpath=/users/_createnovalidate
egov.services.users_service.users.updatepath=/users/_updatenovalidate

# EGOV-COMMON-MASTERS SERVICE PATH
egov.services.egov_common_masters_service.hostname=https://unified-digit.org
egov.services.egov_common_masters_service.hostname=https://unified-dev.digit.org
egov.services.egov_common_masters_service.basepath=/egov-common-masters
egov.services.egov_common_masters_service.departments.searchpath=/departments/_search

# HR-MASTERS SERVICE PATH
egov.services.hr_masters_service.hostname=https://unified-digit.org
egov.services.hr_masters_service.hostname=https://unified-dev.digit.org
egov.services.hr_masters_service.basepath=/hr-masters-v2
egov.services.hr_masters_service.positions.searchpath=/positions/_search
egov.services.hr_masters_service.designations.searchpath=/designations/_search
Expand All @@ -52,26 +52,26 @@ egov.services.hr_masters_service.empstatus.searchpath=//hrstatuses/_search
egov.services.hr_masters_service.emptype.searchpath=/employeetypes/_search

# HYBRID-DATA-SYNC SERVICE PATH
egov.services.data_sync_employee_service.hostname=https://unified-digit.org
egov.services.data_sync_employee_service.hostname=https://unified-dev.digit.org
egov.services.data_sync_employee_service.basepath=/data-sync-employee
egov.services.data_sync_employee_service.createpath=/datasync/_create

# ID GENERATION SERVICE PATH
egov.services.egov_idgen.hostname=https://unified-digit.org
egov.services.egov_idgen.hostname=https://unified-dev.digit.org
egov.services.egov_idgen.createpath=/egov-idgen/id/_generate
egov.services.egov_idgen.emp.code.name=employee.code
egov.services.egov_idgen.emp.code.format=EMP_[SEQ_EMPLOYEE_CODE]

# COMMON-WORKFLOW SERVICE PATH
egov.services.common_workflows_service.hostname=https://unified-digit.org
egov.services.common_workflows_service.hostname=https://unified-dev.digit.org
egov.services.common_workflows_service.searchpath=/egov-common-workflows/tasks/_search

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

# ERP SERVICE PATH
egov.services.eis_service.hostname=https://unified-digit.org
egov.services.eis_service.hostname=https://unified-dev.digit.org
egov.municipality.host=http://kurnool-pilot-services.egovernments.org/
egov.services.eis_service.employeeposition.searchpath=employeepositions/_search

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ kafka.topics.receipt.create=egov.collection.payment-create
persister.migration.batch.count.topic=migartion-batch-count

#idgen configs
egov.idgen.host=https://unified-digit.org/
egov.idgen.host=https://unified-dev.digit.org/
egov.idgen.path=egov-idgen/id/_generate
egov.idgen.ack.name=pt.acknowledgementnumber
egov.idgen.ack.format=PB-AC-[cy:yyyy-MM-dd]-[SEQ_EG_PT_ACK]
Expand Down Expand Up @@ -112,7 +112,7 @@ egov.user.search.path=/user/_search
egov.user.update.path=/_updatenovalidate

#location config
egov.location.host=https://unified-digit.org
egov.location.host=https://unified-dev.digit.org
egov.location.context.path=/egov-location/location/v11/
egov.location.endpoint=/boundarys/_search

Expand All @@ -123,15 +123,15 @@ egov.calculation.endpoint=/_calculate
egov.calculation.mutation.endpoint=/mutation/_calculate

#Localization config
egov.localization.host=https://unified-digit.org
egov.localization.host=https://unified-dev.digit.org
egov.localization.context.path=/localization/messages/v1
egov.localization.search.endpoint=/_search
egov.localization.statelevel=true
egov.localization.fallback.locale=en_IN


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

# billing service
Expand All @@ -150,7 +150,7 @@ kafka.topics.notification.fullpayment=egov.collection.receipt-create
kafka.topics.notification.pg.save.txns=update-pg-txns
notif.sms.enabled=true
notif.email.enabled=true
notification.url=https://unified-digit.org/citizen/property-tax
notification.url=https://unified-dev.digit.org/citizen/property-tax

#Property Search Parameters config
citizen.allowed.search.params=accountId,ids,propertyDetailids,mobileNumber,oldpropertyids,ownerids,name
Expand All @@ -162,7 +162,7 @@ pt.search.pagination.max.search.limit=5000

#user-event configs
egov.user.event.notification.enabled=true
egov.ui.app.host=https://unified-digit.org
egov.ui.app.host=https://unified-dev.digit.org
egov.usr.events.create.topic=persist-user-events-async
egov.usr.events.pay.link=digit-ui/citizen/payment/my-bills/$businessService/$propertyId?tenantId=$tenantId
egov.usr.events.pay.code=PAY
Expand All @@ -184,7 +184,7 @@ egov.url.shortner.endpoint=/egov-url-shortening/shortener

#oldProperty Plain search
egov.oldProperty.search = /pt-services-v2/property/_plainsearch
egov.pt-services-v2.host= https://unified-digit.org
egov.pt-services-v2.host= https://unified-dev.digit.org

#PDF topic
kafka.topics.filestore=PDF_GEN_CREATE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ egov.ws.host=http://localhost:8090
egov.wc.search.endpoint=ws-services/wc/_search

#Localization config
egov.localization.host=https://unified-digit.org/
egov.localization.host=https://unified-dev.digit.org/
egov.localization.workDir.path=localization/messages/v1
egov.localization.context.path=localization/messages/v1
egov.localization.search.endpoint=/_search
Expand All @@ -96,20 +96,20 @@ kafka.topics.billgen.topic=bill-generation


egov.user.event.notification.enabled=true
egov.ui.app.host=https://unified-digit.org
egov.ui.app.host=https://unified-dev.digit.org
egov.usr.events.create.topic=persist-user-events-async
egov.usr.events.pay.link=citizen/otpLogin?mobileNo=$mobile&redirectTo=egov-common/pay?consumerCode=$consumerCode&tenantId=$tenantId&businessService=WS
egov.usr.events.pay.code=PAY
egov.usr.events.pay.triggers=PENDINGPAYMENT
notification.url = https://unified-digit.org/
notification.url = https://unified-dev.digit.org/


ws.demand.based.batch.size=10
persister.demand.based.dead.letter.topic.batch=ws-dead-letter-topic-batch
persister.demand.based.dead.letter.topic.single=ws-dead-letter-topic-single

#PROPERTY CREATE CONFIGURATIONS
egov.property.service.host=https://unified-digit.org/
egov.property.service.host=https://unified-dev.digit.org/
egov.property.searchendpoint=property-services/property/_search

#WORKFLOW PROCESS INSTANCE SEARCH CONFIGURATIONS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spring.datasource.username=postgres
spring.datasource.password=postgres

#PROPERTY CREATE CONFIGURATIONS
egov.property.service.host=https://unified-digit.org/
egov.property.service.host=https://unified-dev.digit.org/
egov.property.createendpoint=property-services/property/_create
egov.property.searchendpoint=property-services/property/_search

Expand Down Expand Up @@ -92,8 +92,8 @@ create.ws.workflow.name=NewWS1
modify.ws.workflow.name=NewWS1

# wf url
workflow.workDir.path=https://unified-digit.org/
workflow.context.path=https://unified-digit.org/
workflow.workDir.path=https://unified-dev.digit.org/
workflow.context.path=https://unified-dev.digit.org/
workflow.transition.path=egov-workflow-v2/egov-wf/process/_transition
workflow.businessservice.search.path=egov-workflow-v2/egov-wf/businessservice/_search
workflow.process.search.path=egov-workflow-v2/egov-wf/process/_search
Expand All @@ -103,7 +103,7 @@ egov.user.event.notification.enabled=true
egov.usr.events.create.topic=persist-user-events-async
ws.water.saved.failed=water-saved-failed
ws.water.updated.failed=water-updated-failed
notification.url = https://unified-digit.org/
notification.url = https://unified-dev.digit.org/
notification.sms.link=citizen/egov-common/pay?consumerCode=$consumerCode&tenantId=$tenantId&businessService=WS

#Localization config
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
curl --location --request POST 'https://unified-digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
curl --location --request POST 'https://unified-dev.digit.org/egov-workflow-v2/egov-wf/businessservice/_create' \
--header 'Content-Type: application/json' \
--data-raw '{
"RequestInfo": {
Expand Down
Loading

0 comments on commit 5c91e92

Please sign in to comment.