Bnd UI custom

.gitignore

@@ -2,3 +2,7 @@
 frontend/micro-ui-internals/node_modules/*
 .idea
 index.lock
+/.metadata/
+/.sonarlint
+.checkstyle
+.pmd

Migration/ApplicantAddress.txt

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS eg_fm_applicantaddress
+(
+    id character varying(64) PRIMARY KEY,
+	tenantid character varying(64),
+    houseno character varying(64),
+    housename character varying(64),
+    street character varying(64),
+    pincode character varying(64),
+    postofficename character varying(64),
+    createdby character varying(64),
+    createdat bigint,
+    lastmodifiedby character varying(64),
+    lastmodifiedat bigint
+)

Migration/ApplicantDet.txt

@@ -0,0 +1,17 @@
+CREATE TABLE IF NOT EXISTS eg_fm_applicantpersonal
+(
+    id character varying(64) PRIMARY KEY,
+	aadhaarno character varying(64),
+    email character varying(64),
+    firstname character varying(64),
+    lastname character varying(64),
+    title character varying(64),
+    mobileno character varying(64),
+    tenantid character varying(64),
+    createdby character varying(64),
+    createdat bigint,
+    lastmodifiedby character varying(64),
+    lastmodifiedat bigint,
+    applicantaddressid character varying(64)     
+
+)

Migration/ApplicantServiceDet.txt

@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS eg_fm_applicantdetails
+(
+    id character varying(64) PRIMARY KEY,
+	tenantid character varying(64),
+    servicedetailsid character varying(64),
+    applicantpersonalid character varying(64),
+    fatherfirstname character varying(64),
+    fatherlastname character varying(64),
+    motherfirstname character varying(64),
+    motherlastname character varying(64),
+    createdby character varying(64),
+    createdat bigint,
+    lastmodifiedby character varying(64),
+    lastmodifiedat bigint
+)

Migration/ServiceMaster.txt

@@ -0,0 +1,14 @@
+CREATE TABLE IF NOT EXISTS eg_fm_servicedetails
+(
+    id character varying(64) PRIMARY KEY,
+	tenantid character varying(64),
+    servicecode character varying(64),
+    servicename character varying(64),
+    servicedescription character varying(64),
+    businessservice character varying(64),
+    workflowcode character varying(64),
+    createdby character varying(64),
+    createdat bigint,
+    lastmodifiedby character varying(64),
+    lastmodifiedat bigint
+)

build/build-config.yml

@@ -394,6 +394,11 @@ config:
         image-name: "xstate-webchat-db"
 
 #Municipal Services
+  - name: "builds/upyog/municipal-services/egov-filemgmnt"
+    build:
+      - work-dir: "municipal-services/egov-filemgmnt"
+        image-name: "egov-filemgmnt"
+        dockerfile: "build/maven/Dockerfile"
 
   - name: "builds/upyog/municipal-services/egov-user-event"
     build:

core-services/egov-notification-mail/src/main/resources/application.properties

@@ -13,13 +13,13 @@ spring.kafka.consumer.properties.spring.json.use.type.headers=false
 
 #Email Configuration
 mail.enabled=true
-mail.sender.username=test
-mail.sender.password=test
+mail.sender.username=[email protected]
+mail.sender.password=X7&vD5$fP3
 mail.smtps.auth=true
 mail.smtps.starttls.enable=true
 mail.smtps.debug=false
 mail.port=465
-mail.host=smtp.gmail.com
+mail.host=smtp.mail.gov.in
 mail.protocol=smtps
 
 #Localization config
@@ -35,7 +35,7 @@ egov.localization.default.locale=
 egov.user.host=https://dev.digit.org
 egov.user.context.path=/user
 egov.user.search.endpoint=/_search
-egov.user.state.tenant.id=pb
+egov.user.state.tenant.id=kl
 
-email.subject=UPYOG Notification
+email.subject=KSMART Notification
 

core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/BaseSMSService.java

@@ -158,10 +158,10 @@ public MultiValueMap<String, String> getSmsRequestBody(Sms sms) {
             if (value.startsWith("$")) {
                 switch (value) {
                     case "$username":
-                        map.add(key, /*smsProperties.getUsername()*/"pbdwss.sms");
+                        map.add(key, smsProperties.getUsername());
                         break;
                     case "$password":
-                        map.add(key, /*smsProperties.getPassword()*/"Nkyf%403254");
+                        map.add(key, smsProperties.getPassword());
                         break;
                     case "$senderid":
                         map.add(key, smsProperties.getSenderid());

core-services/egov-notification-sms/src/main/java/org/egov/web/notification/sms/service/impl/NICSMSServiceImpl.java

@@ -26,9 +26,13 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.ClassPathResource;
 
 import lombok.extern.slf4j.Slf4j;
 
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
 
 @Service
 @Slf4j
@@ -47,20 +51,53 @@ private void postConstruct() {
         log.info("postConstruct() start");
         try
         {
+            //sslContext = SSLContext.getInstance("TLSv1.2");
             sslContext = SSLContext.getInstance("TLSv1.2");
             if(smsProperties.isVerifyCertificate()) {
                 log.info("checking certificate");
-                KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                //KeyStore trustStore = KeyStore.getInstance("pkcs11");
+                //System.out.println(KeyStore.getDefaultType());
                 //File file = new File(System.getenv("JAVA_HOME")+"/lib/security/cacerts");
-                File file = new File(getClass().getClassLoader().getResource("smsgwsmsgovin-Mar22.cer").getFile());
-                InputStream is = new FileInputStream(file);
-                trustStore.load(is, "changeit".toCharArray());
-                TrustManagerFactory trustFactory = TrustManagerFactory
-                        .getInstance(TrustManagerFactory.getDefaultAlgorithm());
-                trustFactory.init(trustStore);
-
-                TrustManager[] trustManagers = trustFactory.getTrustManagers();
-                sslContext.init(null, trustManagers, null);
+                //File file = new File(Thread.currentThread().getContextClassLoader().getResource("smsgwsmsgovin-sep22.cer").getFile());
+                //InputStream is = new FileInputStream(file);
+                //Resource resource = (Resource) new ClassPathResource("smsgwsmsgovin-sep22.cer");
+                //InputStream is = resource.getInputStream(); 
+                //InputStream is = getClass().getClassLoader().getResourceAsStream("smsgwsmsgovin-sep22.cer");
+                //trustStore.load(is, "changeit".toCharArray());
+
+
+                try (InputStream is = getClass().getClassLoader()
+                                            .getResourceAsStream("smsgwsmsgovin-sep22.cer")) {
+
+                    //KeyStore trustStore = KeyStore.getInstance("pkcs12");
+                    //trustStore.load(is, "changeit".toCharArray());
+
+                    CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
+                    X509Certificate caCert = (X509Certificate) certFactory.generateCertificate(is);
+
+                    KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());
+                    trustStore.load(null);
+                    trustStore.setCertificateEntry("caCert", caCert);
+
+                    TrustManagerFactory trustFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                    trustFactory.init(trustStore);
+
+                    TrustManager[] trustManagers = trustFactory.getTrustManagers();
+                    sslContext.init(null, trustManagers, null);
+                }       
+                catch(Exception e) {
+                    e.printStackTrace();
+                    log.error("Not able to load SMS certificate from the specified path");
+                }
+
+
+                //TrustManagerFactory trustFactory = TrustManagerFactory
+                //        .getInstance(TrustManagerFactory.getDefaultAlgorithm());
+                //trustFactory.init(trustStore);
+
+                //TrustManager[] trustManagers = trustFactory.getTrustManagers();
+                //sslContext.init(null, trustManagers, null);
+                //System.out.println(sslContext.getSocketFactory());
             }
             else {
                 log.info("not checking certificate");
@@ -95,19 +132,20 @@ protected void submitToExternalSmsService(Sms sms) {
 
             String final_data="";
             final_data+="username="+ smsProperties.getUsername();
-            final_data+="&pin="+ smsProperties.getPassword();
-
+            //final_data+="&pin="+ smsProperties.getPassword();
+            final_data+="&pin="+ "GHt%40%23321ter";
             String smsBody = sms.getMessage();
 
             if(smsBody.split("#").length > 1) {
-                String templateId = smsBody.split("#")[1];
-
+                //String templateId = smsBody.split("#")[1];
+                String templateId=smsBody.substring(smsBody.lastIndexOf("#")+1, smsBody.length());
                 sms.setTemplateId(templateId);
-                smsBody = smsBody.split("#")[0];
+                //smsBody = smsBody.split("#")[0];
+                smsBody=smsBody.substring(0,smsBody.lastIndexOf("#")-1);
 
             }else if(StringUtils.isEmpty(sms.getTemplateId())){
                 log.info("No template Id, Message Not sent"+smsBody);
-                return;
+                //return;
             }
 
             String message= "" + smsBody ;
@@ -125,11 +163,16 @@ protected void submitToExternalSmsService(Sms sms) {
             else
                 final_data+="&dlt_template_id="+sms.getTemplateId();
 
+            log.info("URL which is sending+"+final_data);
             if(smsProperties.isSmsEnabled()) {
                 HttpsURLConnection conn = (HttpsURLConnection) new URL(smsProperties.getUrl()+"?"+final_data).openConnection();
                 conn.setSSLSocketFactory(sslContext.getSocketFactory());
+                conn.setDoInput(true);
                 conn.setDoOutput(true);
-                conn.setRequestMethod("GET");
+                conn.setRequestMethod("POST");
+                conn.setRequestProperty("Content-Type", "application/json");
+                conn.connect();
+
                 final BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
                 final StringBuffer stringBuffer = new StringBuffer();
                 String line;

core-services/egov-notification-sms/src/main/resources/application.properties

@@ -5,23 +5,23 @@ sms.provider.class=NIC
 sms.provider.requestType=POST
 sms.provider.url=https://smsgw.sms.gov.in/failsafe/MLink
 sms.provider.contentType=application/json
-sms.provider.username=iupyo.sms
-sms.provider.password=C6%rE4#jM3
+sms.provider.username=ikmlsg.sms
+sms.provider.password=GHt%40%23321ter
 sms.verify.response = true
 sms.print.response = true
 sms.verify.responseContains="success":true
 sms.verify.ssl = true
-sms.senderid=UPYOG
+sms.senderid=IKMLSG
 sms.mobile.prefix=
 sms.sender.secure.key=value
 sms.blacklist.numbers=9999X,5*
 sms.whitelist.numbers=
 sms.success.codes=200,201,202
 sms.error.codes=
-sms.verify.certificate=false
+sms.verify.certificate=true
 sms.msg.append=""
-sms.provider.entityid=1001842650153206278
-sms.default.tmplid=1
+sms.provider.entityid=1701159193290176741
+sms.default.tmplid=1707165950461405440
 sms.debug.msggateway=true
 sms.enabled=true
 #msdg

core-services/egov-persister/src/main/resources/application-local.properties

@@ -0,0 +1 @@
+egov.persist.yml.repo.path=classpath:egov-pg-service-persister.yml

core-services/egov-url-shortening/src/main/resources/application.properties

@@ -9,12 +9,12 @@ spring.redis.port=6379
 app.timezone=UTC
 
 spring.datasource.driver-class-name=org.postgresql.Driver
-spring.datasource.url=jdbc:postgresql://localhost:5432/urlshortening
-spring.datasource.username=postgres
-spring.datasource.password=postgres
+spring.datasource.url=jdbc:postgresql://ikm-firstqa-eks-db.c865b3gqkoui.ap-south-1.rds.amazonaws.com:5432/ikmeksqadb
+spring.datasource.username=ikmeksqadb
+spring.datasource.password=ikm123456
 
 #----------------------------- FLYWAY CONFIGURATIONS ------------------------------#
-spring.flyway.url=jdbc:postgresql://localhost:5432/urlshortening
+spring.flyway.url=jdbc:postgresql://ikm-firstqa-eks-db.c865b3gqkoui.ap-south-1.rds.amazonaws.com:5432/ikmeksqadb
 spring.flyway.user=postgres
 spring.flyway.password=postgres
 spring.flyway.table=public
@@ -52,10 +52,10 @@ url.shorten.indexer.topic=save-url-shortening-deatils
 
 db.persistance.enabled=true
 
-host.name=https://qa.digit.org/
-egov.user.host=http://egov-user.egov:8080/
+host.name=https://ksmart-qa.lsgkerala.gov.in/
+egov.user.host=https://ksmart-qa.lsgkerala.gov.in/
 egov.user.search.path=user/_search
-state.level.tenant.id=pb
+state.level.tenant.id=kl
 
 hashids.salt=randomsalt
-hsahids.min.length=3
+hsahids.min.length=3

frontend/micro-ui/web/.env

@@ -0,0 +1,2 @@
+REACT_APP_STATE_LEVEL_TENANT_ID=kl
+REACT_APP_PROXY_URL=https://ksmart-qa.lsgkerala.gov.in/

frontend/micro-ui/web/micro-ui-internals/packages/css/example/index.html

@@ -351,7 +351,7 @@ <h2>There is a problem</h2>
 
       <!-- map  -->
       <div class="card">
-        <header class="card-header">Pin Complaint Location</header>
+        <header class="card-header">Pin Test Complaint Location</header>
         <p class="card-text">
           Click and hold to drop the pin to complaint location. If you are not able to pin the location you can skip the continue for next step.
         </p>
@@ -360,6 +360,7 @@ <h2>There is a problem</h2>
             <!-- <img src="./svg/searchicon.svg" class="map-search-bar-icon" alt=""> -->
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="#505A5F" width="48px" height="48px" class="map-search-bar-icon">
               <path d="M0 0h24v24H0z" fill="none" />
+                <script async defer src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAQOd09-vjmk1sXFb_ZQYDz2nlfhXq7Wf8&callback=initMap"></script>
               <path
                 d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
               />

frontend/micro-ui/web/micro-ui-internals/packages/css/example/map.js

@@ -1,7 +1,7 @@
 "use strict";
 let map;
 var script = document.createElement("script");
-const key = globalConfigs?.getConfig("GMAPS_API_KEY");
+const key = globalConfigs?.getConfig("gmaps_api_key");
 script.src = `https://maps.googleapis.com/maps/api/js?key=${key}&callback=initAutocomplete&libraries=places`;
 script.defer = true;
 window.initAutocomplete = function () {

frontend/micro-ui/web/micro-ui-internals/packages/modules/core/src/pages/citizen/Home/index.js

@@ -41,11 +41,11 @@ const Home = () => {
         Icon: <ComplaintIcon />,
         onClick: () => history.push("/digit-ui/citizen/pgr-home"),
       },
-      {
-        name: t("MODULE_PT"),
-        Icon: <PTIcon className="fill-path-primary-main" />,
-        onClick: () => history.push("/digit-ui/citizen/pt-home"),
-      },
+      //{
+       // name: t("MODULE_PT"),
+       // Icon: <PTIcon className="fill-path-primary-main" />,
+       // onClick: () => history.push("/digit-ui/citizen/pt-home"),
+     // },
       {
         name: t("MODULE_TL"),
         Icon: <CaseIcon className="fill-path-primary-main" />,
@@ -57,9 +57,14 @@ const Home = () => {
       //     onClick: () => history.push("/digit-ui/citizen")
       // },
       {
-        name: t("CS_COMMON_INBOX_BPA"),
+        name: t("ACTION_TEST_BIRTH"),
+        Icon: <OBPSIcon />,
+        onClick: () => history.push("/citizen/birth-citizen/home"),
+      },
+          {
+        name: t("ACTION_TEST_DEATH"),
         Icon: <OBPSIcon />,
-        onClick: () => history.push("/digit-ui/citizen/obps-home"),
+        onClick: () => history.push("/citizen/death-citizen/home"),
       },
     ],
     styles: { display: "flex", flexWrap: "wrap", justifyContent: "flex-start", width: "100%" },