Merge pull request #2 from KB-iGOT/cbrelease-4.8.25-fix

Cbrelease 4.8.25 fix

Author: Sahil-tarento

Dockerfile

@@ -2,12 +2,14 @@
 FROM openjdk:17-slim
 MAINTAINER "S M Y ALTAMASH <smy.altamash@gmail.com>"
 RUN apt update \
-    && apt install -y unzip curl \
+    && apt install -y unzip curl fontconfig \
+    && apt install -y --no-install-recommends fonts-dejavu fonts-liberation \
     && adduser --uid 1001 --home /home/sunbird/ --disabled-login --gecos "" sunbird \
     && mkdir -p /home/sunbird/
 RUN apt update \
     && apt install -y fonts-noto-core fonts-noto-cjk fonts-noto-color-emoji fonts-noto-extra
-
+RUN apt update \
+    && apt install -y fonts-dejavu-core fonts-dejavu-extra fonts-liberation
 ADD ./certificate-service-1.2.0-dist.zip /home/sunbird/
 RUN unzip /home/sunbird/certificate-service-1.2.0-dist.zip -d /home/sunbird/
 RUN chown -R sunbird:sunbird /home/sunbird

certificate-processor/src/main/java/org/sunbird/incredible/CertificateGenerator.java

@@ -97,7 +97,8 @@ public Map<String,Object> generateQrCode() throws WriterException,
         QRCodeGenerationModel qrCodeGenerationModel = new QRCodeGenerationModel();
         qrCodeGenerationModel.setText(accessCode);
         qrCodeGenerationModel.setFileName(directory + getUUID(certificateExtension));
-        qrCodeGenerationModel.setData(properties.get(JsonKey.BASE_PATH).concat("/") + getUUID(certificateExtension));
+        qrCodeGenerationModel.setData(properties.get(JsonKey.BASE_PATH).concat("/") + "v2/" + getUUID(certificateExtension));
+        logger.info("QrCodeModel: " + qrCodeGenerationModel.getData());
         QRCodeImageGenerator qrCodeImageGenerator = new QRCodeImageGenerator();
         File qrCodeFile = qrCodeImageGenerator.createQRImages(qrCodeGenerationModel);
 
@@ -114,7 +115,8 @@ public Map<String,Object> generateQrCodeFromAccessCode(String accessCode) throws
         QRCodeGenerationModel qrCodeGenerationModel = new QRCodeGenerationModel();
         qrCodeGenerationModel.setText(accessCode);
         qrCodeGenerationModel.setFileName(directory + getUUID(certificateExtension));
-        qrCodeGenerationModel.setData(properties.get(JsonKey.BASE_PATH).concat("/") + "dynamic/" + getUUID(certificateExtension));
+        qrCodeGenerationModel.setData(properties.get(JsonKey.BASE_PATH).concat("/") + "v2/" + getUUID(certificateExtension));
+        logger.info("QrCodeModel Second Method: " + qrCodeGenerationModel.getData());
         QRCodeImageGenerator qrCodeImageGenerator = new QRCodeImageGenerator();
         File qrCodeFile = qrCodeImageGenerator.createQRImages(qrCodeGenerationModel);