Added Security Module in aConnect-BS

Base Architecture
127 changed files with 6526 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,33 @@
+HELP.md
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
--- a/common/.mvn/wrapper/maven-wrapper.properties
+++ b/common/.mvn/wrapper/maven-wrapper.properties
@ -0,0 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+wrapperVersion=3.3.2
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
--- a/common/mvnw
+++ b/common/mvnw
@ -0,0 +1,259 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.2
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
--- a/common/mvnw.cmd
+++ b/common/mvnw.cmd
@ -0,0 +1,149 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.2
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain"
+}
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
--- a/common/pom.xml
+++ b/common/pom.xml
@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.mfsys</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.0.1</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+    <groupId>com.mfsys</groupId>
+    <artifactId>common</artifactId>
+    <version>0.0.1</version>
+    <name>common</name>
+    <description>GBRSP Project</description>
+    <url/>
+    <licenses>
+        <license/>
+    </licenses>
+    <developers>
+        <developer/>
+    </developers>
+    <scm>
+        <connection/>
+        <developerConnection/>
+        <tag/>
+        <url/>
+    </scm>
+    <properties>
+        <java.version>21</java.version>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.modelmapper</groupId>
+            <artifactId>modelmapper</artifactId>
+            <version>3.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.33</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mindrot</groupId>
+            <artifactId>jbcrypt</artifactId>
+            <version>0.4</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.12.6</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.12.6</version>
+        </dependency>
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId> <!-- or jjwt-gson -->
+            <version>0.12.6</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>api.CoreAPI</groupId>
+            <artifactId>EncryptionAPI</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.34</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
--- a/common/src/main/java/com/mfsys/constant/AconnectURI.java
+++ b/common/src/main/java/com/mfsys/constant/AconnectURI.java
@ -0,0 +1,34 @@
+package com.mfsys.constant;
+
+public interface AconnectURI {
+    String REFRESH_TOKEN = "/refreshtoken";
+    String DEPOSIT = "/deposit";
+    String GENERALLEDGER = "/generalledger";
+    String SIGNIN = "/signin";
+    String TRANSACTION_URI = "/transactions";
+    String CANCEL_URI = "/cancel";
+    String REJECT_URI = "/rejection";
+    String REVERSE_URI = "/reversal";
+    String AUTHORIZATION_URI = "/authorizations";
+    String DEPOSIT_AUTHORIZATION_URI = DEPOSIT + AUTHORIZATION_URI;
+    String GENERALLEDGER_AUTHORIZATION_URI = GENERALLEDGER + AUTHORIZATION_URI;
+
+    // Cancellation
+    String DEPOSIT_CANCELLATION_URI = DEPOSIT + TRANSACTION_URI + CANCEL_URI;
+    String GENERALLEDGER_CANCELLATION_URI = GENERALLEDGER + TRANSACTION_URI + CANCEL_URI;
+
+    String TRANSACTION_ACCOUNT_GL_URI = TRANSACTION_URI + "/accounttogl";
+    String TRANSACTION_GL_GL_URI = TRANSACTION_URI + "/gltogls";
+    String TRANSACTION_CANCEL_URI = TRANSACTION_URI + CANCEL_URI + "/nodes/{nodeId}/trannums/{sgtGntrtranlink}";
+    String DEPOSIT_TRANSACTION_REJECT_URI = DEPOSIT + TRANSACTION_URI + REJECT_URI;
+    String GENERALLEDGER_TRANSACTION_REJECT_URI = GENERALLEDGER + TRANSACTION_URI + REJECT_URI;
+
+    String DEPOSIT_TRANSACTION_REVERSAL_URI = DEPOSIT + TRANSACTION_URI + REVERSE_URI;
+    String GENERALLEDGER_TRANSACTION_REVERSAL_URI = GENERALLEDGER + TRANSACTION_URI + REVERSE_URI;
+
+    String TRANSACTION_CIIHIVE_AUTHORIZATION_URI = TRANSACTION_URI + AUTHORIZATION_URI;
+    String TRANSACTION_CIIHIVE_REVERSAL_URI = TRANSACTION_URI + REVERSE_URI + "/nodes/{nodeId}/trannums/{sgtGntrtranlink}";
+    String DEPOSIT_CIIHIVE_ACCOUNT_MISCELLANEOUS_DETAILS_URI = "/deposit/account/miscDetails";
+    String DEPOSIT_ACONNECT_ACCOUNT_DETAILS_URI = "/aconnect/account/getAccountDetails";
+
+}
--- a/common/src/main/java/com/mfsys/constant/CustomerStatus.java
+++ b/common/src/main/java/com/mfsys/constant/CustomerStatus.java
@ -0,0 +1,8 @@
+package com.mfsys.constant;
+
+public interface CustomerStatus {
+
+	String CUSTOMER_UNVERIFIED = "Unverified";
+	String CUSTOMER_VERIFIED = "Verified";
+	String CUSTOMER_ACTIVE = "Active";
+}
--- a/common/src/main/java/com/mfsys/constant/DBFieldNameConstant.java
+++ b/common/src/main/java/com/mfsys/constant/DBFieldNameConstant.java
@ -0,0 +1,7 @@
+package com.mfsys.constant;
+
+public interface DBFieldNameConstant {
+	
+	String POR_ORGACODE = "POR_ORGACODE";
+	String PCR_CURRCODE = "PCR_CURRCODE";
+}
--- a/common/src/main/java/com/mfsys/constant/DateFormatterConstant.java
+++ b/common/src/main/java/com/mfsys/constant/DateFormatterConstant.java
@ -0,0 +1,7 @@
+package com.mfsys.constant;
+
+public interface DateFormatterConstant {
+	String DATE_FORMAT = "yyyy-MM-dd";
+	String TIME_FORMAT = "T00:00:00.000Z";
+	String DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'";
+}
--- a/common/src/main/java/com/mfsys/constant/ERRCode.java
+++ b/common/src/main/java/com/mfsys/constant/ERRCode.java
@ -0,0 +1,23 @@
+package com.mfsys.constant;
+
+import com.mfsys.exception.ErrorMessage;
+
+public enum ERRCode implements ErrorMessage {;
+    private String code;
+    private String description;
+
+    private ERRCode(String code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    @Override
+    public String getCode() {
+        return this.code;
+    }
+
+    @Override
+    public String getDescription() {
+        return this.description;
+    }
+}
--- a/common/src/main/java/com/mfsys/constant/ErrorMessage.java
+++ b/common/src/main/java/com/mfsys/constant/ErrorMessage.java
@ -0,0 +1,6 @@
+package com.mfsys.constant;
+
+public interface ErrorMessage {
+	public String getCode();
+	public String getDescription();
+}
--- a/common/src/main/java/com/mfsys/constant/FieldNameConstant.java
+++ b/common/src/main/java/com/mfsys/constant/FieldNameConstant.java
@ -0,0 +1,151 @@
+package com.mfsys.constant;
+
+public enum FieldNameConstant implements DBFieldNameConstant {
+
+	PTR_TRANCODE("ptrTrancode", "PTR_TRANCODE"), PTR_TRANDESC("ptrTrandesc", "PTR_TRANDESC"),POR_ORGACODE("porOrgacode", DBFieldNameConstant.POR_ORGACODE),
+	SUS_USERCODE("susUsercode", "SUS_USERCODE"), SUS_NAME("susName", "SUS_NAME"), PCR_CURRCODE("pcrCurrcode", "PCR_CURRCODE"),  PCR_CURRBASE("pcrCurrbase", "PCR_CURRBASE"),
+	SGT_GNTRAMTFC("sgtGntramtfc", "SGT_GNTRAMTFC"),PLC_LOCACODE("plcLocacode", "PLC_LOCACODE"),
+	SGT_GNTRVALUEDATE("sgtGntrvaluedate", "SGT_GNTRVALUEDATE"), MBM_BKMSNUMBER("mbmBkmsnumber","MBM_BKMSNUMBER"),MBM_BKMSCLOSED("mbmBkmsclosed","MBM_BKMSCLOSED"), MBM_BKMSTITLE("mbmBkmstitle","MBM_BKMSTITLE"),
+	DMP_PRODCODE("dmpProdcode", "DMP_PRODCODE"),	MLT_LNTRPRINCIPAL("mltLntrprincipal","MLT_LNTRPRINCIPAL"),
+	MLT_LNTRINTEREST("mltLntrinterest","MLT_LNTRINTEREST"), MLT_LNTRPENALTY("mltLntrpenalty","MLT_LNTRPENALTY"),
+	SGT_GNTRNARRATION("sgtGntrnarration", "SGT_GNTRNARRATION"), BLA_LNACFINANCEDAMTFC("blaLnacfinancedamtfc","BLA_LNACFINANCEDAMTFC"),
+	BLA_LNACDISBURSEMENTFC("blaLnacdisbursementfc","BLA_LNACDISBURSEMENTFC"),DMP_PRODDESC("dmpProddesc","DMP_PRODDESC"),
+	PER_ERATRATEACT("perEratrateact","PER_ERATRATEACT"),PCR_CURRDESC("pcrCurrdesc","PCR_CURRDESC"),PLC_LOCADESC("plcLocadesc","PLC_LOCADESC"), 
+	PLC_LOCASHORT("plcLocashort", "PLC_LOCASHORT"), PLC_LOCATYPE("plcLocatype", "PLC_LOCATYPE"), PRG_REGNCODE("prgRegncode","PRG_REGNCODE"), 
+	PLC_OPENDATE("plcOpendate","PLC_OPENDATE"), BRANCH_DATA("branchStep", "BRANCH_STEP"), CHARGES_BIFURCATION("chargesBifurcation", "CHARGES_BIFURCATION"),
+	CMP_CUSTCODE("cmpCustcode", "CMP_CUSTCODE"),CMP_CUSTSEX("cmpcustsex","CMP_CUSTSEX"), CMP_GRPOUPCODE("cmpGrpoupcode","CMP_GRPOUPCODE"), PCC_CSCGCODE("pccCscgcode","PCC_CSCGCODE"),
+	PFS_FUSOID("pfsFusoid", "PFS_FUSOID"), PAT_AMTYCODE("patAmtycode","PAT_AMTYCODE"), BLA_LNMBSHARE_APPROVED("blaLnmbshareApproved","BLA_LNMBSHARE_APPROVED"),
+	BLA_ASSOCIATECUSTOMER("blaAssociatecustomer","BLA_ASSOCIATECUSTOMER"), CMP_CUSTCODE_GRP("cmpCustcodeGrp","CMP_CUSTCODE_GRP"),
+	CORRELATION_CUSTCODE("correlationCustcode","CORRELATION_CUSTCODE"),
+	CMP_COMPANYCODE("cmpCompanycode", "CMP_COMPANYCODE"), CMP_COMPANYCODE_REF("cmpCompanycodeRef","CMP_COMPANYCODE_REF"),
+	CMP_COMPANYNAME("cmpCompanyname", "CMP_COMPANYNAME"),
+	CMP_JOINTCUSTCODE("cmpJointcustcode", "CMP_JOINTCUSTCODE"),
+	PAS_ACSTCODE("pasAcstcode","PAS_ACSTCODE"),BDA_DPACBLOCKAMT("bdaDpacblockamt","BDA_DPACBLOCKAMT"), BDA_DPACPROFITACCRUEDAMTFC("bdaDpacprofitaccruedamtfc","BDA_DPACPROFITACCRUEDAMTFC"),
+	MLS_LNSHTYPE("mlsLnshtype","MLS_LNSHTYPE"),MLS_LNSHINSTNO("mlsLnshinstno","MLS_LNSHINSTNO"),MLS_LNSHDUEDATE("mlsLnshduedate","MLS_LNSHDUEDATE"),
+	MLS_LNSHPRINCIPAL("mlsLnshprincipal","MLS_LNSHPRINCIPAL"),MLS_LNSHINTEREST("mlsLnshinterest","MLS_LNSHINTEREST"),BLA_LNAPPROVEDAMOUNTFC("blaLnapprovedamountfc","BLA_LNAPPROVEDAMOUNTFC"),
+	BLA_LNACAPPROVEDATE("blaLnacapprovedate", "BLA_LNACAPPROVEDATE"),
+	CLOSING_DETAILS("closingBalanceDetails",""),WORKFLOWREFNUM("workFlowRefNum", "workFlowRefNum"),
+	PIN_LENGTH("4","pinLength"),POR_ORGADESC("porOrgadesc","POR_ORGADESC"),POR_ORGASHORT("porOrgashort","POR_ORGASHORT"),
+	POR_ORGAREGDATE("porOrgaregdate","POR_ORGAREGDATE"), POR_ORGALOGO("porOrgalogo","POR_ORGALOGO"),POR_ORGAREPORTLOGO("porOrgareportlogo","POR_ORGAREPORTLOGO"), POR_TRANINTEGRALVALUE("porTranintegralvalue", "POR_TRANINTEGRALVALUE"), POR_TRANPRECISIONVALUE("porTranrprecisionvalue", "POR_TRANPRECISIONVALUE"),
+	POR_TRANROUNDTYPE("porTranroundtype", "POR_TRANROUNDTYPE"), POR_ROUNDINGMODETRANSACTION("porRoundingmodetransactions","POR_ROUNDINGMODETRANSACTION"),
+	POR_ORGAEXPDATE("porOrgaexpdate","POR_ORGAEXPDATE"),POR_ORGAFAX("porOrgafax","POR_ORGAFAX"),POR_ADRSLNDPHONE("porAdrslndphone","POR_ADRSLNDPHONE"),POR_ORGAADDRESSLINE1("por_orgaaddressline1","POR_ORGAADDRESSLINE1"),
+	POR_ORGAADDRESSLINE2("por_orgaaddressline2","POR_ORGAADDRESSLINE2"),POR_ORGAWEBSITE("porOrgawebsite","POR_ORGAWEBSITE"), POR_ORGACODE_ENTRY("porOrgacodeEntry", "POR_ORGACODE_ENTRY"), POR_ACTIVE("porActive", "POR_ACTIVE"),
+	SUS_USERNAME("susUsername", "SUS_USERNAME"),SUS_PASSWORD("susPassword", "SUS_PASSWORD"),SUS_USERCELLNO("susUsercellno", "SUS_USERCELLNO"),SUL_LEVELCODE("sulLevelCode", "SUL_LEVELCODE"),SUL_DESC("sulDesc", "SUL_DESC"),SUL_STATUS("sulStatus", "SUL_STATUS")
+	,SUS_MULTILOGIN("susMultilogin","SUS_MULTILOGIN") , SUS_HOMELOCATION("susHomelocation","SUS_HOMELOCATION"),SUS_ACTIVE("susActive", "SUS_ACTIVE"), SUS_SIGNLOG("susSignlog","SUS_SIGNLOG"), USER_DATA("userStep","USER_STEP"),ROLE_DATA("roleStep", "ROLE_STEP"),PCA_GLACDEBIT("pcaGlacdebit","PCA_GLACDEBIT"),PCA_GLACCREDIT("pcaGlaccredit","PCA_GLACCREDIT"),PCH_CHRGCODE("pchChrgcode","PCH_CHRGCODE"),PCH_CHRGDESC("pchChrgdesc","PCH_CHRGDESC"),
+	PET_EVENTCODE_POST("petEventcodePost","PET_EVENTCODE_POST"), PET_EXRTCODE("petExrtcode","PET_EXRTCODE"), PER_ERATDATE("perEratdate","PER_ERATDATE"), PLT_LOCATYPEDESC("pltLocatypedesc", "PLT_LOCATYPEDESC"), CMP_CREATEDBY("cmpCreatedby", "CMP_CREATEDBY"), PLC_LOCACODE_ENTRY("PLC_LOCACODE_ENTRY", "PLC_LOCACODE_ENTRY"),
+	POR_ORGATIMEZONE("porOrgatimezone", "POR_ORGATIMEZONE"), POR_ORGAUTCTIMEZONE("porOrgautctimezone", "POR_ORGAUTCTIMEZONE"),PLC_LOCATIMEZONE("plcLocatimezone", "PLC_LOCATIMEZONE"), PLC_ACTIVE("plcActive","PLC_ACTIVE"),
+	PCA_GLACCODE("pcaGlaccode", "PCA_GLACCODE"), SGT_GNTRDATE("sgtGntrdate", "SGT_GNTRDATE"), SGT_GNTRAMT("sgtGntramt", "SGT_GNTRAMT"),
+	PFS_ACNTDATEFROM("pfs_acntdatefrom","PFS_ACNTDATEFROM"), PFS_ACNTDATETO("pfs_acntdateto", "PFS_ACNTDATETO"), PFS_ACNTDESC("pfs_acntdesc","PFS_ACNTDESC"),
+	BGP_GLPRCOMPANYDATE("bgpGlprcompanydate","BGP_GLPRCOMPANYDATE"),BGP_GLPRCOMPANYTIMEZONE("bgpGlprcompanytimezone","BGP_GLPRCOMPANYDATE"), BGP_GLPROPERATIONCLOSE("bgpGlproperationclose", "BGP_GLPROPERATIONCLOSE"),
+	BGP_GLPRNEXTDATE("bgpGlprnextdate", "BGP_GLPRNEXTDATE"), PCO_CLDSTATUS("pcoCldstatus", "PCO_CLDSTATUS"), PCO_CLDSHADOWED("pcoCldshadowed", "PCO_CLDSHADOWED"),
+	PCO_CLDBATCHPROCESS("pcoCldbatchprocess", "PCO_CLDBATCHPROCESS"), PCO_CLDERRMESSAGE("pcoClderrmessage", "PCO_CLDERRMESSAGE"),
+	BLA_LNAPPLIEDAMOUNTFC ("blaLnappliedamountfc","BLA_LNAPPLIEDAMOUNTFC"), TRANSACTION_DESCRIPTION("transactionDescription","TRANSACTION_DESCRIPTION"),
+	BLA_LNACINTERESTRATE("blaLnacinterestrate","BLA_LNACINTERESTRATE"), PCD_CORDCODE("pcdCordcode","PCD_CORDCODE"),PPO_PURPCODE("ppoPurpcode","PPO_PURPCODE"), OLD_PCD_CORDCODE("oldPcdCordcode","OLD_PCD_CORDCODE"),
+	NEW_PCD_CORDCODE("newPcdCordcode","NEW_PCD_CORDCODE"), PCD_CORDCOMMENT ("pcdCordcomment","PCD_CORDCOMMENT"), TRANSACTION_TIME("transactionTime","TRANSACTION_TIME"),
+	SGT_GNTRNUMBER("sgtGntrnumber", "SGT_GNTRNUMBER"), SGT_GNTRTRANLINK("sgtGntrtranlink", "SGT_GNTRTRANLINK"), SGT_GNTRCREATEDAT("sgtGntrcreatedat", "SGT_GNTRCREATEDAT"),
+	BTA_BOOKINGAMOUNT("btaBookingamount", "BTA_BOOKINGAMOUNT"), BTA_DURATION("btaDuration", "BTA_DURATION"), PFM_FMODCODE("pfmFmodcode", "PFM_FMODCODE"), PRO_RLOVCODE("proRlovcode", "PRO_RLOVCODE"),
+	PTM_TMETCODE("ptmTmetcode", "PTM_TMETCODE"), PTM_TMETDESC("ptmTmetdesc", "PTM_TMETDESC"), PLC_CHARGECALCRATE("plcChargecalcrate", "PLC_CHARGECALCRATE"),
+	SVH_VCHDUPDATETIMESTAMP("svhVchdupdatetimestamp","SVH_VCHDUPDATETIMESTAMP"), SVH_VCHDFLDCOMB("svhVchdfldcomb", "SVH_VCHDFLDCOMB"), SVH_VCHDVALCOMBDESC("svhVchdvalcombdesc", "SVH_VCHDVALCOMBDESC"), PAA_TAAUTIMESTAMP("paaTaautimestamp", "PAA_TAAUTIMESTAMP"),
+	MBM_BKMSBALANCE("mbmBkmsbalance", "MBM_BKMSBALANCE"), MBM_BKMSUNAUTHDRBALANCE("mbmBkmsunauthdrbalance", "MBM_BKMSUNAUTHDRBALANCE"), MBM_BKMSUNAUTHCRBALANCE("mbmBkmsunauthcrbalance", "MBM_BKMSUNAUTHCRBALANCE"),
+	CURRENT_AMOUNT("currentAmount", "CURRENT_AMOUNT"), CURRENCY_DENOMINATION_DETIAL("currencyDenominationDetail", "currencyDenominationDetail"), CLOSE_OPERATION_DATA("closeOperationData", "closeOperationData"),
+	PCA_GLACOPITEM("pcaGlacopitem", "PCA_GLACOPITEM"), PCT_CALCODE("pctCalcode", "PCT_CALCODE"),
+	NODE_ID("nodeId", "NODE_ID"), SVV_VCVRREFNO("svvVcvrrefno", "SVV_VCVRREFNO"), PIT_INSTCODE("pitInstcode", "PIT_INSTCODE"), MIT_INSTCODE("mitInstcode", "MIT_INSTCODE"),
+	MIS_INSEBOOKNO("misInsebookno", "MIS_INSEBOOKNO"), PIS_INSTCODE("pisInstcode", "PIS_INSTCODE"), PIN_INVSCODE("pinInvscode", "PIN_INVSCODE"), MIS_INSERANGEFROM("misInserangefrom", "MIS_INSERANGEFROM"), MIS_INSERANGETO("misInserangeto", "MIS_INSERANGETO"),
+	MIS_INSERECVDATE("misInserecvdate", "MIS_INSERECVDATE"), MIS_INSEISSUEACNTDATE("misInseissueacntdate", "MIS_INSEISSUEACNTDATE"),
+	PPM_PYMDCODE("ppmPymdcode","PPM_PYMDCODE"),
+	SWITCH_CODE("switchCode","SWITCH_CODE"),
+	CRDR_CODE("crdrcode","CRDRCODE"),
+	ACCOUNT_TRA_NO("pcaGlaccodeAc","ACCOUNT_TRANSFER_NO"),
+	MBM_BKMSNUMBER_REF("mbmBkmsnumberRef","MBM_BKMSNUMBER_REF"),
+	DMP_PRODCODE_REF("dmpProdcodeRef","DMP_PRODCODE_REF"),
+	BLN_RESTRUCTUREPRINCIPALAMT("blnRestructureprincipalamt","BLN_RESTRUCTUREPRINCIPALAMT"),
+	BLA_LNACDISBURSEMENTDATE("bla_lnacdisbursementdate","BLA_LNACDISBURSEMENTDATE"),
+	PROCESS_COMPLETED("processCompleted","processCompleted"),
+	MIS_INSELOST( "MIS_INSELOST", "MIS_INSELOST"),
+	BATCH_USERCODE("@_CREATEUSER", "@_CREATEUSER"),
+	SGT_GNTRCREATEAT("sgtGntrcreateat", "SGT_GNTRCREATEAT"),
+	CMP_ACCOUNT_TITLE_FL("cmpAccountTitleFl","CMP_ACCOUNT_TITLE_FL"),
+	CMP_ACCOUNT_TITLE_LF("cmpAccountTitleLf","CMP_ACCOUNT_TITLE_LF"),
+	BN_CS_IT_IDENTIFIER("bnCsItIdentifier","BN_CS_IT_IDENTIFIER"),
+	CIT_IDENVALUE("citIdenValue","CIT_IDENVALUE"),
+	PIT_IDENCODE("pitIdenCode","PIT_IDENCODE"),
+    PHONE_NUMBER("phoneNumber","PHONE_NUMBER"),
+	BTA_AUTOROLLED("BtaAutorolled","BTA_AUTOROLLED"),
+	
+	BLN_RESTRUCTUREADDITIONALAMT("blnRestructureadditionalamt","BLN_RESTRUCTUREADDITIONALAMT"),	
+	CMP_BLACKLISTED("cmpBlacklisted", "CMP_BLACKLISTED"),
+	BGP_FRACTIONALSCALE("bgpFractionalscale", "BGP_FRACTIONALSCALE"),
+	BGP_BLACKLISTSETUP("bgpBlacklistsetup", "BGP_BLACKLISTSETUP"),
+	PLC_CHARGECALCRATE_ACCOUNT("plcChargecalcrateAccount", "PLC_CHARGECALCRATE_ACCOUNT"),
+	DST_STIERVALUE("dstStiervalueAccount","DST_STIERVALUE"),
+	DST_STIERVALUE_ACCOUNT("dstStiervalue","DST_STIERVALUE_ACCOUNT"),
+	BLA_ASSOCIATENAME("blaAssociatename","BLA_ASSOCIATENAME"),
+	ANR_ACNRCODE("anrAcnrcode", "ANR_ACNRCODE"),
+	BLG_CUSTCODE("blgCustcode", "BLG_CUSTCODE"),
+	RATE_AMOUNT("rateAmount","RATE_AMOUNT"),
+	
+	
+	PLC_ALLOWED_LOCA("plcallowedloca","PLC_ALLOWED_LOCA"),
+	PLC_AMOUNTFROM("plcamountfrom","PLC_AMOUNTFROM"),
+	PLC_AMOUNTTO("plcamountto","PLC_AMOUNTTO"),
+	PLC_CHARGECALCRATE_PRODUCT("plcchargecalcrateproduct","PLC_CHARGECALCRATE_PRODUCT"),
+	//Online Banking
+	CMP_CUSTPASSWORD("cmpCustpassword","CMP_CUSTPASSWORD"), CMP_CUSTSTATUS("cmpCuststatus", "CMP_CUSTSTATUS"), CMP_CUSTSTATUSDATE("cmpCuststatusdate", "CMP_CUSTSTATUSDATE"),
+	CMP_CUSTLASTLOGIN("cmpCustlastlogin", "CMP_CUSTLASTLOGIN"),
+	PCT_CSTYCODE("pctCstycode", "PCT_CSTYCODE"), CMP_FIRSTNAME("cmpFirstname", "CMP_FIRSTNAME"), CMP_LASTNAME("cmpLastname", "CMP_LASTNAME"),
+	PAD_ADRSMOBPHONE("padAdrsmobphone", "PAD_ADRSMOBPHONE"), PAD_ADRSEMAIL("padAdrsemail", "PAD_ADRSEMAIL"),
+	PAD_ADRSCORRESPONDENCE("padAdrscorrespondence", "PAD_ADRSCORRESPONDENCE"),
+	OCB_BENEFICIARYVERIFIED("ocbBeneficiaryverified", "OCB_BENEFICIARYVERIFIED"), OCB_BENEFICIARYVERIFYDATE("ocbBeneficiaryverifydate", "OCB_BENEFICIARYVERIFYDATE"),
+	PRC_CLASSIFICATION("prcClassification", "PRC_CLASSIFICATION"),
+	OTD_TRANSACTIONPOSTED("otdTransactionposted", "OTD_TRANSACTIONPOSTED"), OTD_TRANSACTIONPOSTDATE("otdTransactionpostdate", "OTD_TRANSACTIONPOSTDATE"), 
+	OTD_TRANSACTIONID("otdTransactionid", "OTD_TRANSACTIONID"),
+	
+	ORGANIZATION("organization", "ORGANIZATION"), LOCATION("location", "LOCATION"),
+	CURRENCY("currency", "CURRENCY"), GLOBALPARAMETER("globalparameter", "GLOBALPARAMETER"),
+	PCA_GLACODE_DEBIT("pcaGlacodeDebit","PCA_GLACODE_DEBIT"), PCA_GLACODE_CREDIT("pcaGlacodeCredit","PCA_GLACODE_CREDIT"),
+	PLC_APPLYACCRUAL("plcApplyaccrual", "PLC_APPLYACCRUAL"),
+	PFS_ACNTSTATUS("pfsAcntstatus","PFS_ACNTSTATUS"),
+	PRO_RLOVTONEWACCOUNT("proRlovtonewaccount", "PRO_RLOVTONEWACCOUNT"),
+	BBS_BATCHSTATUS("bbsBatchstatus", "BBS_BATCHSTATUS"), BBS_BATCHAMT("bbsBatchamt", "BBS_BATCHAMT"),
+	BLA_LNACGRACEPRINCIPLE("blaLnacgraceprinciple","BLA_LNACGRACEPRINCIPLE"),
+	BLA_LNACTOTALDURATION("blaLnactotalduration", "BLA_LNACTOTALDURATION"),
+	BLA_LNACEFFECTIVEDATE("blaLnaceffectivedate","BLA_LNACEFFECTIVEDATE"),
+	MLS_LNSHINSTTOTAL("mlsLnshinsttotal","MLS_LNSHINSTTOTAL"), SYSTEM_ORGA("SYSTEM_ORGA","SYSTEM_ORGA"), PLC_SUBLOCACODE("plcSublocacode","PLC_SUBLOCACODE"),
+	PLC_SUBLOCADESC("plcSublocadesc","PLC_SUBLOCADESC"),
+	ISC_AUTO_REVERSAL("iscAutoReversal", "ISC_AUTO_REVERSAL"),
+	MBM_NOTIFICATIONSERVICE("mbmNotificationService","MBM_NOTIFICATIONSERVICE"),
+	SERIAL_NO("serialNo" , "SERIAL_NO"), NOTIFICATION_STATUS("notificationStatus", "NOTIFICATION_STATUS"),
+	MESSAGE("Message", "MESSAGE"), SGT_GNTRDRCR("sgtGntrdrcr", "SGT_GNTRDRCR"), PIT_JOINTCUSTCODE("pitJoincustcode", "PIT_JOINTCUSTCODE"),
+	PCO_CTRYCODE("pcoCtrycode","PCO_CTRYCODE"), UDF3("prgntmUdf3","PR_GN_TM_UDF3"), UDF1("prgntmUdf1","PR_GN_TM_UDF1"), PFS_ACNTYEAR("pfsAcntyear","PFS_ACNTYEAR"), FROM_DATE("fromdate","FROM_DATE"), TO_DATE("todate","TO_DATE"),
+	STATUS_CODE("statusCode", "status_code"), TRANSACTION_NO("tranNo", "TRAN_NO"), TRANSACTION_DATE("tranDate", "TRAN_DATE"), TRANSACTION_AMOUNT("tranAmount", "TRAN_AMOUNT"),
+	CMP_IDENTIFICATION_NO("cmpIdentificationNo","CMP_IDENTIFICATION_NO"),
+	DEPOSIT("deposit","DEPOSIT"),
+	OTP_CODE("otpCode","OTP_CODE"),
+	IDEN_VALUE("idenValue", "IDEN_VALUE"),
+	PIT_IDENVALUE("pitIdenvalue", "PIT_IDENVALUE"),
+	PIT_IDENDESC("pit_idendesc", "PIT_IDENDESC"),
+	COMMISSION_AMOUNT("commissionAmount", "COMMISSION_AMOUNT"),
+	CMP_USERID("cmpUserId","CMP_USERID"),
+	COMPANY_NAME("companyName","COMPANY_NAME"),
+	OAUTH_FLAG("oauthFlag","OAUTH_FLAG")
+
+	;
+	
+	
+	FieldNameConstant(String variableName, String dbFieldName) {
+		this.variableName = variableName;
+		this.dbFieldName = dbFieldName;
+	}
+
+	private final String variableName;
+	private final String dbFieldName;
+
+	public String getVariableName() {
+		return variableName;
+	}
+
+	public String getDbFieldName() {
+		return dbFieldName;
+	}
+
+}
--- a/common/src/main/java/com/mfsys/constant/FieldNameLength.java
+++ b/common/src/main/java/com/mfsys/constant/FieldNameLength.java
@ -0,0 +1,57 @@
+package com.mfsys.constant;
+
+public interface FieldNameLength {
+
+    // VARCHAR Lengths
+    String CODE_1 = "VARCHAR(1)";
+    String CODE_2 = "VARCHAR(2)";
+    String CODE_3 = "VARCHAR(3)";
+    String CODE_4 = "VARCHAR(4)";
+    String CODE_5 = "VARCHAR(5)";
+    String CODE_6 = "VARCHAR(60)";
+    String CODE_7 = "VARCHAR(7)";
+    String CODE_10 = "VARCHAR(10)";
+    String CODE_12 = "VARCHAR(12)";
+    String CODE_20 = "VARCHAR(20)";
+    String CODE_50 = "VARCHAR(50)";
+    String CODE_60 = "VARCHAR(60)";
+    String CODE_100 = "VARCHAR(100)";
+    String CODE_150 = "VARCHAR(150)";
+    String CODE_200 = "VARCHAR(200)";
+    String CODE_500 = "VARCHAR(500)";
+    String CODE_1000 = "VARCHAR(1000)";
+    String CODE_10000 = "VARCHAR(10000)";
+    // Descriptions
+    String DESCRIPTION_LONG = "VARCHAR(40)";
+    String DESCRIPTION_SHORT = "VARCHAR(20)";
+
+    // Numeric & Boolean Types
+    String BOOLEAN_BIT = "TINYINT(1)";
+    String AMOUNT_REAL = "DECIMAL(20,6)";
+    String AMOUNT_INT = "DECIMAL(20,0)";
+    String DECIMAL = "DECIMAL(20,6)";
+    String DECIMAL_30 = "DECIMAL(30,6)";
+    String RATE_REAL = "DECIMAL(20,10)";
+
+    // Date/Time Types
+    String DATE = "DATE";
+    String DATETIME = "DATETIME";
+    String TIMESTAMP = "TIMESTAMP";
+    String TIMESTAMP_NULLABLE = "TIMESTAMP NULL";
+    String YEAR = "YEAR";
+
+    // Other Data Types
+    String PASSWORD = "VARCHAR(50)";
+    String BIGINT = "BIGINT";
+    String INT = "INT";
+    String INT_50 = "INT(50)";
+    String TINYINT = "TINYINT";
+    String XML = "TEXT";
+    String TEXT = "TEXT";
+    String JSON = "JSON";
+
+    // Aliases
+    String DAYS = INT;
+
+}
+
--- a/common/src/main/java/com/mfsys/constant/FilterPriority.java
+++ b/common/src/main/java/com/mfsys/constant/FilterPriority.java
@ -0,0 +1,10 @@
+package com.mfsys.constant;
+
+public interface FilterPriority {
+
+  int CORS = 1;
+  int LOGGING = 2;
+  int AUTHENTICATION = 3;
+  int SUBSCRIPTION = 4;
+
+}
--- a/common/src/main/java/com/mfsys/constant/FormPropertyConst.java
+++ b/common/src/main/java/com/mfsys/constant/FormPropertyConst.java
@ -0,0 +1,17 @@
+package com.mfsys.constant;
+
+public interface FormPropertyConst {
+
+    String POR_ORGACODE = "POR_ORGACODE";
+    String USERID = "cmpUserId";
+    String REQUEST_URI = "REQUEST_URI";
+    String CLIENT_IP = "CLIENT_IP";
+    String THIRD_PARTY = "THIRDPARTY";
+    String TEMPLATE_TYPE_NOTIFICATION = "T";
+    String PIN_LOCALE_ARABIC = "ar";
+    String PIN_LOCALE_FRENCH = "fr";
+
+
+
+}
+
--- a/common/src/main/java/com/mfsys/constant/IDType.java
+++ b/common/src/main/java/com/mfsys/constant/IDType.java
@ -0,0 +1,19 @@
+package com.mfsys.constant;
+
+public enum IDType {
+	
+	cnic("CNIC"),
+	poc("POC"),
+	nicop("NICOP"),
+	passport("PASSPORT");
+    
+    private final String value;
+    
+    IDType(String value) {
+        this.value = value;
+    }
+    
+    public String getValue() {
+        return value;
+    }
+}
--- a/common/src/main/java/com/mfsys/constant/LoggerURI.java
+++ b/common/src/main/java/com/mfsys/constant/LoggerURI.java
@ -0,0 +1,5 @@
+package com.mfsys.constant;
+
+public interface LoggerURI {
+  String GET_LOGS_BY_DATES = "/logs/getByDate";
+}
--- a/common/src/main/java/com/mfsys/constant/MicroserviceBaseURI.java
+++ b/common/src/main/java/com/mfsys/constant/MicroserviceBaseURI.java
@ -0,0 +1,5 @@
+package com.mfsys.constant;
+
+public class MicroserviceBaseURI {
+	public static final String MConnect = "/MCONNECT";
+}
--- a/common/src/main/java/com/mfsys/constant/MiddlewareERRCode.java
+++ b/common/src/main/java/com/mfsys/constant/MiddlewareERRCode.java
@ -0,0 +1,28 @@
+package com.mfsys.constant;
+
+public enum MiddlewareERRCode implements ErrorMessage {
+	
+	IB_PURPOSE_ALREADY_EXISTS("ERR_MDL_B_0001", "Purpose {1} has already exist"),
+	
+	;
+	
+	private MiddlewareERRCode(String code, String description) {
+		this.code = code;
+		this.description = description;
+	}
+
+	private String code;
+	private String description;
+	
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+	
+	@Override
+	public String getDescription() {
+		return this.description;
+	}
+
+	
+}
--- a/common/src/main/java/com/mfsys/constant/NotificationMessage.java
+++ b/common/src/main/java/com/mfsys/constant/NotificationMessage.java
@ -0,0 +1,6 @@
+package com.mfsys.constant;
+
+public interface NotificationMessage {
+	public String getCode();
+	public String getDescription();
+}
--- a/common/src/main/java/com/mfsys/constant/OnlineBankingERRCode.java
+++ b/common/src/main/java/com/mfsys/constant/OnlineBankingERRCode.java
@ -0,0 +1,76 @@
+package com.mfsys.constant;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public enum OnlineBankingERRCode implements ErrorMessage {
+	ONLINE_BANKING_CUSTOMER_NOT_EXIST("ERR_OBN_0001", "Customer {0} not registered for online banking"),
+	BENEFICIARY_DOES_NOT_EXIST("ERR_OBN_0002", "Beneficiary with Account Number {0} does not exist"),
+	TRANSACTION_DOES_NOT_EXIST("ERR_OBN_0003", "Transaction with Pin Request ID {0} does not exist"),
+	INVALID_CREDENTIALS("ERR_OBN_0004", "Provided credentials are invalid"),
+	CUTOMERID_ALREADY_EXIST("ERR_OBN_0005", "You Can not take this User Name"),
+	BENEFICIARY_ALREADY_EXIST("ERR_OBN_0006", "Beneficiary Already Exist"),
+	ACCOUNT_ALREADY_EXIST("ERR_OBN_0007", "Account Already Exist"),
+	CUTOMERID_NOT_EXIST("ERR_OBN_0008", "User ID Not Exist"),
+	LOCK_USER("ERR_OBN_0009", "Your Account is Lock Due to Five Failed Attemps"), 
+	LOCK_USER_ATTEMPS("ERR_OBN_0010", "Your have {1} Attemps left"),
+	PASSWORD_NOT_SAME("ERR_OBN_0011", "New password should not be same as old password"),
+	SERVER_DOWN("ERR_OBN_0012", "Server is down"),
+	CUSTOMER_IDEN_NOT_EXSIT("ERR_OBN_0013", "Customer Iden Number Not Found"),
+	USER_NOT_ACTIVE("ERR_OBN_0014", "User Status Not Active"),
+	OLD_PASSWORD_NOT_MATCHED("ERR_OBN_0015", "password Does Not Match Old Password"),
+	//InterserviceErrorCodes
+	ACCOUNT_DOES_NOT_EXIST("ERR_ACC_B_0001", "Customer account {0} does not exist."),
+	THIRDPARTY_ACCOUNT_DOES_NOT_EXIST("ERR_ACC_B_0006", "Customer account {0} does not exist."),
+	CUSTOMER_DOES_NOT_EXIST("ERR_CRM_0001", "Customer with ID {0} does not exist"),
+	INVALID_OTP("ERR_OTP_B_0001","Invalid OTP"),
+	ACCOUNT_CLOSE("ERR_ACC_B_0004", "Account {1} is closed"),
+	INSUFFICIENT_BAL("ERR_DEP_B_0001", "Account has insufficient balance"),
+	BLACKLIST_CUSTOMER("ERR_ACC_B_0015", "Customer {0} is blacklisted."),
+	TDR_ACCOUNT_NOT_ALLOWED("ERR_ACC_B_0027", "Term Deposit Account is Not Allowed."),
+
+	SMS_GATEWAY_SERVICE_DOWN("ERR_ACC_B_0028","SMS Gateway Service is Down"),
+	ACCOUNT_RESTRICTION_EXISTS("ERR_ACC_B_0029","Account restriction exists"),
+
+
+	;
+
+	private String code;
+	private String description;
+
+	private OnlineBankingERRCode(String code, String description) {
+		this.code = code;
+		this.description = description;
+	}
+
+	@Override
+	public String getCode() {
+		return this.code;
+	}
+
+	@Override
+	public String getDescription() {
+		return this.description;
+	}
+	
+	public static class Mapper {
+		private static final Map<String, OnlineBankingERRCode> mapper = new HashMap<String, OnlineBankingERRCode>();
+
+		public static OnlineBankingERRCode getErrorCode(String code) {
+			return mapper.get(code);
+		}
+
+		public static Set<String> getErrorCodes() {
+			return Collections.unmodifiableSet(mapper.keySet());
+		}
+
+		static {
+			for (OnlineBankingERRCode error : EnumSet.allOf(OnlineBankingERRCode.class)) {
+				mapper.put(error.getCode(), error);
+			}
+		}
+	}
+}
--- a/common/src/main/java/com/mfsys/constant/OnlineBankingNotifCode.java
+++ b/common/src/main/java/com/mfsys/constant/OnlineBankingNotifCode.java
@ -0,0 +1,29 @@
+package com.mfsys.constant;
+
+public enum OnlineBankingNotifCode implements NotificationMessage {
+
+	CUSTOMER_REGISTRATION_PIN("NTF_OBN_B_0001", "New Online Banking Customer Registration Verification Pin"),
+	CUSTOMER_ONE_TIME_PIN("NTF_OBN_B_0002", "Customer One Time Pin for First Login Verification"),
+	CUSTOMER_BENEFICIARY_VERIFY_PIN("NTF_OBN_B_0003", "Customer Beneficiary Verify Pin"),
+	FINANCIAL_TRANSACTION_VERIFY_PIN("NTF_OBN_B_0004", "Financial Transaction Verification Pin"),
+	LOAN_FINANCIAL_TRANSACTION_VERIFY_PIN("NTF_OBN_B_0005", "Loan Financial Transaction Verification Pin");
+
+	private String code;
+	private String description;
+
+	private OnlineBankingNotifCode(String code, String description) {
+		this.code = code;
+		this.description = description;
+	}
+
+	@Override
+	public String getCode() {
+		return code;
+	}
+
+	@Override
+	public String getDescription() {
+		return description;
+	}
+
+}
--- a/common/src/main/java/com/mfsys/constant/OnlineBankingURI.java
+++ b/common/src/main/java/com/mfsys/constant/OnlineBankingURI.java
@ -0,0 +1,100 @@
+package com.mfsys.constant;
+
+
+public interface OnlineBankingURI {
+	
+	String REFRESH_TOKEN = "/refreshtoken";
+	
+	String CUSTOMER_REGISTER = "/customer/register";
+	String CUSTOMER_REGISTER_PIN_VERIFY = "/customer/register/pin-verify";
+	String CUSTOMER_REGISTER_PIN_RESEND = "/customer/register/pin-resend";
+	String CUSTOMER_SET_PASSWORD = "/customer/set-password";
+	String CUSTOMER_OTP_RESEND = "/customer/register/otp-resend";
+	String CUSTOMER_CHANGE_PASSWORD = "/customer/change-password";
+	String CUSTOMER_LOGIN = "/customer/login";
+
+	String ACCOUNTS_DETAILS = "/accounts/details";
+	
+	String BENEFICIARY = "/beneficiary/organization/{porOrgacode}/customer/{cmpCustcode}/customertype/{pctCstycode}/account/{mbmBkmsnumberRef}";
+	String BENEFICIARY_LIST = "/beneficiary/organization/{porOrgacode}/customer/{cmpCustcode}/customertype/{pctCstycode}";
+	String BENEFICIARY_VERIFICATION = "/beneficiary/verify";
+	String BENEFICIARY_VERIFICATION_PIN_RESEND = "/beneficiary/pin/resend";
+	
+	String ACCOUNT_TO_ACCOUNT_TRANSACTION_REQUEST = "/transaction/request/account-account";
+	String ACCOUNT_TO_ACCOUNT_TRANSACTION_POST = "/transaction/post/account-account";
+	String TRANSACTION_PIN_RESEND = "/transaction/pin-resend";
+
+	String CUSTOMER_REGISTER_IDNUMBER = "/customer/register/checkid";
+
+	String CUSTOMER_REGISTER_ACCOUNT_NO = "/customer/register/checkaccountno";
+	String FETCH_ACCOUNT_TITLE = "/thirdparty/user/register/checkaccountno";
+	
+	String CUSTOMER_REGISTER_USERID = "/customer/register/userid";
+	
+	String CUSTOMER_FORGETPASS_USERID = "/customer/forgetPassword/userid";
+
+	String ADD_BENEFICIARY = "/beneficiary/channel/{channelCode}";
+	
+	String ADD_BENEFICIARY_URL = "/beneficiary";
+	
+	String ACCOUNTS_HISTORY = "/accounts/history";
+
+	String LOAN_ACCOUNT_INDV_DETAILS_URI = "/account/indvdetails";
+
+    String LOAN_ACCOUNT_REQUEST_PAY="/transactions/channel/{channelCode}/customer/{cmpCustcode}/customertype/{pctCstycode}/pay/{obpPincode}"; 
+	String LOAN_INDIVIDUAL_REPAYMENT_TRANSACTION_URI = "/transactions/pay";
+
+	String CUSTOMER_OTP_SEND = "/customer/login/otp-send";
+
+	String LOAN_ACCOUNT_TRAN_HISTORY = "/account/loan/history";
+
+	String CUSTOMER_FORGETPASS = "/customer/forgetpassword";
+
+	String CUSTOMER_UPDATEPASSWORD = "/customer/updatepassword";
+
+	String ACCOUNT_ACTIVITY = "/account/activity/organization/{porOrgacode}/customer/{cmpCustcode}/customertype/{pctCstycode}/fromdate/{fdate}/todate/{tdate}";
+	String POST_ACCOUNT_ACTIVITY = "/account/activity/organization/{porOrgacode}/customer/{cmpCustcode}/customertype/{pctCstycode}";
+
+	String ZAKAT_HISTORY = "/account/zakat/details";
+
+	String TEST_PIN = "/account/pin";
+
+	String LOAN_TRANSACTION_PIN_RESEND = "/loan/transaction/pin-resend/channel/{channelCode}";
+	
+	String LOAN_TRANSACTION_PIN_SEND = "/loan/transaction/pin-send/channel/{channelCode}";
+
+	String CUSTOMER_ACCOUNT_DETAILS = "/customer/account/details";
+
+	String UPDATE_CUSTOMER_DETAILS = "/customer/update";
+
+	String report = "/customer/account/report";
+
+	String Bankingreport = "/generate/report";
+	String CUSTOMER_REGISTRATION_CHECKID = "/thirdparty/user/register/checkid";
+	String CHECK_CUSTOMER_ACCOUNT_NO = "/thirdparty/user/register/checkaccountno";
+	String THIRD_PARTY_CUSTOMER_REGISTER = "/thirdparty/user/register";
+	String THIRDPARTY_CUSTOMER_REGISTER_PIN_RESEND = "/thirdparty/user/register/pin-resend";
+	String THIRDPARTY_CUSTOMER_SET_PASSWORD = "/thirdparty/user/set-password";
+	String THIRDPARTY_CUSTOMER_REGISTER_PIN_VERIFY = "/thirdparty/user/register/pin-verify";
+	String CHANNEL_REGISTRATION = "/thirdparty/channel/register";
+	String THIRDPARTY_USER_AUTHENTICATION = "/thirdparty/user/auth";
+	String THIRDPARTY_ACCOUNT_DETAILS = "/thirdparty/deposit/account/details";
+	String THIRDPARTY_CUSTOMER_UPDATEPASSWORD = "/thirdparty/user/update-password";
+	String THIRDPARTY_DEPOSIT_ACCOUNT_BALANCE_INQUIRY = "/thirdparty/deposit/account/balance-inquiry";
+	String THIRDPARTY_ACCOUNT_TO_ACCOUNT_TRANSACTION_REQUEST = "/thirdparty/deposit/transaction/acc-acc";
+	String THIRDPARTY_ACCOUNT_TO_ACCOUNT_TRANSACTION_POST = "/thirdparty/deposit/transaction/post/acc-acc";
+	String THIRDPARTY_MINI_ACCOUNT_STATEMENT = "/thirdparty/deposit/account/mini-statement";
+	String THIRDPARTY_ACCOUNT_TO_SAMA_WALLET_TRANSACTION = "/thirdparty/deposit/transaction/acc-wallet";
+	String THIRDPARTY_ACCOUNT_TO_GL_TRANSACTION = "/thirdparty/deposit/transaction/acc-gl";
+	String ACCOUNT_TO_GL_TRANSACTION_REQUEST = "/transaction/request/account-gl";
+	String FETCH_CHANNEL_LIST = "/thirdparty/channel/register";
+	String THIRDPARTY_PHONENUMBER = "/thirdparty/deposit/transaction/phoneNumber";
+	String FETCH_IDENTIFIERS = "/include/fetch/identifiers";
+	String THIRDPARTY_SAMA_WALLET_TO_ACCOUNT_TRANSACTION = "/thirdparty/deposit/transaction/wallet-acc";
+	String THIRDPARTY_SAMA_WALLET_TO_ACCOUNT = "/transaction/request/gl-account";
+	String THIRDPARTY_FORGET_PASSWORD_GENERATE_OTP = "/thirdparty/user/forget-password/generate-otp";
+	String THIRDPARTY_FORGET_PASSWORD_SET_PASSWORD= "/thirdparty/user/forget-password/set-password";
+	String THIRDPARTY_FORGET_PASSWORD_PIN_VERIFY = "/thirdparty/user/forget-password/pin-verify";
+	//	String FETCH_CHANNEL_LIST = "/thirdparty/channel/register";
+
+}
--- a/common/src/main/java/com/mfsys/constant/PROFILES.java
+++ b/common/src/main/java/com/mfsys/constant/PROFILES.java
@ -0,0 +1,12 @@
+package com.mfsys.constant;
+
+public class PROFILES {
+	
+	public static final String AWS = "aws";
+	public static final String NOT_AWS = "!" + AWS;
+	public static final String DEV = "dev";
+	public static final String NOT_TEST = "!test";
+	public static final String RELEASE = "release";
+	
+	
+}
--- a/common/src/main/java/com/mfsys/constant/PinConstants.java
+++ b/common/src/main/java/com/mfsys/constant/PinConstants.java
@ -0,0 +1,8 @@
+package com.mfsys.constant;
+
+public interface PinConstants {
+
+	int PIN_LENGTH = 4;
+	int PIN_UPPER_BOUND_4 = 10000;
+	String PIN_PADDING_CONSTANT_4 = "%04d";
+}
--- a/common/src/main/java/com/mfsys/constant/PinStatus.java
+++ b/common/src/main/java/com/mfsys/constant/PinStatus.java
@ -0,0 +1,8 @@
+package com.mfsys.constant;
+
+public interface PinStatus {
+
+	String PIN_UNVERIFIED = "Unverified";
+	String PIN_VERIFIED = "Verified";
+	String PIN_EXPIRED = "Expired";
+}
--- a/common/src/main/java/com/mfsys/constant/PinType.java
+++ b/common/src/main/java/com/mfsys/constant/PinType.java
@ -0,0 +1,48 @@
+package com.mfsys.constant;
+
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+public enum PinType {
+
+	ONE_TIME_PIN("OTP"),
+	REGISTRATION_VERIFY_PIN("REG"),
+	BENEFICIARY_VERIFY_PIN("BEN"),
+
+	FINANCIAL_TRANSACTION_PIN("FTP"),
+	LOAN_FINANCIAL_TRANSACTION_PIN("LTP"),
+	DEPOSIT_TRANSACTION_PIN("DTP"),
+	;
+	
+	private String code;
+	
+	private PinType(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return code;
+	}
+	
+	public static class Mapper {
+		private static final Map<String, PinType> mapper = new HashMap<String, PinType>();
+
+		public static PinType getPinType(String code) {
+			return mapper.get(code);
+		}
+
+		public static Set<String> getPinTypes() {
+			return Collections.unmodifiableSet(mapper.keySet());
+		}
+
+		static {
+			for (PinType pin : EnumSet.allOf(PinType.class)) {
+				mapper.put(pin.getCode(), pin);
+			}
+		}
+
+	}
+}
--- a/common/src/main/java/com/mfsys/constant/PropertyConstant.java
+++ b/common/src/main/java/com/mfsys/constant/PropertyConstant.java
@ -0,0 +1,5 @@
+package com.mfsys.constant;
+
+public interface PropertyConstant {
+
+}
--- a/common/src/main/java/com/mfsys/constant/TokenBypassURI.java
+++ b/common/src/main/java/com/mfsys/constant/TokenBypassURI.java
@ -0,0 +1,31 @@
+package com.mfsys.constant;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public interface TokenBypassURI {
+  List<String> URIs = new ArrayList<String>(Arrays.asList(
+          "/aconnect/signin",
+          "/aconnect/loginUser",
+          "/aconnect/transactions/accounttogl",
+          "/aconnect/account/miscDetails",
+          "/deposit/account/miscDetails",
+          "/aconnect/account/getAccountDetails",
+          "/aconnect/transactions/gltogls",
+          "/aconnect/deposit/authorizations",
+          "/aconnect/generalledger/authorizations",
+          "/aconnect/deposit/authorizations",
+
+          "/aconnect/deposit/transactions/cancel",
+          "/aconnect/generalledger/transactions/cancel",
+
+          "/aconnect/deposit/transactions/reversal",
+          "/aconnect/generalledger/transactions/reversal",
+
+          "/aconnect/deposit/transactions/rejection",
+          "/aconnect/generalledger/transactions/rejection",
+          "/aconnect/generate"
+
+    ));
+}
--- a/common/src/main/java/com/mfsys/constant/TransactionType.java
+++ b/common/src/main/java/com/mfsys/constant/TransactionType.java
@ -0,0 +1,9 @@
+package com.mfsys.constant;
+
+public interface TransactionType {
+
+	// TODO: Must be stored in DB
+	String ACCOUNT_TO_ACCOUNT_FUNDS_TRANSFER = "ATAFT";
+	String LOAN_ACCOUNT_FUNDS_TRANSFER = "LAFT";
+	String ACCOUNT_TO_WALLET_FUNDS_TRANSFER = "ATWFT";
+}
--- a/common/src/main/java/com/mfsys/controller/LoggerController.java
+++ b/common/src/main/java/com/mfsys/controller/LoggerController.java
@ -0,0 +1,28 @@
+package com.mfsys.controller;
+
+import com.mfsys.constant.LoggerURI;
+import com.mfsys.model.Logger;
+import com.mfsys.service.LoggerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@RestController
+public class LoggerController {
+  LoggerService loggerService;
+
+  @Autowired
+  LoggerController(LoggerService loggerService) {
+    this.loggerService = loggerService;
+  }
+
+  @GetMapping(LoggerURI.GET_LOGS_BY_DATES)
+  public List<Logger> findLogsBetweenDates(@RequestParam LocalDate fromDate, @RequestParam LocalDate toDate) {
+     return loggerService.findLogsBetweenDates(fromDate, toDate);
+  }
+
+}
--- a/common/src/main/java/com/mfsys/exception/ApplicationException.java
+++ b/common/src/main/java/com/mfsys/exception/ApplicationException.java
@ -0,0 +1,53 @@
+package com.mfsys.exception;
+
+import java.text.MessageFormat;
+
+public class ApplicationException extends RuntimeException{
+    private static final long serialVersionUID = 1L;
+    protected final String porOrgacode;
+    protected final String errorCode;
+    protected final Object[] arguments;
+    protected final Object[] IMMUTABLE_ZERO_LEN_ARRAY = new Object[0];
+    protected String errorDescription;
+
+    public ApplicationException(String porOrgacode, ErrorMessage errorCode, Object... arguments) {
+        this(porOrgacode, errorCode.getCode(), arguments);
+        this.errorDescription = errorCode.getDescription();
+    }
+
+    public ApplicationException(String porOrgacode, String errorCode, Object... arguments) {
+        this.porOrgacode = porOrgacode;
+        this.errorCode = errorCode;
+        this.arguments = arguments;
+    }
+
+    public ApplicationException(String porOrgacode, String errorCode, Throwable e) {
+        super(errorCode, e);
+        this.porOrgacode = porOrgacode;
+        this.errorCode = errorCode;
+        arguments = IMMUTABLE_ZERO_LEN_ARRAY;
+    }
+
+    public String getErrorCode() {
+        return errorCode;
+    }
+
+    public String getErrorDescription() {
+        if (errorDescription != null) {
+            return replacePlaceholders(errorDescription, arguments);
+        }
+        return null;
+    }
+
+    public Object[] getArguments() {
+        return arguments;
+    }
+
+    public String getPorOrgacode() {
+        return this.porOrgacode;
+    }
+
+    private String replacePlaceholders(String message, Object[] arguments) {
+        return MessageFormat.format(message, arguments);
+    }
+}
--- a/common/src/main/java/com/mfsys/exception/ApplicationExceptionMapper.java
+++ b/common/src/main/java/com/mfsys/exception/ApplicationExceptionMapper.java
@ -0,0 +1,155 @@
+package com.mfsys.exception;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.context.request.WebRequest;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+@ControllerAdvice
+public class ApplicationExceptionMapper {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationExceptionMapper.class);
+
+    // Handle generic exceptions
+    @ExceptionHandler(value = {Throwable.class})
+    protected ResponseEntity<GeneralError> handleConflict(Exception ex, WebRequest request) {
+        logExceptionStackTrace(ex);
+        return new ResponseEntity<GeneralError>(new GeneralError(ex.getMessage(), MDC.get("request_id")),
+                HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    // Handle Application-specific exceptions
+    @ExceptionHandler(value = {ApplicationException.class})
+    protected ResponseEntity<APIError> handleConflict(ApplicationException ex, WebRequest request) {
+        logExceptionStackTrace(ex);
+        return new ResponseEntity<APIError>(new APIError(ex.getErrorCode(), ex.getArguments(), ex.getLocalizedMessage(),
+                MDC.get("request_id")), HttpStatus.BAD_REQUEST);
+    }
+
+    // Handle DataIntegrityViolationException (duplicate entries, etc.)
+    @ExceptionHandler(value = {DataIntegrityViolationException.class})
+    protected ResponseEntity<APIError> handleDataIntegrityViolation(DataIntegrityViolationException ex, WebRequest request) {
+        logExceptionStackTrace(ex);
+
+        // Extract the root cause of the exception
+        String rootCauseMessage = ex.getRootCause() != null ? ex.getRootCause().getMessage() : ex.getMessage();
+        String errorCode;
+        HttpStatus status;
+        String message;
+
+        // Determine the type of Data Integrity Violation based on the root cause message
+        if (rootCauseMessage.contains("Duplicate entry")) {
+            // Handle duplicate entry constraint violations
+            errorCode = "DUPLICATE_ENTRY";
+            message = "Duplicate entry error: " + rootCauseMessage;
+            status = HttpStatus.CONFLICT; // 409 Conflict
+        } else if (rootCauseMessage.contains("not-null property")) {
+            // Handle not-null constraint violations
+            errorCode = "NOT_NULL_CONSTRAINT";
+            message = "Null value not allowed for the field: " + extractFieldName(rootCauseMessage);
+            status = HttpStatus.BAD_REQUEST; // 400 Bad Request
+        } else {
+            // Generic Data Integrity Violation
+            errorCode = "DATA_INTEGRITY_VIOLATION";
+            message = "Data integrity violation: " + rootCauseMessage;
+            status = HttpStatus.BAD_REQUEST; // 400 Bad Request
+        }
+
+        return new ResponseEntity<>(
+                new APIError(errorCode, new Object[] {}, message, MDC.get("request_id")),
+                status
+        );
+    }
+
+
+    // Handle RuntimeExceptions
+    @ExceptionHandler(value = {RuntimeException.class})
+    protected ResponseEntity<APIError> handleRuntimeException(RuntimeException ex, WebRequest request) {
+        logExceptionStackTrace(ex);
+
+        String message = "Runtime exception occurred: " + ex.getMessage();
+        return new ResponseEntity<>(new APIError(message, new Object[]{}, message, MDC.get("request_id")),
+                HttpStatus.INTERNAL_SERVER_ERROR);
+    }
+
+    // Utility method to extract field name from the root cause message
+    private String extractFieldName(String rootCauseMessage) {
+        // Example root cause message: "not-null property references a null or transient value: com.mfsys.cargoguard.auth.model.User.countryCode"
+        if (rootCauseMessage.contains(":")) {
+            return rootCauseMessage.substring(rootCauseMessage.lastIndexOf(":") + 1).trim();
+        }
+        return "Unknown field";
+    }
+
+
+    private void logExceptionStackTrace(Exception ex) {
+        ExceptionDAO exceptionDAO = ExceptionUtil.toExceptionDAO(ex);
+        LOGGER.error(exceptionDAO.getRequestId(), exceptionDAO.getExceptionArgs());
+    }
+
+    private static class GeneralError implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        private Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+        private String debugMessage;
+        private String trackingId;
+
+        public GeneralError(String debugMessage, String trackingId) {
+            this.debugMessage = debugMessage;
+            this.trackingId = trackingId;
+        }
+
+        public GeneralError() {}
+
+        public Timestamp getTimestamp() {
+            return timestamp;
+        }
+
+        public String getDebugMessage() {
+            return debugMessage;
+        }
+
+        public String getTrackingId() {
+            return trackingId;
+        }
+    }
+
+    public static class APIError extends GeneralError implements Serializable {
+
+        private static final long serialVersionUID = 1L;
+
+        private String errorCode;
+        private Object[] arguments;
+
+        public APIError(String errorCode, Object[] arguments, String debugMessage, String trackingId) {
+            super(debugMessage, trackingId);
+            this.errorCode = errorCode;
+            this.arguments = arguments;
+        }
+
+        public APIError(String errorCode, Object[] arguments) {
+            super();
+            this.errorCode = errorCode;
+            this.arguments = arguments;
+        }
+
+        public APIError() {}
+
+        public String getErrorCode() {
+            return errorCode;
+        }
+
+        public Object[] getArguments() {
+            return arguments;
+        }
+    }
+}
--- a/common/src/main/java/com/mfsys/exception/DecryptionException.java
+++ b/common/src/main/java/com/mfsys/exception/DecryptionException.java
@ -0,0 +1,11 @@
+package com.mfsys.exception;
+
+public class DecryptionException extends Exception{
+    public DecryptionException(String message) {
+        super(message);
+    }
+
+    public DecryptionException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}
--- a/common/src/main/java/com/mfsys/exception/DuplicateException.java
+++ b/common/src/main/java/com/mfsys/exception/DuplicateException.java
@ -0,0 +1,7 @@
+package com.mfsys.exception;
+
+public class DuplicateException extends ApplicationException {
+    public DuplicateException(ErrorMessage errCode){
+        super(null, errCode,null);
+    }
+}
--- a/common/src/main/java/com/mfsys/exception/ErrorMessage.java
+++ b/common/src/main/java/com/mfsys/exception/ErrorMessage.java
@ -0,0 +1,7 @@
+package com.mfsys.exception;
+
+public interface ErrorMessage {
+    public String getCode();
+
+    public String getDescription();
+}
--- a/common/src/main/java/com/mfsys/exception/ExceptionDAO.java
+++ b/common/src/main/java/com/mfsys/exception/ExceptionDAO.java
@ -0,0 +1,25 @@
+package com.mfsys.exception;
+
+public class ExceptionDAO {
+
+    private String requestId;
+    private Object[] exceptionArgs;
+
+
+    public ExceptionDAO(String requestId, Object... exceptionArgs) {
+        this.requestId = requestId;
+        this.exceptionArgs = exceptionArgs;
+    }
+
+
+    public String getRequestId() {
+        return requestId;
+    }
+
+
+    public Object[] getExceptionArgs() {
+        return exceptionArgs;
+    }
+
+
+}
--- a/common/src/main/java/com/mfsys/exception/ExceptionUtil.java
+++ b/common/src/main/java/com/mfsys/exception/ExceptionUtil.java
@ -0,0 +1,15 @@
+package com.mfsys.exception;
+
+import org.slf4j.MDC;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+public class ExceptionUtil {
+    public static final ExceptionDAO toExceptionDAO(Throwable e) {
+        StringWriter errors = new StringWriter();
+        e.printStackTrace(new PrintWriter(errors));
+        String err = errors.toString();
+        return new ExceptionDAO("restquestId={} , stacktrace={}", MDC.get("request_id"), err);
+    }
+}
--- a/common/src/main/java/com/mfsys/exception/ResourceNotFoundException.java
+++ b/common/src/main/java/com/mfsys/exception/ResourceNotFoundException.java
@ -0,0 +1,7 @@
+package com.mfsys.exception;
+
+public class ResourceNotFoundException extends ApplicationException {
+  public ResourceNotFoundException(String porOrgacode, ErrorMessage errCode){
+    super(porOrgacode, errCode);
+  }
+}
--- a/common/src/main/java/com/mfsys/filter/CORSResponseFilter.java
+++ b/common/src/main/java/com/mfsys/filter/CORSResponseFilter.java
@ -0,0 +1,215 @@
+package com.mfsys.filter;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+
+import com.mfsys.constant.FilterPriority;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ReadListener;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletInputStream;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletResponse;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+@Component
+@Order(FilterPriority.CORS)
+public class CORSResponseFilter extends OncePerRequestFilter {
+
+  @Override
+  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response,
+                                  final FilterChain filterChain) throws ServletException, IOException {
+
+    HttpServletRequest processedRequest = request;
+
+    if(request.getMethod().equals("POST") || request.getMethod().equals("PATCH")|| request.getMethod().equals("PUT")) {
+      if(request.getHeader("X-Encrypted") != null) {
+        processedRequest = getDataFromRequest(request);
+      } else {
+        // Even for non-encrypted requests, wrap to allow multiple reads
+        String contentType = request.getContentType();
+        if (contentType == null || !contentType.startsWith("multipart/")) {
+          processedRequest = new CachedBodyHttpServletRequest(request);
+        }
+      }
+    }
+
+    response.setHeader("Access-Control-Allow-Credentials", "true");
+    response.setHeader("Access-Control-Allow-Origin", "*");
+    response.setHeader("Access-Control-Allow-Headers", "*");
+    response.setHeader("Access-Control-Expose-Headers", "*");
+    response.setHeader("Access-Control-Allow-Methods", "GET, POST, PATCH, PUT, DELETE");
+
+    if (!(request.getMethod().equals("OPTIONS"))) {
+      filterChain.doFilter(processedRequest, response);
+    }
+  }
+
+  private Map<String, String> extractDataFromSecretKey(String secretKey) {
+    int firstInteger = Character.getNumericValue(secretKey.charAt(0));
+    int secondInteger = Character.getNumericValue(secretKey.charAt(1));
+
+    int key1Length = 16 + (firstInteger - 1) * 8;
+    String dataBeforeKey1 = secretKey.substring(2, 2 + secondInteger);
+    String key1 = secretKey.substring(2 + secondInteger, 2 + secondInteger + key1Length);
+    int totalLengthFromStart = 2 + secondInteger + key1Length;
+    String finalData = secretKey.substring(totalLengthFromStart);
+    finalData = dataBeforeKey1 + finalData;
+
+    int lastInteger = Character.getNumericValue(secretKey.charAt(secretKey.length() - 1));
+    int secondIntegerOffset = Character.getNumericValue(secretKey.charAt(secretKey.length() - 2));
+    int key2Length = 16 + (lastInteger - 1) * 8;
+    String skipLastTwo = secretKey.substring(0, secretKey.length() - 2);
+    String dataBeforeKey2 = skipLastTwo.substring(skipLastTwo.length() - secondIntegerOffset);
+    String skipCharatersTillKey2 = skipLastTwo.substring(0, skipLastTwo.length() - secondIntegerOffset);
+
+    String key2 = skipCharatersTillKey2.substring(skipCharatersTillKey2.length() - key2Length);
+    int totalLengthFromEND = 2 + secondIntegerOffset + key2Length;
+    finalData = finalData.substring(0, finalData.length() - totalLengthFromEND);
+    finalData = finalData + dataBeforeKey2;
+
+    Map<String, String> map = new HashMap<String, String>();
+    map.put("Key1", key1);
+    map.put("Key2", key2);
+    map.put("data", finalData);
+
+    return map;
+  }
+
+  private HttpServletRequest getDataFromRequest(HttpServletRequest request) throws IOException {
+    String contentType = request.getContentType();
+    if(contentType != null && contentType.contains("application/json")) {
+
+      // First, cache the original body
+      CachedBodyHttpServletRequest cachedRequest = new CachedBodyHttpServletRequest(request);
+
+      // Now read from the cached body (won't consume the original)
+      String requestBody = StreamUtils.copyToString(cachedRequest.getInputStream(), StandardCharsets.UTF_8);
+
+      String data = "";
+      try {
+        data = decrypt(new ObjectMapper().readTree(requestBody).get("data").asText());
+      } catch (Exception e) {
+        e.printStackTrace();
+        // If decryption fails, return the cached request with original body
+        return cachedRequest;
+      }
+
+      JsonNode jsonNode = new ObjectMapper().readTree(data);
+
+      // Create a new request wrapper with the decrypted data
+      final byte[] decryptedBodyBytes = jsonNode.toString().getBytes(StandardCharsets.UTF_8);
+
+      return new HttpServletRequestWrapper(cachedRequest) {
+        @Override
+        public ServletInputStream getInputStream() throws IOException {
+          return new ServletInputStreamImpl(new ByteArrayInputStream(decryptedBodyBytes));
+        }
+
+        @Override
+        public int getContentLength() {
+          return decryptedBodyBytes.length;
+        }
+
+        @Override
+        public long getContentLengthLong() {
+          return decryptedBodyBytes.length;
+        }
+      };
+    } else {
+      if (contentType == null || !contentType.startsWith("multipart/")) {
+        return new CachedBodyHttpServletRequest(request);
+      }
+      // For non-JSON content, just cache the body for multiple reads
+      return request;
+    }
+  }
+
+  private String decrypt(String encryptedInput) throws Exception {
+    Map<String, String> map = extractDataFromSecretKey(encryptedInput);
+
+    String key1 = map.get("Key1");
+    String Key2 = map.get("Key2");
+    String data = map.get("data");
+
+    Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+    SecretKeySpec keySpec = new SecretKeySpec(key1.getBytes(StandardCharsets.UTF_8), "AES");
+    IvParameterSpec ivSpec = new IvParameterSpec(Key2.getBytes(StandardCharsets.UTF_8));
+    cipher.init(Cipher.DECRYPT_MODE, keySpec, ivSpec);
+    byte[] decryptedBytes = cipher.doFinal(Base64.getDecoder().decode(data));
+    return new String(decryptedBytes, StandardCharsets.UTF_8);
+  }
+
+  // Reusable cached body request wrapper
+  private static class CachedBodyHttpServletRequest extends HttpServletRequestWrapper {
+    private final byte[] cachedBody;
+
+    public CachedBodyHttpServletRequest(HttpServletRequest request) throws IOException {
+      super(request);
+      this.cachedBody = StreamUtils.copyToByteArray(request.getInputStream());
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+      return new ServletInputStreamImpl(new ByteArrayInputStream(this.cachedBody));
+    }
+
+    @Override
+    public int getContentLength() {
+      return cachedBody.length;
+    }
+
+    @Override
+    public long getContentLengthLong() {
+      return cachedBody.length;
+    }
+  }
+
+  private static class ServletInputStreamImpl extends ServletInputStream {
+    private final InputStream inputStream;
+
+    public ServletInputStreamImpl(ByteArrayInputStream byteArrayInputStream) {
+      this.inputStream = byteArrayInputStream;
+    }
+
+    @Override
+    public boolean isFinished() {
+      try {
+        return inputStream.available() == 0;
+      } catch (IOException e) {
+        return true;
+      }
+    }
+
+    @Override
+    public boolean isReady() {
+      return true;
+    }
+
+    @Override
+    public void setReadListener(ReadListener readListener) {
+      // Do nothing
+    }
+
+    @Override
+    public int read() throws IOException {
+      return inputStream.read();
+    }
+  }
+}
--- a/common/src/main/java/com/mfsys/filter/LoggingFilter.java
+++ b/common/src/main/java/com/mfsys/filter/LoggingFilter.java
@ -0,0 +1,95 @@
+package com.mfsys.filter;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.mfsys.constant.FilterPriority;
+import com.mfsys.model.Logger;
+import com.mfsys.repository.LoggerRepository;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
+
+@Component
+@Order(FilterPriority.LOGGING)
+public class LoggingFilter extends OncePerRequestFilter {
+
+    private final LoggerRepository loggerRepo;
+    private final ObjectMapper objectMapper;
+
+    @Autowired
+    public LoggingFilter(LoggerRepository loggerRepo) {
+        this.loggerRepo = loggerRepo;
+        this.objectMapper = new ObjectMapper();
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+            throws ServletException, IOException {
+
+        if ("OPTIONS".equalsIgnoreCase(request.getMethod())) {
+            filterChain.doFilter(request, response);
+            return;
+        }
+
+        // Read request body safely
+        String requestBody = getRequestBody(request);
+
+        // Save start time
+        LocalDateTime startTime = LocalDateTime.now();
+
+        // Continue request processing
+        filterChain.doFilter(request, response);
+
+        try {
+            Logger log = new Logger();
+            log.setDateTime(startTime);
+            log.setMethod(request.getMethod());
+            log.setRequestUri(request.getRequestURI());
+            log.setRequestBody(requestBody);
+            log.setRemoteIp(request.getRemoteAddr());
+            log.setResponseCode(response.getStatus());
+
+            // Try to extract userId from header or session
+            String userId = request.getHeader("X-USER-ID");
+            if (userId == null || userId.isEmpty()) {
+                userId = "ANONYMOUS";
+            }
+            log.setUserId(userId);
+
+            loggerRepo.save(log);
+        } catch (Exception e) {
+            System.err.println("Failed to save log: " + e.getMessage());
+            e.printStackTrace();
+        }
+    }
+
+    private String getRequestBody(HttpServletRequest request) {
+        try {
+            if (!("POST".equalsIgnoreCase(request.getMethod()) ||
+                    "PUT".equalsIgnoreCase(request.getMethod()) ||
+                    "PATCH".equalsIgnoreCase(request.getMethod()))) {
+                return "{}";
+            }
+
+            int contentLength = request.getContentLength();
+            if (contentLength <= 0) {
+                return "{}";
+            }
+
+            String body = StreamUtils.copyToString(request.getInputStream(), StandardCharsets.UTF_8);
+            return (body != null && !body.trim().isEmpty()) ? body : "{}";
+
+        } catch (IOException e) {
+            return "Error reading request body: " + e.getMessage();
+        }
+    }
+}
--- a/common/src/main/java/com/mfsys/filter/RefreshToken.java
+++ b/common/src/main/java/com/mfsys/filter/RefreshToken.java
@ -0,0 +1,20 @@
+package com.mfsys.filter;
+
+public class RefreshToken {
+
+	private String token;
+
+	public RefreshToken(String token) {
+		super();
+		this.token = token;
+	}
+
+	public String getToken() {
+		return token;
+	}
+
+	public void setToken(String token) {
+		this.token = token;
+	}
+
+}
--- a/common/src/main/java/com/mfsys/filter/TokenAuthenticationFilter.java
+++ b/common/src/main/java/com/mfsys/filter/TokenAuthenticationFilter.java
@ -0,0 +1,69 @@
+package com.mfsys.filter;
+
+import java.io.IOException;
+import java.util.Objects;
+
+import com.mfsys.constant.TokenBypassURI;
+import com.mfsys.service.JwtService;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import com.mfsys.constant.FilterPriority;
+
+@Component
+@Order(FilterPriority.AUTHENTICATION)
+public class TokenAuthenticationFilter extends OncePerRequestFilter {
+
+  private JwtService jwtService;
+
+  @Autowired
+  public TokenAuthenticationFilter(JwtService jwtService) {
+    this.jwtService = jwtService;
+  }
+
+  @Override
+  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+    throws ServletException, IOException {
+    // TODO: For porOrga-change we Will removed it later
+    if (!(request.getMethod().equals("OPTIONS"))) {
+
+      System.out.println(">> " + request.getRequestURI() + " <<");
+//		TODO:
+      // important add all mconnect url in tokenbypass uri and remove this if
+      // condition or implement jwt in mconnect module
+      System.out.println(request.getHeaderNames());
+      if (!(TokenBypassURI.URIs.contains(request.getRequestURI()) || request.getRequestURI().startsWith("/MCONNECT/actuator"))) {
+        String token = parseJwt(request);
+        if (Objects.isNull(token)) {
+          response.setStatus(403);
+          return;
+        } else {
+          // String porOrgacode = request.getHeader(FormPropertyConst.POR_ORGACODE);
+          String userSubject = request.getHeader("userSubject");
+          if (!jwtService.validateToken(token,userSubject)) {
+            return;
+          }
+        }
+      }
+
+      filterChain.doFilter(request, response);
+    }
+  }
+
+  private String parseJwt(HttpServletRequest request) {
+    String headerAuth = request.getHeader("Authorization");
+    if (StringUtils.hasText(headerAuth) && headerAuth.startsWith("Bearer ")) {
+      return headerAuth.substring(7, headerAuth.length());
+    }
+    return null;
+  }
+
+}
--- a/common/src/main/java/com/mfsys/model/Logger.java
+++ b/common/src/main/java/com/mfsys/model/Logger.java
@ -0,0 +1,41 @@
+package com.mfsys.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "TBL_LOGS")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Logger {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "METHOD", nullable = false, length = 10)
+    private String method;
+
+    @Column(name = "REQUEST_URI", nullable = false, length = 200)
+    private String requestUri;
+
+    @Column(name = "REQUEST_BODY", length = 4000)
+    private String requestBody;
+
+    @Column(name = "REMOTE_IP", nullable = false, length = 50)
+    private String remoteIp;
+
+    @Column(name = "RESPONSE_CODE", nullable = false)
+    private Integer responseCode;
+
+    @Column(name = "DATE_TIME", nullable = false)
+    private LocalDateTime dateTime;
+
+    @Column(name = "USER_ID", nullable = false, length = 50)
+    private String userId;
+}
--- a/common/src/main/java/com/mfsys/repository/LoggerRepository.java
+++ b/common/src/main/java/com/mfsys/repository/LoggerRepository.java
@ -0,0 +1,13 @@
+package com.mfsys.repository;
+
+import com.mfsys.model.Logger;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Repository
+public interface LoggerRepository extends JpaRepository<Logger, Integer> {
+  List<Logger> findByDateTimeBetween(LocalDateTime fromDateTime, LocalDateTime toDateTime);
+}
--- a/common/src/main/java/com/mfsys/service/JwtService.java
+++ b/common/src/main/java/com/mfsys/service/JwtService.java
@ -0,0 +1,98 @@
+package com.mfsys.service;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.JwtException;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.security.Keys;
+import jakarta.xml.bind.DatatypeConverter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.crypto.SecretKey;
+import java.security.Key;
+import java.time.Instant;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.function.Function;
+
+@Service
+public class JwtService {
+
+    @Value("${app.jwtSecretKey}")
+    private String secret;
+
+    @Value("${app.jwtExpirationMs}")
+    private Long expiration;
+
+    @Value("${app.jwtMaxIdleMs}")
+    private Long refreshExpiration;
+
+    public String extractUsername(String token) {
+        return extractClaim(token, Claims::getSubject);
+    }
+
+    public Date extractExpiration(String token) {
+        return extractClaim(token, Claims::getExpiration);
+    }
+
+    public <T> T extractClaim(String token, Function<Claims, T> claimsResolver) {
+        final Claims claims = extractAllClaims(token);
+        return claimsResolver.apply(claims);
+    }
+
+    private Claims extractAllClaims(String token) {
+        try {
+            return Jwts.parser()
+                    .verifyWith((SecretKey) getSigningKey())
+                    .build()
+                    .parseSignedClaims(token)
+                    .getPayload();
+        } catch (JwtException e) {
+            throw new RuntimeException("Invalid JWT token", e);
+        }
+    }
+
+    private Boolean isTokenExpired(String token) {
+        return extractExpiration(token).before(new Date());
+    }
+
+    public String generateToken(String subject) {
+        Map<String, Object> claims = new HashMap<>();
+        return createToken(claims, subject, expiration);
+    }
+
+    public String generateRefreshToken(String subject) {
+        Map<String, Object> claims = new HashMap<>();
+        return createToken(claims, subject, refreshExpiration);
+    }
+
+    private String createToken(Map<String, Object> claims, String subject, Long expiration) {
+        Instant now = Instant.now();
+        return Jwts.builder()
+                .claims(claims)
+                .subject(subject)
+                .issuedAt(Date.from(now))
+                .expiration(Date.from(now.plusMillis(expiration)))
+                .signWith(getSigningKey())
+                .compact();
+    }
+
+    public Boolean validateToken(String token, String subject) {
+        final String username = extractUsername(token);
+        return (username.equals(subject) && !isTokenExpired(token));
+    }
+
+    public Boolean isTokenValid(String token) {
+        try {
+            return !isTokenExpired(token);
+        } catch (Exception e) {
+            return false;
+        }
+    }
+
+    private Key getSigningKey() {
+        byte[] keyBytes = DatatypeConverter.parseBase64Binary(secret);
+        return Keys.hmacShaKeyFor(keyBytes);
+    }
+}
--- a/common/src/main/java/com/mfsys/service/LoggerService.java
+++ b/common/src/main/java/com/mfsys/service/LoggerService.java
@ -0,0 +1,30 @@
+package com.mfsys.service;
+
+import com.mfsys.model.Logger;
+import com.mfsys.repository.LoggerRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.List;
+
+@Service
+public class LoggerService {
+  LoggerRepository loggerRepository;
+
+  @Autowired
+  public LoggerService(LoggerRepository loggerRepository) {
+    this.loggerRepository = loggerRepository;
+  }
+
+  public List<Logger> findLogsBetweenDates(LocalDate fromDate, LocalDate toDate) {
+    // Convert LocalDate to LocalDateTime (start of day to end of day)
+    LocalDateTime fromDateTime = fromDate.atStartOfDay();
+    LocalDateTime toDateTime = toDate.atTime(LocalTime.MAX);
+
+    return loggerRepository.findByDateTimeBetween(fromDateTime, toDateTime);
+  }
+
+}
--- a/common/src/main/java/com/mfsys/service/PasswordEncryptionService.java
+++ b/common/src/main/java/com/mfsys/service/PasswordEncryptionService.java
@ -0,0 +1,17 @@
+package com.mfsys.service;
+
+import org.mindrot.jbcrypt.BCrypt;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PasswordEncryptionService {
+
+  public String hashPassword(String plainPassword) {
+    return BCrypt.hashpw(plainPassword, BCrypt.gensalt(12));
+  }
+
+  public static boolean verifyPassword(String plainPassword, String hashedPassword) {
+    return BCrypt.checkpw(plainPassword, hashedPassword);
+  }
+
+}
--- a/common/src/main/java/com/mfsys/trust/CustomClaimsProperty.java
+++ b/common/src/main/java/com/mfsys/trust/CustomClaimsProperty.java
@ -0,0 +1,17 @@
+package com.mfsys.trust;
+
+public enum CustomClaimsProperty {
+
+	LAST_ACTIVE_TIME("lastActiveTime"), URLS("urls");
+
+	CustomClaimsProperty(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	private String code;
+
+}
--- a/common/src/main/java/com/mfsys/trust/DefaultUrl.java
+++ b/common/src/main/java/com/mfsys/trust/DefaultUrl.java
@ -0,0 +1,32 @@
+package com.mfsys.trust;
+
+import java.util.Collections;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class DefaultUrl implements Urls {
+
+	protected final List<String> urls;
+	protected final String type;
+
+	public DefaultUrl(@JsonProperty("urls") List<String> urls, @JsonProperty("type") String type) {
+		this.urls = createUrlList(urls);
+		this.type = type;
+	}
+
+	private List<String> createUrlList(List<String> urls) {
+		return Collections.unmodifiableList(urls);
+	}
+
+	@Override
+	public List<String> getUrls() {
+		return urls;
+	}
+
+	@Override
+	public String getType() {
+		return type;
+	}
+
+}
--- a/common/src/main/java/com/mfsys/trust/IncludeAllUrl.java
+++ b/common/src/main/java/com/mfsys/trust/IncludeAllUrl.java
@ -0,0 +1,11 @@
+package com.mfsys.trust;
+
+import java.util.Arrays;
+
+public final class IncludeAllUrl extends DefaultUrl {
+
+	public IncludeAllUrl() {
+		super(Arrays.asList("*"), UrlType.INCLUDE_ALL.getCode());
+	}
+
+}
--- a/common/src/main/java/com/mfsys/trust/JWTToken.java
+++ b/common/src/main/java/com/mfsys/trust/JWTToken.java
@ -0,0 +1,86 @@
+//package com.mfsys.trust;
+//
+//import java.security.Key;
+//import java.util.Date;
+//
+//import javax.crypto.spec.SecretKeySpec;
+//import jakarta.xml.bind.DatatypeConverter;
+//
+//import io.jsonwebtoken.Claims;
+//import io.jsonwebtoken.ExpiredJwtException;
+//import io.jsonwebtoken.JwtBuilder;
+//import io.jsonwebtoken.Jwts;
+//import io.jsonwebtoken.SignatureAlgorithm;
+//
+//public final class JWTToken {
+//
+//	// The JWT signature algorithm we will be using to sign the token
+//	// TODO KM Modify it to RSA algo
+//	private static SignatureAlgorithm signatureAlgorithm = SignatureAlgorithm.HS512;
+//
+//	private JWTToken() {
+//	}
+//
+//	public static String generateJWT(String id, String subject, String issuer, String secretKey, long expirationMs,
+//			String defaultUrl) {
+//
+//		// We will sign our JWT with our ApiKey secret
+//		byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(secretKey);
+//		Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
+//
+//		// Let's set the JWT Claims
+//		JwtBuilder builder = Jwts.builder().setId(id).setSubject(subject).setIssuer(issuer).setIssuedAt(new Date())
+//				.setExpiration(new Date((new Date()).getTime() + expirationMs))
+//				.claim(CustomClaimsProperty.LAST_ACTIVE_TIME.getCode(), new Date())
+//				.claim(CustomClaimsProperty.URLS.getCode(), defaultUrl).signWith(signatureAlgorithm, signingKey);
+//
+//		// Builds the JWT and serializes it to a compact, URL-safe string
+//		return builder.compact();
+//	}
+//
+//	public static String refreshJWT(String jwt, String id, String subject, long maxIdleTime, String issuer,
+//			String secretKey, long expirationMs) {
+//		try {
+//            Claims claims = Jwts.parser()
+//                    .setSigningKey(DatatypeConverter.parseBase64Binary(secretKey))
+//                    .build()
+//                    .parseSignedClaims(jwt)
+//                    .getPayload();
+//
+//            return generateJWT(id, subject, issuer, secretKey, expirationMs,
+//					claims.get(CustomClaimsProperty.URLS.getCode(), String.class));
+//		} catch (ExpiredJwtException e) {
+//			if (new Date().getTime() - e.getClaims().get(CustomClaimsProperty.LAST_ACTIVE_TIME.getCode(), Date.class)
+//					.getTime() > maxIdleTime) {
+//				throw e;
+//			} else {
+//				return generateJWT(id, subject, issuer, secretKey, expirationMs,
+//						e.getClaims().get(CustomClaimsProperty.URLS.getCode(), String.class));
+//			}
+//		}
+//	}
+//
+//	public static Claims parseJWT(String jwt, String secretKey) {
+//
+//		// This line will throw an exception if it is not a signed JWS (as expected)
+//		return Jwts.parser()
+//                .setSigningKey(DatatypeConverter.parseBase64Binary(secretKey))
+//                .build()
+//                .parseSignedClaims(jwt)
+//                .getPayload();
+//
+//	}
+//
+//	public static String updateLastActiveTime(String jwt, String secretKey) {
+//		byte[] apiKeySecretBytes = DatatypeConverter.parseBase64Binary(secretKey);
+//		Claims claims = Jwts.parser()
+//                .setSigningKey(DatatypeConverter.parseBase64Binary(secretKey))
+//                .build()
+//                .parseSignedClaims(jwt)
+//                .getPayload();
+//		claims.put(CustomClaimsProperty.LAST_ACTIVE_TIME.getCode(), new Date());
+//		Key signingKey = new SecretKeySpec(apiKeySecretBytes, signatureAlgorithm.getJcaName());
+//		return Jwts.builder().setClaims(claims).signWith(signatureAlgorithm, signingKey).compact();
+//	}
+//
+//}
--- a/common/src/main/java/com/mfsys/trust/UrlType.java
+++ b/common/src/main/java/com/mfsys/trust/UrlType.java
@ -0,0 +1,17 @@
+package com.mfsys.trust;
+
+public enum UrlType {
+	
+	INCLUDE("include"), EXCLUDE("exclude"), INCLUDE_ALL("includeAll");
+
+	UrlType(String code) {
+		this.code = code;
+	}
+
+	public String getCode() {
+		return this.code;
+	}
+
+	private String code;
+
+}
--- a/common/src/main/java/com/mfsys/trust/Urls.java
+++ b/common/src/main/java/com/mfsys/trust/Urls.java
@ -0,0 +1,8 @@
+package com.mfsys.trust;
+
+import java.util.List;
+
+public interface Urls {
+	public List<String> getUrls();
+	public String getType();
+}
--- a/common/src/main/java/com/mfsys/util/JSONUtil.java
+++ b/common/src/main/java/com/mfsys/util/JSONUtil.java
@ -0,0 +1,142 @@
+package com.mfsys.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonDeserializer;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.type.CollectionType;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.fasterxml.jackson.databind.Module;
+@Component
+public class JSONUtil {
+
+  protected final ObjectMapper mapper;
+
+  private JSONUtil(Module... modules) {
+    mapper = new ObjectMapper();
+    mapper.registerModules(modules);
+  }
+
+  public <T> List<T> convertJSONDataToList(InputStream inStream, Class<T> tClass) {
+    CollectionType listType = mapper.getTypeFactory().constructCollectionType(ArrayList.class, tClass);
+    try {
+      return mapper.readValue(inStream, listType);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public <T> List<T> convertJSONDataToList(String data, Class<T> tClass) {
+    CollectionType listType = mapper.getTypeFactory().constructCollectionType(ArrayList.class, tClass);
+    try {
+      return mapper.readValue(data, listType);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public <K, V> Map<K, V> convertJSONDataToMap(String data, TypeReference<? extends Map<K, V>> typeRef) {
+    try {
+      return mapper.readValue(data, typeRef);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public String toJsonString(Object o) {
+    try {
+      return mapper.writeValueAsString(o);
+    } catch (JsonProcessingException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  public <T> T toObject(String json, Class<T> c) {
+    try {
+      return mapper.readValue(json, c);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+
+  }
+
+  public <T> T toObject(Map<String, Object> map, Class<T> c) {
+    return mapper.convertValue(map, c);
+
+  }
+
+  public Map<String, Object> toHashMap(Object o) {
+    return mapper.convertValue(o, new TypeReference<HashMap<String, Object>>() {
+    });
+
+  }
+
+  public static JSONUtilBuilder custom() {
+    return new JSONUtilBuilder();
+  }
+
+  public static class JSONUtilBuilder {
+
+//		private static Map<Class<?>, JsonSerializer<Object>> serializer = new HashMap<>();
+//		private static Map<Class , JsonDeserializer<?>> deSerializer = new HashMap<>();
+
+    private List<Serializer> serializers = new ArrayList<>();
+    private List<Deserializer> deserializers = new ArrayList<>();
+
+    public JSONUtilBuilder() {
+
+    }
+
+    public <T> JSONUtilBuilder addSerializer(Class<T> c, JsonSerializer<T> obj) {
+      serializers.add(new Serializer<T>(c, obj));
+      return this;
+    }
+
+    public <T> JSONUtilBuilder addDeserializer(Class<T> c, JsonDeserializer<T> obj) {
+      deserializers.add(new Deserializer<T>(c, obj));
+      return this;
+    }
+
+    public JSONUtil build() {
+
+      final SimpleModule module = new SimpleModule();
+      serializers.forEach((k) -> module.addSerializer(k.serClass, k.serImpl));
+      deserializers.forEach((k) -> module.addDeserializer(k.deserClass, k.deserImpl));
+      return new JSONUtil(module, new JavaTimeModule());
+    }
+
+    private class Serializer<T> {
+
+      Class<T> serClass;
+      JsonSerializer<T> serImpl;
+
+      Serializer(Class<T> serClass, JsonSerializer<T> serImpl) {
+        this.serClass = serClass;
+        this.serImpl = serImpl;
+      }
+    }
+
+    private static class Deserializer<T> {
+      Class<T> deserClass;
+      JsonDeserializer<T> deserImpl;
+
+      Deserializer(Class<T> deserClass, JsonDeserializer<T> obj) {
+        this.deserClass = deserClass;
+        this.deserImpl = obj;
+      }
+    }
+
+  }
+
+}
--- a/common/src/main/resources/application.properties
+++ b/common/src/main/resources/application.properties
--- a/econnect/.gitattributes
+++ b/econnect/.gitattributes
@ -0,0 +1,2 @@
+/mvnw text eol=lf
+*.cmd text eol=crlf
--- a/econnect/.gitignore
+++ b/econnect/.gitignore
@ -0,0 +1,33 @@
+HELP.md
+target/
+.mvn/wrapper/maven-wrapper.jar
+!**/src/main/**/target/
+!**/src/test/**/target/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+build/
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### VS Code ###
+.vscode/
--- a/econnect/.mvn/wrapper/maven-wrapper.properties
+++ b/econnect/.mvn/wrapper/maven-wrapper.properties
@ -0,0 +1,2 @@
+distributionType=only-script
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
--- a/econnect/mvnw
+++ b/econnect/mvnw
@ -0,0 +1,295 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Apache Maven Wrapper startup batch script, version 3.3.3
+#
+# Optional ENV vars
+# -----------------
+#   JAVA_HOME - location of a JDK home dir, required when download maven via java source
+#   MVNW_REPOURL - repo url base for downloading maven distribution
+#   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+#   MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output
+# ----------------------------------------------------------------------------
+
+set -euf
+[ "${MVNW_VERBOSE-}" != debug ] || set -x
+
+# OS specific support.
+native_path() { printf %s\\n "$1"; }
+case "$(uname)" in
+CYGWIN* | MINGW*)
+  [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")"
+  native_path() { cygpath --path --windows "$1"; }
+  ;;
+esac
+
+# set JAVACMD and JAVACCMD
+set_java_home() {
+  # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched
+  if [ -n "${JAVA_HOME-}" ]; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ]; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+      JAVACCMD="$JAVA_HOME/jre/sh/javac"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+      JAVACCMD="$JAVA_HOME/bin/javac"
+
+      if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then
+        echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2
+        echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2
+        return 1
+      fi
+    fi
+  else
+    JAVACMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v java
+    )" || :
+    JAVACCMD="$(
+      'set' +e
+      'unset' -f command 2>/dev/null
+      'command' -v javac
+    )" || :
+
+    if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then
+      echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2
+      return 1
+    fi
+  fi
+}
+
+# hash string like Java String::hashCode
+hash_string() {
+  str="${1:-}" h=0
+  while [ -n "$str" ]; do
+    char="${str%"${str#?}"}"
+    h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296))
+    str="${str#?}"
+  done
+  printf %x\\n $h
+}
+
+verbose() { :; }
+[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; }
+
+die() {
+  printf %s\\n "$1" >&2
+  exit 1
+}
+
+trim() {
+  # MWRAPPER-139:
+  #   Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds.
+  #   Needed for removing poorly interpreted newline sequences when running in more
+  #   exotic environments such as mingw bash on Windows.
+  printf "%s" "${1}" | tr -d '[:space:]'
+}
+
+scriptDir="$(dirname "$0")"
+scriptName="$(basename "$0")"
+
+# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties
+while IFS="=" read -r key value; do
+  case "${key-}" in
+  distributionUrl) distributionUrl=$(trim "${value-}") ;;
+  distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;;
+  esac
+done <"$scriptDir/.mvn/wrapper/maven-wrapper.properties"
+[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+
+case "${distributionUrl##*/}" in
+maven-mvnd-*bin.*)
+  MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/
+  case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in
+  *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;;
+  :Darwin*x86_64) distributionPlatform=darwin-amd64 ;;
+  :Darwin*arm64) distributionPlatform=darwin-aarch64 ;;
+  :Linux*x86_64*) distributionPlatform=linux-amd64 ;;
+  *)
+    echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2
+    distributionPlatform=linux-amd64
+    ;;
+  esac
+  distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip"
+  ;;
+maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;;
+*) MVN_CMD="mvn${scriptName#mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;;
+esac
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}"
+distributionUrlName="${distributionUrl##*/}"
+distributionUrlNameMain="${distributionUrlName%.*}"
+distributionUrlNameMain="${distributionUrlNameMain%-bin}"
+MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}"
+MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")"
+
+exec_maven() {
+  unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || :
+  exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD"
+}
+
+if [ -d "$MAVEN_HOME" ]; then
+  verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  exec_maven "$@"
+fi
+
+case "${distributionUrl-}" in
+*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;;
+*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;;
+esac
+
+# prepare tmp dir
+if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then
+  clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; }
+  trap clean HUP INT TERM EXIT
+else
+  die "cannot create temp dir"
+fi
+
+mkdir -p -- "${MAVEN_HOME%/*}"
+
+# Download and Install Apache Maven
+verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+verbose "Downloading from: $distributionUrl"
+verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+# select .zip or .tar.gz
+if ! command -v unzip >/dev/null; then
+  distributionUrl="${distributionUrl%.zip}.tar.gz"
+  distributionUrlName="${distributionUrl##*/}"
+fi
+
+# verbose opt
+__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR=''
+[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v
+
+# normalize http auth
+case "${MVNW_PASSWORD:+has-password}" in
+'') MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;;
+esac
+
+if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then
+  verbose "Found wget ... using wget"
+  wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl"
+elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then
+  verbose "Found curl ... using curl"
+  curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl"
+elif set_java_home; then
+  verbose "Falling back to use Java to download"
+  javaSource="$TMP_DOWNLOAD_DIR/Downloader.java"
+  targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName"
+  cat >"$javaSource" <<-END
+	public class Downloader extends java.net.Authenticator
+	{
+	  protected java.net.PasswordAuthentication getPasswordAuthentication()
+	  {
+	    return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() );
+	  }
+	  public static void main( String[] args ) throws Exception
+	  {
+	    setDefault( new Downloader() );
+	    java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() );
+	  }
+	}
+	END
+  # For Cygwin/MinGW, switch paths to Windows format before running javac and java
+  verbose " - Compiling Downloader.java ..."
+  "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java"
+  verbose " - Running Downloader.java ..."
+  "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")"
+fi
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+if [ -n "${distributionSha256Sum-}" ]; then
+  distributionSha256Result=false
+  if [ "$MVN_CMD" = mvnd.sh ]; then
+    echo "Checksum validation is not supported for maven-mvnd." >&2
+    echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  elif command -v sha256sum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c - >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  elif command -v shasum >/dev/null; then
+    if echo "$distributionSha256Sum  $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then
+      distributionSha256Result=true
+    fi
+  else
+    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2
+    echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2
+    exit 1
+  fi
+  if [ $distributionSha256Result = false ]; then
+    echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2
+    echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2
+    exit 1
+  fi
+fi
+
+# unzip and move
+if command -v unzip >/dev/null; then
+  unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip"
+else
+  tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar"
+fi
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+actualDistributionDir=""
+
+# First try the expected directory name (for regular distributions)
+if [ -d "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" ]; then
+  if [ -f "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/bin/$MVN_CMD" ]; then
+    actualDistributionDir="$distributionUrlNameMain"
+  fi
+fi
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if [ -z "$actualDistributionDir" ]; then
+  # enable globbing to iterate over items
+  set +f
+  for dir in "$TMP_DOWNLOAD_DIR"/*; do
+    if [ -d "$dir" ]; then
+      if [ -f "$dir/bin/$MVN_CMD" ]; then
+        actualDistributionDir="$(basename "$dir")"
+        break
+      fi
+    fi
+  done
+  set -f
+fi
+
+if [ -z "$actualDistributionDir" ]; then
+  verbose "Contents of $TMP_DOWNLOAD_DIR:"
+  verbose "$(ls -la "$TMP_DOWNLOAD_DIR")"
+  die "Could not find Maven distribution directory in extracted archive"
+fi
+
+verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$actualDistributionDir/mvnw.url"
+mv -- "$TMP_DOWNLOAD_DIR/$actualDistributionDir" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME"
+
+clean || :
+exec_maven "$@"
--- a/econnect/mvnw.cmd
+++ b/econnect/mvnw.cmd
@ -0,0 +1,189 @@
+<# : batch portion
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Apache Maven Wrapper startup batch script, version 3.3.3
+@REM
+@REM Optional ENV vars
+@REM   MVNW_REPOURL - repo url base for downloading maven distribution
+@REM   MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven
+@REM   MVNW_VERBOSE - true: enable verbose log; others: silence the output
+@REM ----------------------------------------------------------------------------
+
+@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0)
+@SET __MVNW_CMD__=
+@SET __MVNW_ERROR__=
+@SET __MVNW_PSMODULEP_SAVE=%PSModulePath%
+@SET PSModulePath=
+@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @(
+  IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B)
+)
+@SET PSModulePath=%__MVNW_PSMODULEP_SAVE%
+@SET __MVNW_PSMODULEP_SAVE=
+@SET __MVNW_ARG0_NAME__=
+@SET MVNW_USERNAME=
+@SET MVNW_PASSWORD=
+@IF NOT "%__MVNW_CMD__%"=="" ("%__MVNW_CMD__%" %*)
+@echo Cannot start maven from wrapper >&2 && exit /b 1
+@GOTO :EOF
+: end batch / begin powershell #>
+
+$ErrorActionPreference = "Stop"
+if ($env:MVNW_VERBOSE -eq "true") {
+  $VerbosePreference = "Continue"
+}
+
+# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties
+$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl
+if (!$distributionUrl) {
+  Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties"
+}
+
+switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) {
+  "maven-mvnd-*" {
+    $USE_MVND = $true
+    $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip"
+    $MVN_CMD = "mvnd.cmd"
+    break
+  }
+  default {
+    $USE_MVND = $false
+    $MVN_CMD = $script -replace '^mvnw','mvn'
+    break
+  }
+}
+
+# apply MVNW_REPOURL and calculate MAVEN_HOME
+# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash>
+if ($env:MVNW_REPOURL) {
+  $MVNW_REPO_PATTERN = if ($USE_MVND -eq $False) { "/org/apache/maven/" } else { "/maven/mvnd/" }
+  $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace "^.*$MVNW_REPO_PATTERN",'')"
+}
+$distributionUrlName = $distributionUrl -replace '^.*/',''
+$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$',''
+
+$MAVEN_M2_PATH = "$HOME/.m2"
+if ($env:MAVEN_USER_HOME) {
+  $MAVEN_M2_PATH = "$env:MAVEN_USER_HOME"
+}
+
+if (-not (Test-Path -Path $MAVEN_M2_PATH)) {
+    New-Item -Path $MAVEN_M2_PATH -ItemType Directory | Out-Null
+}
+
+$MAVEN_WRAPPER_DISTS = $null
+if ((Get-Item $MAVEN_M2_PATH).Target[0] -eq $null) {
+  $MAVEN_WRAPPER_DISTS = "$MAVEN_M2_PATH/wrapper/dists"
+} else {
+  $MAVEN_WRAPPER_DISTS = (Get-Item $MAVEN_M2_PATH).Target[0] + "/wrapper/dists"
+}
+
+$MAVEN_HOME_PARENT = "$MAVEN_WRAPPER_DISTS/$distributionUrlNameMain"
+$MAVEN_HOME_NAME = ([System.Security.Cryptography.SHA256]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join ''
+$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME"
+
+if (Test-Path -Path "$MAVEN_HOME" -PathType Container) {
+  Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME"
+  Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
+  exit $?
+}
+
+if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) {
+  Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl"
+}
+
+# prepare tmp dir
+$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile
+$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir"
+$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null
+trap {
+  if ($TMP_DOWNLOAD_DIR.Exists) {
+    try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+    catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+  }
+}
+
+New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null
+
+# Download and Install Apache Maven
+Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..."
+Write-Verbose "Downloading from: $distributionUrl"
+Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName"
+
+$webclient = New-Object System.Net.WebClient
+if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) {
+  $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD)
+}
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null
+
+# If specified, validate the SHA-256 sum of the Maven distribution zip file
+$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum
+if ($distributionSha256Sum) {
+  if ($USE_MVND) {
+    Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties."
+  }
+  Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash
+  if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) {
+    Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property."
+  }
+}
+
+# unzip and move
+Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null
+
+# Find the actual extracted directory name (handles snapshots where filename != directory name)
+$actualDistributionDir = ""
+
+# First try the expected directory name (for regular distributions)
+$expectedPath = Join-Path "$TMP_DOWNLOAD_DIR" "$distributionUrlNameMain"
+$expectedMvnPath = Join-Path "$expectedPath" "bin/$MVN_CMD"
+if ((Test-Path -Path $expectedPath -PathType Container) -and (Test-Path -Path $expectedMvnPath -PathType Leaf)) {
+  $actualDistributionDir = $distributionUrlNameMain
+}
+
+# If not found, search for any directory with the Maven executable (for snapshots)
+if (!$actualDistributionDir) {
+  Get-ChildItem -Path "$TMP_DOWNLOAD_DIR" -Directory | ForEach-Object {
+    $testPath = Join-Path $_.FullName "bin/$MVN_CMD"
+    if (Test-Path -Path $testPath -PathType Leaf) {
+      $actualDistributionDir = $_.Name
+    }
+  }
+}
+
+if (!$actualDistributionDir) {
+  Write-Error "Could not find Maven distribution directory in extracted archive"
+}
+
+Write-Verbose "Found extracted Maven distribution directory: $actualDistributionDir"
+Rename-Item -Path "$TMP_DOWNLOAD_DIR/$actualDistributionDir" -NewName $MAVEN_HOME_NAME | Out-Null
+try {
+  Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null
+} catch {
+  if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) {
+    Write-Error "fail to move MAVEN_HOME"
+  }
+} finally {
+  try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null }
+  catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" }
+}
+
+Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD"
--- a/econnect/pom.xml
+++ b/econnect/pom.xml
@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.mfsys</groupId>
+        <artifactId>parent</artifactId>
+        <version>0.0.1</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <groupId>com.mfsys</groupId>
+    <artifactId>aconnect</artifactId>
+    <version>0.0.1</version>
+    <packaging>war</packaging>
+    <name>aconnect</name>
+    <description>Middleware Application</description>
+
+    <properties>
+        <java.version>21</java.version>
+    </properties>
+
+    <dependencies>
+        <!-- Spring Boot Starters -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-batch</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-webflux</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
+        <!-- Database -->
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- Tomcat (external deployment) -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-tomcat</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- JWT -->
+<!--        <dependency>-->
+<!--            <groupId>io.jsonwebtoken</groupId>-->
+<!--            <artifactId>jjwt-api</artifactId>-->
+<!--            <version>0.12.3</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.jsonwebtoken</groupId>-->
+<!--            <artifactId>jjwt-impl</artifactId>-->
+<!--            <version>0.12.3</version>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>io.jsonwebtoken</groupId>-->
+<!--            <artifactId>jjwt-jackson</artifactId>-->
+<!--            <version>0.12.3</version>-->
+<!--            <scope>runtime</scope>-->
+<!--        </dependency>-->
+
+        <!-- Testing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.batch</groupId>
+            <artifactId>spring-batch-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <!-- Internal common module -->
+        <dependency>
+            <groupId>com.mfsys</groupId>
+            <artifactId>common</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <!-- Optional Spring Context -->
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.13.0</version>
+                <configuration>
+                    <source>21</source>
+                    <target>21</target>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>1.18.34</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- Maven Environment Profiles -->
+    <profiles>
+
+        <!-- Development -->
+        <profile>
+            <id>dev</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <spring.profiles.active>dev</spring.profiles.active>
+            </properties>
+            <build>
+                <finalName>aconnect-dev</finalName>
+            </build>
+        </profile>
+
+        <!-- UAT -->
+        <profile>
+            <id>uat</id>
+            <properties>
+                <spring.profiles.active>uat</spring.profiles.active>
+            </properties>
+            <build>
+                <finalName>aconnect-uat</finalName>
+            </build>
+        </profile>
+
+        <!-- Live / Production -->
+        <profile>
+            <id>live</id>
+            <properties>
+                <spring.profiles.active>live</spring.profiles.active>
+            </properties>
+            <build>
+                <finalName>aconnect</finalName>
+            </build>
+        </profile>
+
+    </profiles>
+
+</project>
--- a/econnect/src/main/java/com/mfsys/aconnect/AconnectApplication.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/AconnectApplication.java
@ -0,0 +1,29 @@
+package com.mfsys.aconnect;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@EnableScheduling
+@SpringBootApplication(scanBasePackages = {"com.mfsys"})
+@EntityScan(basePackages = {"com.mfsys"})
+@EnableJpaRepositories({"com.mfsys"})
+public class AconnectApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AconnectApplication.class, args);
+	}
+  @Value("${app.base.uri}")
+  private String baseUri;
+
+  @Bean
+  public WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> webServerFactoryCustomizer() {
+    return factory -> factory.setContextPath("/" + baseUri);
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/ServletInitializer.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/ServletInitializer.java
@ -0,0 +1,13 @@
+package com.mfsys.aconnect;
+
+import org.springframework.boot.builder.SpringApplicationBuilder;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+public class ServletInitializer extends SpringBootServletInitializer {
+
+	@Override
+	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+		return application.sources(AconnectApplication.class);
+	}
+
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/controller/LoginController.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/controller/LoginController.java
@ -0,0 +1,39 @@
+package com.mfsys.aconnect.client.controller;
+
+import com.mfsys.aconnect.client.dto.SigninRequest;
+import com.mfsys.aconnect.client.service.LoginService;
+import com.mfsys.constant.AconnectURI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+@RestController
+public class LoginController {
+
+    LoginService loginService;
+
+    @Autowired
+    public LoginController(LoginService loginService) {
+        this.loginService = loginService;
+    }
+
+    @PostMapping(AconnectURI.SIGNIN)
+    public ResponseEntity<Map<String, Object>> login(@RequestBody(required = false) SigninRequest login) {
+        if (login == null) {
+            return ResponseEntity.badRequest().body(Map.of("error", "Request body is missing"));
+        }
+
+        Map<String, String> payload = Map.of(
+                "username", login.getUsername(),
+                "password", login.getPassword()
+        );
+
+        Map<String, Object> response = loginService.authenticate(payload);
+        return ResponseEntity.ok(response);
+    }
+
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/controller/TransactionController.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/controller/TransactionController.java
@ -0,0 +1,96 @@
+package com.mfsys.aconnect.client.controller;
+
+import com.mfsys.aconnect.client.dto.*;
+import com.mfsys.aconnect.client.service.TransactionService;
+import com.mfsys.constant.AconnectURI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+
+@RestController
+public class TransactionController {
+
+    @Autowired
+    private TransactionService transactionService;
+
+    @Autowired
+    public TransactionController(TransactionService transactionService) {
+        this.transactionService = transactionService;
+    }
+
+    @GetMapping("/account/getAccountDetails")
+    public ResponseEntity activeAccountDetails(
+            @RequestParam("porOrgacode") String porOrgacode,
+            @RequestParam("mbmBkmsnumber") String mbmBkmsnumber,
+            @RequestParam(required = false)
+            @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate sgtGntrvaluedate,
+            @RequestHeader("Authorization") String token,
+            @RequestHeader("SUS_USERCODE") String userCode) {
+
+        return transactionService.getActiveAccountDetails(porOrgacode, mbmBkmsnumber, sgtGntrvaluedate, token, userCode);
+    }
+
+    @PostMapping(AconnectURI.TRANSACTION_ACCOUNT_GL_URI)
+    public Object accountGLTransaction(@RequestBody AccountGLTransactionRequest request,
+                                       @RequestHeader("Authorization") String token) {
+        return transactionService.processAccountTransaction(request, token);
+    }
+
+    @PostMapping(AconnectURI.TRANSACTION_GL_GL_URI)
+    public Object glGlTransaction(@RequestBody GLtoGLRequest request,
+                                  @RequestHeader("Authorization") String token) {
+        return transactionService.processGLTransaction(request, token);
+    }
+
+    @PostMapping(AconnectURI.DEPOSIT_AUTHORIZATION_URI)
+    public Object depositAuthorizationTransaction(@RequestBody DepositAuthorizationRequest authorizationRequest,
+                                             @RequestHeader("Authorization") String token) {
+        return transactionService.processDepositAuthTransaction(authorizationRequest, token);
+    }
+
+    @PostMapping(AconnectURI.GENERALLEDGER_AUTHORIZATION_URI)
+    public Object glAuthorizationTransaction(@RequestBody GLAuthorizationDTO glAuthorizationRequest,
+                                             @RequestHeader("Authorization") String token) {
+        return transactionService.processGLAuthTransaction(glAuthorizationRequest, token);
+    }
+
+    @PostMapping(AconnectURI.DEPOSIT_CANCELLATION_URI)
+    public Object depositCancellationTransaction(@RequestBody DepositCancellationDTO depositCancellationDTO,
+                                                 @RequestHeader("Authorization") String token) {
+        return transactionService.processDepositCancellationTransaction(depositCancellationDTO, token);
+    }
+
+    @PostMapping(AconnectURI.GENERALLEDGER_CANCELLATION_URI)
+    public Object glCancellationTransaction(@RequestBody GLCancellationDTO glCancellationRequest,
+                                            @RequestHeader("Authorization") String token) {
+        return transactionService.processGLCancellationTransaction(glCancellationRequest, token);
+    }
+
+    @PostMapping(AconnectURI.DEPOSIT_TRANSACTION_REVERSAL_URI)
+    public Object depositReversalTransaction(@RequestBody DepositReversalDTO depositReversalDTO,
+                                        @RequestHeader("Authorization") String token) {
+        return transactionService.processDepositReversalTransaction(depositReversalDTO, token);
+    }
+
+    @PostMapping(AconnectURI.GENERALLEDGER_TRANSACTION_REVERSAL_URI)
+    public Object glReversalTransaction(@RequestBody GLReversalDTO glReversalRequest,
+                                        @RequestHeader("Authorization") String token) {
+        return transactionService.processGLReversalTransaction(glReversalRequest, token);
+    }
+
+    @PostMapping(AconnectURI.DEPOSIT_TRANSACTION_REJECT_URI)
+    public Object depositRejectionTransaction(@RequestBody DepositRejectDTO rejectRequest,
+                                         @RequestHeader("Authorization") String token) {
+        return transactionService.processDepositRejectionTransaction(rejectRequest, token);
+    }
+
+    @PostMapping(AconnectURI.GENERALLEDGER_TRANSACTION_REJECT_URI)
+    public Object glRejectionTransaction(@RequestBody DepositRejectDTO rejectRequest,
+                                         @RequestHeader("Authorization") String token) {
+        return transactionService.processGLRejectionTransaction(rejectRequest, token);
+    }
+
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/AccountGLTransactionRequest.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/AccountGLTransactionRequest.java
@ -0,0 +1,39 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class AccountGLTransactionRequest {
+
+    private AdditionalInfo additionalInfo;
+    private CreditGl creditGl;
+    private DebitAcc debitAcc;
+
+    private String plcLocacode;
+    private String porOrgacode;
+    private String ppmPymdcode;
+    private String sgtGntrcreateusr;
+    private String sgtGntrnarration;
+    private String sgtGntrvaluedate;
+
+    @Data
+    public static class AdditionalInfo {
+        private Boolean sgtRemittancetrans;
+        private String sgtTrandate;
+    }
+
+    @Data
+    public static class CreditGl {
+        private String pcaGlaccode;
+        private String plcLocacode;
+        private Double sgtGntramtfc;
+    }
+
+    @Data
+    public static class DebitAcc {
+        private String mbmBkmsnumber;
+        private String pitInstcode;
+        private Double sgtGntramtfc;
+        private String sgtGntrinstrumentno;
+    }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositAuthorizationRequest.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositAuthorizationRequest.java
@ -0,0 +1,12 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DepositAuthorizationRequest {
+    private List<TranDetail> tranDetailList;
+    private String porOrgacode;
+    private String susUsercode;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositCancellationDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositCancellationDTO.java
@ -0,0 +1,12 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class DepositCancellationDTO {
+    private String sgtGntrtranlink;
+    private String nodeId;
+    private String sgtGntrnarration;
+    private String porOrgacode;
+    private String susUsercode;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositRejectDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositRejectDTO.java
@ -0,0 +1,12 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DepositRejectDTO {
+    private List<TranDetail> tranDetailList;
+    private String porOrgacode;
+    private String susUsercode;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositReversalDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/DepositReversalDTO.java
@ -0,0 +1,11 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class DepositReversalDTO {
+    private String porOrgacode;
+    private String susUsercode;
+    private String nodeId;
+    private String sgtGntrtranlink;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLAuthorizationDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLAuthorizationDTO.java
@ -0,0 +1,12 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GLAuthorizationDTO {
+    private List<TranDetail> tranDetailList;
+    private String porOrgacode;
+    private String susUsercode;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLCancellationDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLCancellationDTO.java
@ -0,0 +1,12 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class GLCancellationDTO {
+    private String sgtGntrtranlink;
+    private String nodeId;
+    private String sgtGntrnarration;
+    private String porOrgacode;
+    private String susUsercode;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLRejectDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLRejectDTO.java
@ -0,0 +1,12 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GLRejectDTO {
+    private List<TranDetail> tranDetailList;
+    private String porOrgacode;
+    private String susUsercode;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLReversalDTO.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLReversalDTO.java
@ -0,0 +1,11 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class GLReversalDTO {
+    private String porOrgacode;
+    private String susUsercode;
+    private String nodeId;
+    private String sgtGntrtranlink;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLtoGLRequest.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/GLtoGLRequest.java
@ -0,0 +1,37 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class GLtoGLRequest {
+    private GLtoGLRequest.AdditionalInfo additionalInfo;
+    private GLtoGLRequest.CreditGl creditGl;
+    private GLtoGLRequest.DebitGl debitGl;
+
+    private String plcLocacode;
+    private String porOrgacode;
+    private String ppmPymdcode;
+    private String sgtGntrcreateusr;
+    private String sgtGntrnarration;
+    private String sgtGntrvaluedate;
+
+    @Data
+    public static class AdditionalInfo {
+        private Boolean sgtRemittancetrans;
+        private String sgtTrandate;
+    }
+
+    @Data
+    public static class CreditGl {
+        private String pcaGlaccode;
+        private String plcLocacode;
+        private Double sgtGntramtfc;
+    }
+
+    @Data
+    public static class DebitGl {
+        private String pcaGlaccode;
+        private String plcLocacode;
+        private Double sgtGntramtfc;
+    }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/SigninRequest.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/SigninRequest.java
@ -0,0 +1,13 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SigninRequest {
+    private String username;
+    private String password;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/dto/TranDetail.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/dto/TranDetail.java
@ -0,0 +1,9 @@
+package com.mfsys.aconnect.client.dto;
+
+import lombok.Data;
+
+@Data
+public class TranDetail {
+    private String sgtGntrtranlink;
+    private String nodeId;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/service/EnvironmentDetectionService.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/service/EnvironmentDetectionService.java
@ -0,0 +1,60 @@
+package com.mfsys.aconnect.client.service;
+
+import org.springframework.core.env.Environment;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class EnvironmentDetectionService {
+
+    @Autowired
+    private Environment environment;
+
+    public String detectEnvironmentFromUsername(String username) {
+        // Check if user has specific environment mapping
+        String userEnvironment = environment.getProperty("app.user." + username + ".environment");
+
+        if (userEnvironment != null) {
+            return userEnvironment;
+        }
+
+        // Default environment if user not mapped
+        return environment.getProperty("app.environment.default", "dev");
+    }
+
+    public String getSecurityUriForEnvironment(String environmentType) {
+        // Get security URI for the detected environment
+        String securityUri = environment.getProperty("app.environment." + environmentType + ".securityUri");
+
+        if (securityUri != null) {
+            return securityUri;
+        }
+
+        // Fallback to default
+        return environment.getProperty("app.security.uri.default",
+                "http://localhost:9090/security/auth/user");
+    }
+
+    public String getSecurityUriForUser(String username) {
+        String userEnvironment = detectEnvironmentFromUsername(username);
+        return getSecurityUriForEnvironment(userEnvironment);
+    }
+
+    public boolean isUserMapped(String username) {
+        return environment.getProperty("app.user." + username + ".environment") != null;
+    }
+
+    public Map<String, String> getUserEnvironmentInfo(String username) {
+        String environment = detectEnvironmentFromUsername(username);
+        String securityUri = getSecurityUriForEnvironment(environment);
+
+        return Map.of(
+                "username", username,
+                "environment", environment,
+                "securityUri", securityUri,
+                "isMapped", String.valueOf(isUserMapped(username))
+        );
+    }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/service/LoginService.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/service/LoginService.java
@ -0,0 +1,78 @@
+package com.mfsys.aconnect.client.service;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class LoginService {
+
+    @Value("${app.organization.uri}")
+    private String OrgaCode;
+
+    @Value("${app.security.uri}")
+    private String securityURI;
+
+    @Autowired
+    private EnvironmentDetectionService environmentDetectionService;
+
+    private final RestTemplate restTemplate = new RestTemplate();
+    private final ObjectMapper objectMapper = new ObjectMapper();
+
+    public Map<String, Object> authenticate(Map<String, String> payload) {
+        String username = payload.get("username");
+        String password = payload.get("password");
+
+//        // Detect environment and get security URI based on username
+//        String userEnvironment = environmentDetectionService.detectEnvironmentFromUsername(username);
+//        String securityUri = environmentDetectionService.getSecurityUriForUser(username);
+//        boolean isUserMapped = environmentDetectionService.isUserMapped(username);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("mobileLogin", "false");
+
+        Map<String, String> requestPayload = new HashMap<>(payload);
+        requestPayload.put("clientid", OrgaCode);
+        HttpEntity<Map<String, String>> request = new HttpEntity<>(requestPayload, headers);
+
+        try {
+//            System.out.println("=== Environment-Based Routing ===");
+//            System.out.println("Username: " + username);
+//            System.out.println("Detected Environment: " + userEnvironment);
+//            System.out.println("Security Service: " + securityUri);
+//            System.out.println("User Explicitly Mapped: " + isUserMapped);
+
+            ResponseEntity<String> response = restTemplate.postForEntity(securityURI, request, String.class);
+            JsonNode jsonNode = objectMapper.readTree(response.getBody());
+
+            Map<String, Object> result = new HashMap<>();
+            result.put("authenticated", jsonNode.get("authenticated").asBoolean());
+            result.put("token", jsonNode.get("token").asText());
+            result.put("userName", jsonNode.get("userName").asText());
+//            result.put("securityServiceUsed", securityUri);
+//            result.put("userEnvironment", userEnvironment);
+//            result.put("userExplicitlyMapped", isUserMapped);
+
+            return result;
+
+        } catch (Exception e) {
+//            System.err.println("Authentication failed for user: " + username);
+//            System.err.println("Environment: " + userEnvironment);
+//            System.err.println("Security Service: " + securityUri);
+//            System.err.println("Error: " + e.getMessage());
+
+            return Map.of(
+                    "authenticated", false,
+                    "error", "Authentication failed: " + e.getMessage()
+            );
+        }
+    }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/client/service/TransactionService.java
@ -0,0 +1,298 @@
+package com.mfsys.aconnect.client.service;
+
+import com.mfsys.aconnect.client.dto.*;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+import org.springframework.http.HttpHeaders;
+import java.time.LocalDate;
+import java.util.Map;
+
+
+import static com.mfsys.constant.AconnectURI.DEPOSIT_CIIHIVE_ACCOUNT_MISCELLANEOUS_DETAILS_URI;
+
+
+@Service
+public class TransactionService {
+
+    @Value("${app.deposit.uri}")
+    private String depositURI;
+
+    @Value("${app.generalledger.uri}")
+    private String generalledgerURI;
+
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    public ResponseEntity getActiveAccountDetails(String porOrgacode, String mbmBkmsnumber, LocalDate sgtGntrvaluedate, String tokenHeader, String userCode) {
+
+        String url = depositURI + DEPOSIT_CIIHIVE_ACCOUNT_MISCELLANEOUS_DETAILS_URI + "?porOrgacode=" + porOrgacode + "&mbmBkmsnumber=" + mbmBkmsnumber;
+        if (sgtGntrvaluedate != null) {
+            url += "&sgtGntrvaluedate=" + sgtGntrvaluedate;
+        }
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", userCode);
+        headers.setAccept(java.util.List.of(MediaType.APPLICATION_JSON));
+
+        HttpEntity<Void> entity = new HttpEntity<>(headers);
+        ResponseEntity<Map> response = restTemplate.exchange(url,HttpMethod.GET,entity,Map.class);
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+
+    public ResponseEntity processAccountTransaction(AccountGLTransactionRequest accountGLTransactionRequest, String tokenHeader) {
+        Double creditAmount = accountGLTransactionRequest.getCreditGl().getSgtGntramtfc();
+        Double debitAmount = accountGLTransactionRequest.getDebitAcc().getSgtGntramtfc();
+
+        if (!creditAmount.equals(debitAmount)) {
+            return ResponseEntity
+                    .badRequest()
+                    .body("Credit and Debit amounts must be equal");
+        }
+
+        String porOrgacode  = accountGLTransactionRequest.getPorOrgacode();
+        String url = depositURI + "/deposit/" + "/organizations/" + porOrgacode + "/transactions/accounttogls";
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", accountGLTransactionRequest.getSgtGntrcreateusr());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setAccept(java.util.List.of(MediaType.APPLICATION_JSON));
+        HttpEntity<AccountGLTransactionRequest> entity = new HttpEntity<>(accountGLTransactionRequest, headers);
+
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processGLTransaction(GLtoGLRequest gLtoGLRequest, String tokenHeader) {
+        Double creditAmount = gLtoGLRequest.getCreditGl().getSgtGntramtfc();
+        Double debitAmount = gLtoGLRequest.getDebitGl().getSgtGntramtfc();
+
+        if (!creditAmount.equals(debitAmount)) {
+            return ResponseEntity
+                    .badRequest()
+                    .body("Credit and Debit amounts must be equal");
+        }
+        String porOrgacode  = gLtoGLRequest.getPorOrgacode();
+        String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions/gltogls";
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", gLtoGLRequest.getSgtGntrcreateusr());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setAccept(java.util.List.of(MediaType.APPLICATION_JSON));
+        HttpEntity<GLtoGLRequest> entity = new HttpEntity<>(gLtoGLRequest, headers);
+
+        RestTemplate restTemplate = new RestTemplate();
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+    public Object processDepositAuthTransaction(DepositAuthorizationRequest authorizationRequest, String tokenHeader) {
+        String porOrgacode  = authorizationRequest.getPorOrgacode();
+        String url = depositURI + "/deposit/" + "/organizations/" + porOrgacode + "/transactions/authorizations";
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", authorizationRequest.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.setAccept(java.util.List.of(MediaType.APPLICATION_JSON));
+
+        HttpEntity<DepositAuthorizationRequest> entity = new HttpEntity<>(authorizationRequest, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processGLAuthTransaction(GLAuthorizationDTO authorizationRequest, String tokenHeader) {
+        String porOrgacode  = authorizationRequest.getPorOrgacode();
+        String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions/authorizations";
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", authorizationRequest.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<GLAuthorizationDTO> entity = new HttpEntity<>(authorizationRequest, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processDepositReversalTransaction(DepositReversalDTO reversalRequest, String tokenHeader) {
+        String porOrgacode  = reversalRequest.getPorOrgacode();
+        String nodeID  = reversalRequest.getNodeId();
+        String sgtGntrtranlink  = reversalRequest.getSgtGntrtranlink();
+        String url = depositURI + "/deposit/" + "/organizations/" + porOrgacode + "/transactions/reversals/nodes/" + nodeID + "/trannums/" + sgtGntrtranlink;
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", reversalRequest.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<DepositReversalDTO> entity = new HttpEntity<>(reversalRequest, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processGLReversalTransaction(GLReversalDTO reversalRequest, String tokenHeader) {
+        String porOrgacode  = reversalRequest.getPorOrgacode();
+        String nodeID  = reversalRequest.getNodeId();
+        String sgtGntrtranlink  = reversalRequest.getSgtGntrtranlink();
+
+        String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions/reversals/nodes/" + nodeID + "/trannums/" + sgtGntrtranlink;
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", reversalRequest.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<GLReversalDTO> entity = new HttpEntity<>(reversalRequest, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processDepositRejectionTransaction(DepositRejectDTO rejectRequest, String tokenHeader) {
+        String porOrgacode  = rejectRequest.getPorOrgacode();
+        String url = depositURI + "/deposit/" + "/organizations/" + porOrgacode + "/transactions/rejection";
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", rejectRequest.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<DepositRejectDTO> entity = new HttpEntity<>(rejectRequest, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processGLRejectionTransaction(DepositRejectDTO rejectRequest, String tokenHeader) {
+        String porOrgacode  = rejectRequest.getPorOrgacode();
+        String url = generalledgerURI + "/generalledger/" + "/organizations/" + porOrgacode + "/transactions/rejection";
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", rejectRequest.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<DepositRejectDTO> entity = new HttpEntity<>(rejectRequest, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+    public Object processDepositCancellationTransaction(DepositCancellationDTO depositCancellationDTO, String tokenHeader) {
+        String porOrgacode  = depositCancellationDTO.getPorOrgacode();
+        String url = depositURI + "/deposit/" + "/organizations/" + depositCancellationDTO.getPorOrgacode() +
+                "/transactions/cancel/nodes/" + depositCancellationDTO.getNodeId() +
+                "/trannums/" + depositCancellationDTO.getSgtGntrtranlink();
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", depositCancellationDTO.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<DepositCancellationDTO> entity = new HttpEntity<>(depositCancellationDTO, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+
+    public Object processGLCancellationTransaction(GLCancellationDTO glCancellationDTO, String tokenHeader) {
+        String porOrgacode  = glCancellationDTO.getPorOrgacode();
+        String url = generalledgerURI + "/generalledger/" + "/organizations/" + glCancellationDTO.getPorOrgacode() +
+                "/transactions/cancel/nodes/" + glCancellationDTO.getNodeId() +
+                "/trannums/" + glCancellationDTO.getSgtGntrtranlink();
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.set("Authorization", tokenHeader);
+        headers.set("POR_ORGACODE", porOrgacode);
+        headers.set("SUS_USERCODE", glCancellationDTO.getSusUsercode());
+        headers.setContentType(MediaType.APPLICATION_JSON);
+
+        HttpEntity<GLCancellationDTO> entity = new HttpEntity<>(glCancellationDTO, headers);
+        RestTemplate restTemplate = new RestTemplate();
+
+        ResponseEntity<Map> response = restTemplate.exchange(
+                url,
+                HttpMethod.POST,
+                entity,
+                Map.class
+        );
+
+        return ResponseEntity.status(response.getStatusCode()).body(response.getBody());
+    }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/configuration/config/SecurityConfig.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/configuration/config/SecurityConfig.java
@ -0,0 +1,25 @@
+package com.mfsys.aconnect.configuration.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+public class SecurityConfig {
+
+  @Bean
+  public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
+    System.out.println("✅ Custom SecurityFilterChain loaded");
+    http
+      .csrf(csrf -> csrf.disable()) // Disable CSRF for API use
+      .authorizeHttpRequests(auth -> auth
+        .anyRequest().permitAll() // Allow all requests
+      )
+      .httpBasic(Customizer.withDefaults()); // Optional — won't do anything since all requests are permitted
+
+    return http.build();
+  }
+
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/configuration/config/WebClientConfig.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/configuration/config/WebClientConfig.java
@ -0,0 +1,23 @@
+package com.mfsys.aconnect.configuration.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.client.WebClient;
+
+
+@Configuration
+public class WebClientConfig {
+
+  private final String baseUrl = "http://localhost:8080/digitalkisaan";
+
+  @Bean
+  public WebClient webClient(WebClient.Builder builder) {
+    return builder
+      .baseUrl(baseUrl) // Set the base URL for all requests
+      .defaultHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE) // Set a default content type
+      .defaultHeader(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE) // Set a default accept header
+      .build();
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/configuration/service/RequestRateLimiterService.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/configuration/service/RequestRateLimiterService.java
@ -0,0 +1,65 @@
+package com.mfsys.aconnect.configuration.service;
+
+import org.springframework.stereotype.Service;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+@Service
+public class RequestRateLimiterService {
+
+  private final ConcurrentHashMap<String, RateLimitData> requestCounts = new ConcurrentHashMap<>();
+
+  public boolean isRequestAllowed(String userId, String requestURI, int maxRequestsPerMinute) {
+    String key = userId + ":" + requestURI;
+    long currentTimeMillis = System.currentTimeMillis();
+
+    requestCounts.putIfAbsent(key, new RateLimitData(currentTimeMillis, 0));
+
+    RateLimitData data = requestCounts.get(key);
+
+    // Check if a minute has passed since the last reset
+    if (TimeUnit.MILLISECONDS.toMinutes(currentTimeMillis - data.getTimestamp()) >= 1) {
+      // Reset the counter if a minute has passed
+      data.setCount(1);
+      data.setTimestamp(currentTimeMillis);
+      return true;
+    } else {
+      // Increment and check the count
+      data.incrementCount();
+      if (data.getCount() > maxRequestsPerMinute) {
+        return false; // Request denied
+      }
+      return true; // Request allowed
+    }
+  }
+}
+
+class RateLimitData {
+  private long timestamp;
+  private int count;
+
+  public RateLimitData(long timestamp, int count) {
+    this.timestamp = timestamp;
+    this.count = count;
+  }
+
+  public long getTimestamp() {
+    return timestamp;
+  }
+
+  public void setTimestamp(long timestamp) {
+    this.timestamp = timestamp;
+  }
+
+  public int getCount() {
+    return count;
+  }
+
+  public void setCount(int count) {
+    this.count = count;
+  }
+
+  public void incrementCount() {
+    this.count++;
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/constant/SecurityURI.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/constant/SecurityURI.java
@ -0,0 +1,6 @@
+package com.mfsys.aconnect.security.constant;
+
+public interface SecurityURI {
+  String AUTHENTICATION = "/authentication";
+  String LOGIN = "/login";
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/controller/AuthenticationController.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/controller/AuthenticationController.java
@ -0,0 +1,35 @@
+package com.mfsys.aconnect.security.controller;
+
+import com.mfsys.aconnect.security.constant.SecurityURI;
+import com.mfsys.aconnect.security.dto.LoginRequest;
+import com.mfsys.aconnect.security.dto.LoginResponse;
+import com.mfsys.aconnect.security.service.AuthenticationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping(SecurityURI.AUTHENTICATION)
+public class AuthenticationController {
+
+  private final AuthenticationService authenticationService;
+
+  @Autowired
+  public AuthenticationController(AuthenticationService authenticationService) {
+    this.authenticationService = authenticationService;
+  }
+
+  @PostMapping(SecurityURI.LOGIN)
+  public ResponseEntity<LoginResponse> login(@RequestBody LoginRequest loginRequest) {
+    try {
+      LoginResponse response = authenticationService.login(loginRequest);
+      return ResponseEntity.ok(response);
+    } catch (RuntimeException e) {
+      return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+    }
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/controller/JwtTestController.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/controller/JwtTestController.java
@ -0,0 +1,30 @@
+package com.mfsys.aconnect.security.controller;
+
+import com.mfsys.service.JwtService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Base64;
+
+@RestController
+public class JwtTestController {
+
+    @Autowired
+    private JwtService jwtService;
+
+    // Example: http://localhost:8080/test/generate?username=testuser
+    // Example: http://localhost:8080/test/generate?username=testuser
+    @GetMapping("/generate")
+    public String generateToken(@RequestParam String username) {
+        return jwtService.generateToken(username);
+    }
+//    @PostMapping("/loginUser")
+//    public ResponseEntity<?> userAuthentication(@RequestBody UserManagement userManagement) throws Exception {
+//        System.out.println(userManagement.getUserId());
+//        byte[] decodedBytes = Base64.getDecoder().decode(userManagement.getUserPassword());
+//        String decodedString = new String(decodedBytes);
+//
+//        return userManagementService.userAuthentication(userManagement.getUserId(), decodedString,userManagement.getPorOrgacode());
+//    }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/dto/LoginRequest.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/dto/LoginRequest.java
@ -0,0 +1,13 @@
+package com.mfsys.aconnect.security.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginRequest {
+  private String userId;
+  private String password;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/dto/LoginResponse.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/dto/LoginResponse.java
@ -0,0 +1,16 @@
+package com.mfsys.aconnect.security.dto;
+
+import com.mfsys.aconnect.usermanagement.model.User;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoginResponse {
+  private User user;
+  private boolean requiresOtp;
+  private boolean requiresPasswordChange;
+  private String token;
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/model/OtpToken.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/model/OtpToken.java
@ -0,0 +1,48 @@
+package com.mfsys.aconnect.security.model;
+
+import com.mfsys.aconnect.usermanagement.model.User;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+
+import java.time.LocalDateTime;
+
+@Entity(name = "OTP_TOKENS")
+@Table(name = "OTP_TOKENS")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OtpToken {
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  private Long id;
+
+  @ManyToOne(fetch = FetchType.LAZY)
+  @JoinColumn(name = "user_id", nullable = false)
+  private User user;
+
+  @Column(nullable = false, length = 10)
+  private String token;
+
+  @Enumerated(EnumType.STRING)
+  @Column(name = "token_type", nullable = false)
+  private TokenType tokenType;
+
+  @Column(name = "is_used")
+  private Boolean isUsed = false;
+
+  @Column(name = "expires_at", nullable = false)
+  private LocalDateTime expiresAt;
+
+  @CreatedDate
+  @Column(name = "created_at")
+  private LocalDateTime createdAt;
+
+  public enum TokenType {
+    LOGIN,
+    PASSWORD_RESET,
+    EMAIL_VERIFICATION
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/service/AuthenticationService.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/service/AuthenticationService.java
@ -0,0 +1,42 @@
+package com.mfsys.aconnect.security.service;
+
+import com.mfsys.service.JwtService;
+import com.mfsys.service.PasswordEncryptionService;
+import com.mfsys.aconnect.security.dto.LoginRequest;
+import com.mfsys.aconnect.security.dto.LoginResponse;
+import com.mfsys.aconnect.usermanagement.model.User;
+import com.mfsys.aconnect.usermanagement.repository.UserRepository;
+import jakarta.transaction.Transactional;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AuthenticationService {
+
+  private final UserRepository userRepository;
+  private final JwtService jwtService;
+
+  @Autowired
+  public AuthenticationService (UserRepository userRepository, PasswordEncryptionService passwordEncryptionService,
+                                JwtService jwtService) {
+    this.userRepository = userRepository;
+    this.jwtService = jwtService;
+  }
+
+  @Transactional
+  public LoginResponse login(LoginRequest loginRequest) {
+    // Find user by email
+    User user = userRepository.findByUserIdAndIsActiveTrue(loginRequest.getUserId())
+      .orElseThrow(() -> new RuntimeException("Invalid credentials"));
+
+    // Verify password
+    if (!PasswordEncryptionService.verifyPassword(loginRequest.getPassword(), user.getPassword())) {
+      throw new RuntimeException("Invalid credentials");
+    }
+
+    String token = jwtService.generateToken(loginRequest.getUserId());
+
+    return new LoginResponse(user, false, user.getIsFirstLogin(), token);
+
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/security/service/OtpService.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/security/service/OtpService.java
@ -0,0 +1,7 @@
+package com.mfsys.aconnect.security.service;
+
+import org.springframework.stereotype.Service;
+
+@Service
+public class OtpService {
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/constant/UserManagementURI.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/constant/UserManagementURI.java
@ -0,0 +1,17 @@
+package com.mfsys.aconnect.usermanagement.constant;
+
+public interface UserManagementURI {
+  String USER = "/user";
+  String GET_USER = "/getUser";
+  String CREATE_USER = "/createUser";
+  String UPDATE_USER = "/updateUser";
+  String DELETE_USER = "/deleteUser";
+  String GET_ALL_USERS = "/getAllUsers";
+
+  String USER_SUBSCRIPTION = "/userSubscription";
+  String GET_USER_SUBSCRIPTION = "/getUserSubscription";
+  String CREATE_USER_SUBSCRIPTION = "/createUserSubscription";
+  String UPDATE_USER_SUBSCRIPTION = "/updateUserSubscription";
+  String DELETE_USER_SUBSCRIPTION = "/deleteUserSubscription";
+  String GET_ALL_USER_SUBSCRIPTIONS = "/getAllUserSubscriptions";
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/controller/UserController.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/controller/UserController.java
@ -0,0 +1,64 @@
+package com.mfsys.aconnect.usermanagement.controller;
+
+import com.mfsys.aconnect.usermanagement.constant.UserManagementURI;
+import com.mfsys.aconnect.usermanagement.dto.UserDTOs;
+import com.mfsys.aconnect.usermanagement.service.UserService;
+import jakarta.persistence.EntityNotFoundException;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(UserManagementURI.USER)
+public class UserController {
+
+  private final UserService userService;
+
+  public UserController(UserService userService) {
+    this.userService = userService;
+  }
+
+  @PostMapping(UserManagementURI.CREATE_USER)
+  public ResponseEntity<UserDTOs.UserResponse> createUser(@RequestBody UserDTOs.UserRequest request) {
+    UserDTOs.UserResponse response = userService.createUser(request);
+    return new ResponseEntity<>(response, HttpStatus.CREATED);
+  }
+
+  @GetMapping(UserManagementURI.GET_ALL_USERS)
+  public ResponseEntity<List<UserDTOs.UserResponse>> getAllUsers() {
+    List<UserDTOs.UserResponse> users = userService.getAllUsers();
+    return new ResponseEntity<>(users, HttpStatus.OK);
+  }
+
+  @GetMapping(UserManagementURI.GET_USER)
+  public ResponseEntity<UserDTOs.UserResponse> getUserById(@RequestParam String userId) {
+    try {
+      UserDTOs.UserResponse user = userService.getUserById(userId);
+      return new ResponseEntity<>(user, HttpStatus.OK);
+    } catch (EntityNotFoundException ex) {
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+  }
+
+  @PutMapping(UserManagementURI.UPDATE_USER)
+  public ResponseEntity<UserDTOs.UserResponse> updateUser(@RequestParam String userId, @RequestBody UserDTOs.UserRequest request) {
+    try {
+      UserDTOs.UserResponse response = userService.updateUser(userId, request);
+      return new ResponseEntity<>(response, HttpStatus.OK);
+    } catch (EntityNotFoundException ex) {
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+  }
+
+  @DeleteMapping(UserManagementURI.DELETE_USER)
+  public ResponseEntity<Void> deleteUser(@RequestParam String userId) {
+    try {
+      userService.deleteUser(userId);
+      return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    } catch (EntityNotFoundException ex) {
+      return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/controller/UserSubscriptionController.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/controller/UserSubscriptionController.java
@ -0,0 +1,62 @@
+package com.mfsys.aconnect.usermanagement.controller;
+
+import com.mfsys.aconnect.usermanagement.constant.UserManagementURI;
+import com.mfsys.aconnect.usermanagement.dto.UserSubscriptionDTOs.UserSubscriptionRequest;
+import com.mfsys.aconnect.usermanagement.dto.UserSubscriptionDTOs.UserSubscriptionResponse;
+import com.mfsys.aconnect.usermanagement.service.UserSubscriptionService;
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping(UserManagementURI.USER_SUBSCRIPTION)
+public class UserSubscriptionController {
+
+  private final UserSubscriptionService userSubscriptionService;
+
+  @Autowired
+  public UserSubscriptionController(UserSubscriptionService userSubscriptionService) {
+    this.userSubscriptionService = userSubscriptionService;
+  }
+
+  @PostMapping(UserManagementURI.CREATE_USER_SUBSCRIPTION)
+  public ResponseEntity<UserSubscriptionResponse> createSubscription(
+    @RequestParam String userId,
+    @Valid @RequestBody UserSubscriptionRequest request) {
+    UserSubscriptionResponse createdSubscription = userSubscriptionService.createSubscription(userId, request);
+    return new ResponseEntity<>(createdSubscription, HttpStatus.CREATED);
+  }
+
+  @GetMapping(UserManagementURI.GET_ALL_USER_SUBSCRIPTIONS)
+  public ResponseEntity<List<UserSubscriptionResponse>> getSubscriptionsByUserId(@RequestParam String userId) {
+    List<UserSubscriptionResponse> subscriptions = userSubscriptionService.getSubscriptionsByUserId(userId);
+    return ResponseEntity.ok(subscriptions);
+  }
+
+  @GetMapping(UserManagementURI.GET_USER_SUBSCRIPTION)
+  public ResponseEntity<UserSubscriptionResponse> getSubscriptionById(
+    @RequestParam Long subscriptionId) {
+    return userSubscriptionService.getSubscriptionById(subscriptionId)
+      .map(ResponseEntity::ok)
+      .orElse(ResponseEntity.notFound().build());
+  }
+
+  @PutMapping(UserManagementURI.UPDATE_USER_SUBSCRIPTION)
+  public ResponseEntity<UserSubscriptionResponse> updateSubscription(
+    @RequestParam Long subscriptionId,
+    @Valid @RequestBody UserSubscriptionRequest request) {
+    UserSubscriptionResponse updatedSubscription = userSubscriptionService.updateSubscription(subscriptionId, request);
+    return ResponseEntity.ok(updatedSubscription);
+  }
+
+  @DeleteMapping(UserManagementURI.DELETE_USER_SUBSCRIPTION)
+  public ResponseEntity<Void> deleteSubscription(
+    @RequestParam Long subscriptionId) {
+    userSubscriptionService.deleteSubscription(subscriptionId);
+    return ResponseEntity.noContent().build();
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/dto/UserDTOs.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/dto/UserDTOs.java
@ -0,0 +1,37 @@
+package com.mfsys.aconnect.usermanagement.dto;
+
+import com.mfsys.aconnect.usermanagement.model.Role;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+/**
+ * DTOs (Data Transfer Objects) for User.
+ * This separates the API contract from the internal entity model for security and flexibility.
+ */
+public class UserDTOs {
+
+  @Data
+  @NoArgsConstructor
+  public static class UserRequest {
+    private String userId;
+    private String userFullname;
+    private String password;
+    private String email;
+    private Role role;
+  }
+
+  @Data
+  @NoArgsConstructor
+  public static class UserResponse {
+    private String userId;
+    private String userFullname;
+    private String email;
+    private Role role;
+    private Boolean isFirstLogin;
+    private Boolean isActive;
+    private LocalDateTime createdAt;
+    private LocalDateTime updatedAt;
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/dto/UserSubscriptionDTOs.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/dto/UserSubscriptionDTOs.java
@ -0,0 +1,51 @@
+package com.mfsys.aconnect.usermanagement.dto;
+
+import com.mfsys.aconnect.usermanagement.model.UserSubscription;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDateTime;
+
+public class UserSubscriptionDTOs {
+
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class UserSubscriptionRequest {
+    @NotBlank(message = "Endpoint path is required")
+    private String endpointPath;
+    private String description;
+    @NotNull(message = "isActive status is required")
+    private Boolean isActive;
+    @NotNull(message = "Max requests per minute is required")
+    private Integer maxRequestsPerMinute;
+  }
+
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class UserSubscriptionResponse {
+    private Long id;
+    private String userId;
+    private String endpointPath;
+    private String description;
+    private Boolean isActive;
+    private Integer maxRequestsPerMinute;
+    private LocalDateTime createdAt;
+
+    public static UserSubscriptionResponse fromEntity(UserSubscription userSubscription) {
+      return new UserSubscriptionResponse(
+        userSubscription.getId(),
+        userSubscription.getUserId(),
+        userSubscription.getEndpointPath(),
+        userSubscription.getDescription(),
+        userSubscription.getIsActive(),
+        userSubscription.getMaxRequestsPerMinute(),
+        userSubscription.getCreatedAt()
+      );
+    }
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/filter/SubscriptionFilter.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/filter/SubscriptionFilter.java
@ -0,0 +1,68 @@
+package com.mfsys.aconnect.usermanagement.filter;
+
+import com.mfsys.constant.FilterPriority;
+import com.mfsys.constant.TokenBypassURI;
+import com.mfsys.aconnect.configuration.service.RequestRateLimiterService;
+import com.mfsys.aconnect.usermanagement.model.Role;
+import com.mfsys.aconnect.usermanagement.model.User;
+import com.mfsys.aconnect.usermanagement.model.UserSubscription;
+import com.mfsys.aconnect.usermanagement.service.UserService;
+import com.mfsys.aconnect.usermanagement.service.UserSubscriptionService;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+
+@Component
+@Order(FilterPriority.SUBSCRIPTION)
+public class SubscriptionFilter extends OncePerRequestFilter {
+
+  private final UserService userService;
+  private final UserSubscriptionService userSubscriptionService;
+  private final RequestRateLimiterService requestRateLimiterService;
+
+  @Autowired
+  public SubscriptionFilter(UserService userService, UserSubscriptionService userSubscriptionService,
+                            RequestRateLimiterService requestRateLimiterService) {
+    this.userService = userService;
+    this.userSubscriptionService = userSubscriptionService;
+    this.requestRateLimiterService = requestRateLimiterService;
+  }
+
+  @Override
+  protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)
+    throws ServletException, IOException {
+    // TODO: For porOrga-change we Will removed it later
+    if (!(request.getMethod().equals("OPTIONS"))) {
+
+      System.out.println(">> " + request.getRequestURI() + " <<");
+//		TODO:
+      // important add all mconnect url in tokenbypass uri and remove this if
+      // condition or implement jwt in mconnect module
+      System.out.println(request.getHeaderNames());
+      if (!(TokenBypassURI.URIs.contains(request.getRequestURI()) || request.getRequestURI().startsWith("/MCONNECT/actuator"))) {
+        String userId = request.getHeader("userId");
+        User user = userService.findActiveUserById(userId)
+          .orElseThrow(() -> new RuntimeException("Invalid credentials"));
+        if(user.getRole().equals(Role.USER)){
+          UserSubscription userSubscription = userSubscriptionService.findByUserIdAndEndpointPath(userId, request.getRequestURI())
+            .orElseThrow(() -> new RuntimeException("No Active Subscription"));
+
+          int maxRequests = userSubscription.getMaxRequestsPerMinute();
+
+          if (!requestRateLimiterService.isRequestAllowed(userId, request.getRequestURI(), maxRequests)) {
+            throw new RuntimeException("Too many requests");
+          }
+        }
+      }
+
+      filterChain.doFilter(request, response);
+    }
+  }
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/model/Role.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/model/Role.java
@ -0,0 +1,5 @@
+package com.mfsys.aconnect.usermanagement.model;
+
+public enum Role {
+  USER, ADMIN
+}
--- a/econnect/src/main/java/com/mfsys/aconnect/usermanagement/model/User.java
+++ b/econnect/src/main/java/com/mfsys/aconnect/usermanagement/model/User.java
@ -0,0 +1,54 @@
+package com.mfsys.aconnect.usermanagement.model;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.UpdateTimestamp;
+
+import java.time.LocalDateTime;
+import java.util.HashSet;
+import java.util.Set;
+
+@Entity
+@Table(name = "users")
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class User {
+
+  @Id
+  @Column(name = "user_id", unique = true, nullable = false)
+  private String userId;
+
+  @Column(name = "user_fullname", nullable = false)
+  private String userFullname;
+
+  @Column(name = "password", nullable = false)
+  private String password;
+
+  @Column(name = "email", nullable = false, unique = true)
+  private String email;
+
+  @Enumerated(EnumType.STRING)
+  @Column(name = "role", nullable = false)
+  private Role role = Role.USER;
+
+  @Column(name = "is_first_login")
+  private Boolean isFirstLogin = true;
+
+  @Column(name = "is_active")
+  private Boolean isActive = true;
+
+  @CreationTimestamp
+  @Column(name = "created_at", updatable = false)
+  private LocalDateTime createdAt;
+
+  @UpdateTimestamp
+  @Column(name = "updated_at")
+  private LocalDateTime updatedAt;
+
+  @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+  private Set<UserSubscription> userSubscriptions = new HashSet<>();
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Wasiullah Khan	fb7da46316	Added Security Module in aConnect-BS	1 week ago
Naeem Ullah	fc07a8e88f	Base Architecture Base Architecture	2 weeks ago