Merge branch 'FMFI-PRE-PRODUCTION' of https://ct.mfsys.com.pk/aConnect/aConnect-BS into FMFI-PRE-PRODUCTION

econnect/pom.xml

@@ -136,6 +136,7 @@
 
     <build>
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -152,9 +153,21 @@
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
+
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <systemPropertyVariables>
+                        <spring.profiles.active>${spring.profiles.active}</spring.profiles.active>
+                    </systemPropertyVariables>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 
+
     <!-- Maven Environment Profiles -->
     <profiles>
 

econnect/src/main/java/com/mfsys/aconnect/client/dto/AccountGLTransactionRequest.java

@@ -11,6 +11,7 @@ public class AccountGLTransactionRequest {
 
     private String plcLocacode;
     private String porOrgacode;
+    private String ptrTrancode;
     private String ppmPymdcode;
     private String sgtGntrcreateusr;
     private String sgtGntrnarration;

econnect/src/main/java/com/mfsys/aconnect/client/dto/GLtoGLRequest.java

@@ -9,6 +9,7 @@ public class GLtoGLRequest {
     private GLtoGLRequest.DebitGl debitGl;
 
     private String plcLocacode;
+    private String ptrTrancode;
     private String porOrgacode;
     private String ppmPymdcode;
     private String sgtGntrcreateusr;

econnect/src/main/resources/application-dev.properties

@@ -1,37 +1,5 @@
-spring.application.name = aconnect
+app.security.uri=http://localhost:9090/security/auth/user
-app.base.uri=aconnect
+app.deposit.uri=http://localhost:9095
-app.db.dbname = aconnect
+app.generalledger.uri=http://localhost:9093
-app.db.dbuser=${CMB_SQL_DB_USER}
+app.organization.uri=0005
-app.db.dbpassword=${CMB_SQL_DB_PASSWORD}
-app.db.url=${CMB_SQL_DB_MACHINE_IP}
-app.server.timezone=${APP_SERVER_TIMEZONE}
-spring.datasource.username = ${app.db.dbuser}
-spring.datasource.password = ${app.db.dbpassword}
-spring.datasource.url = jdbc:mysql://${app.db.url}/${app.db.dbname}?createDatabaseIfNotExist=true&serverTimezone=${app.server.timezone}&useLegacyDatetimeCode=false&useUnicode=yes&characterEncoding=UTF-8&characterSetResults=UTF-8
-
-spring.jpa.properties.hibernate.connection.characterEncoding=utf-8
-spring.jpa.properties.hibernate.connection.CharSet=utf-8
-spring.jpa.properties.hibernate.connection.useUnicode=true
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-spring.jpa.hibernate.ddl-auto=update
-
-jwt.secret = D1kD4fP8wQ2zL6hM9sR3vX7yU0tJ5nB2cV8pG4qW6eY1iK3oA9uH7jN2mZ5xT9bS4rF0lP3dQ8wE1
-jwt.expiration = 86400000
-jwt.refresh-expiration= 604800000
-
-# Default security URI for dev (fallback for unknown users)
-#app.security.uri=http://localhost:9090/security/auth/user
-#app.deposit.uri=http://localhost:9095/deposit
-## User-specific security URLs for dev environment
-#app.security.user.01.uri=http://localhost:9090/security/auth/user
-#
-#app.security.user.naeem.uri=http://localhost:9091/security/auth/user
-#app.security.user.03.uri=http://dev-server-03:9090/security/auth/user
-#app.security.user.admin.uri=http://localhost:9092/security/auth/user
-#app.security.user.test.uri=http://test-dev-server:9090/security/auth/user
-
-app.deposit.uri=${CMB_DEPOSIT_SERVER_URL}
-app.generalledger.uri=${CMB_GL_SERVER_URL}
-app.organization.uri=${CMB_ORGA_CODE}
-app.security.uri=${CMB_SECURITY_SERVER_URL}/security/auth/user
 

econnect/src/main/resources/application-live.properties

@@ -1,32 +1,3 @@
-spring.application.name = aconnect
-app.base.uri=aconnect
-app.db.dbname = aconnect
-app.db.dbuser=${CMB_SQL_DB_USER}
-app.db.dbpassword=${CMB_SQL_DB_PASSWORD}
-app.db.url=${CMB_SQL_DB_MACHINE_IP}
-app.server.timezone=${APP_SERVER_TIMEZONE}
-spring.datasource.username = ${app.db.dbuser}
-spring.datasource.password = ${app.db.dbpassword}
-spring.datasource.url = jdbc:mysql://${app.db.url}/${app.db.dbname}?createDatabaseIfNotExist=true&serverTimezone=${app.server.timezone}&useLegacyDatetimeCode=false&useUnicode=yes&characterEncoding=UTF-8&characterSetResults=UTF-8
-
-spring.jpa.properties.hibernate.connection.characterEncoding=utf-8
-spring.jpa.properties.hibernate.connection.CharSet=utf-8
-spring.jpa.properties.hibernate.connection.useUnicode=true
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-spring.jpa.hibernate.ddl-auto=update
-
-jwt.secret = D1kD4fP8wQ2zL6hM9sR3vX7yU0tJ5nB2cV8pG4qW6eY1iK3oA9uH7jN2mZ5xT9bS4rF0lP3dQ8wE1
-jwt.expiration = 86400000
-jwt.refresh-expiration= 604800000
-
-
-# User-specific security URLs for live environment
-#app.security.user.01.uri=https://live-client1-company.com/security/auth/user
-#app.security.user.mubashar.uri=https://live-client2-company.com/security/auth/user
-#app.security.user.03.uri=https://live-client3-company.com/security/auth/user
-#app.security.user.admin.uri=https://live-admin-company.com/security/auth/user
-#app.security.user.manager.uri=https://live-manager-company.com/security/auth/user
-
 app.deposit.uri=${CMB_DEPOSIT_SERVER_URL}
 app.generalledger.uri=${CMB_GL_SERVER_URL}
 app.organization.uri=${CMB_ORGA_CODE}

econnect/src/main/resources/application-test.properties

@@ -1,33 +1,4 @@
-spring.application.name = aconnect
-app.base.uri=aconnect
-app.db.dbname = aconnect
-app.db.dbuser=${CMB_SQL_DB_USER}
-app.db.dbpassword=${CMB_SQL_DB_PASSWORD}
-app.db.url=${CMB_SQL_DB_MACHINE_IP}
-app.server.timezone=${APP_SERVER_TIMEZONE}
-spring.datasource.username = ${app.db.dbuser}
-spring.datasource.password = ${app.db.dbpassword}
-spring.datasource.url = jdbc:mysql://${app.db.url}/${app.db.dbname}?createDatabaseIfNotExist=true&serverTimezone=${app.server.timezone}&useLegacyDatetimeCode=false&useUnicode=yes&characterEncoding=UTF-8&characterSetResults=UTF-8
-
-spring.jpa.properties.hibernate.connection.characterEncoding=utf-8
-spring.jpa.properties.hibernate.connection.CharSet=utf-8
-spring.jpa.properties.hibernate.connection.useUnicode=true
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-spring.jpa.hibernate.ddl-auto=update
-
-jwt.secret = D1kD4fP8wQ2zL6hM9sR3vX7yU0tJ5nB2cV8pG4qW6eY1iK3oA9uH7jN2mZ5xT9bS4rF0lP3dQ8wE1
-jwt.expiration = 86400000
-jwt.refresh-expiration= 604800000
-
-#app.organization.uri = 0005
 app.deposit.uri=${CMB_DEPOSIT_SERVER_URL}
 app.generalledger.uri=${CMB_GL_SERVER_URL}
 app.organization.uri=${CMB_ORGA_CODE}
-app.security.uri=${CMB_SECURITY_SERVER_URL}/security/auth/user
+app.security.uri=${CMB_SECURITY_SERVER_URL}/security/auth/user
-
-
-#app.security.user.naeem.organization=0005
-#app.security.user.naeem.environment=uat
-
-#app.security.uri=http://test-server:9090/security/auth/user
-#app.security.user.hamza.uri=http://test-server:9090/security/auth/user

econnect/src/main/resources/application-uat.properties

@@ -1,31 +1,3 @@
-spring.application.name = aconnect
-app.base.uri=aconnect
-app.db.dbname = aconnect
-app.db.dbuser=${CMB_SQL_DB_USER}
-app.db.dbpassword=${CMB_SQL_DB_PASSWORD}
-app.db.url=${CMB_SQL_DB_MACHINE_IP}
-app.server.timezone=${APP_SERVER_TIMEZONE}
-spring.datasource.username = ${app.db.dbuser}
-spring.datasource.password = ${app.db.dbpassword}
-spring.datasource.url = jdbc:mysql://${app.db.url}/${app.db.dbname}?createDatabaseIfNotExist=true&serverTimezone=${app.server.timezone}&useLegacyDatetimeCode=false&useUnicode=yes&characterEncoding=UTF-8&characterSetResults=UTF-8
-
-spring.jpa.properties.hibernate.connection.characterEncoding=utf-8
-spring.jpa.properties.hibernate.connection.CharSet=utf-8
-spring.jpa.properties.hibernate.connection.useUnicode=true
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
-spring.jpa.hibernate.ddl-auto=update
-
-jwt.secret = D1kD4fP8wQ2zL6hM9sR3vX7yU0tJ5nB2cV8pG4qW6eY1iK3oA9uH7jN2mZ5xT9bS4rF0lP3dQ8wE1
-jwt.expiration = 86400000
-jwt.refresh-expiration= 604800000
-
-# User-specific security URLs for uat environment
-#app.security.user.01.uri=http://uat-server-01:9090/security/auth/user
-#app.security.user.02.uri=http://uat-server-02:9090/security/auth/user
-#app.security.user.03.uri=http://uat-server-03:9090/security/auth/user
-#app.security.user.admin.uri=http://uat-admin-server:9090/security/auth/user
-#app.security.user.qa.uri=http://uat-qa-server:9090/security/auth/user
-
 app.deposit.uri=${CMB_DEPOSIT_SERVER_URL}
 app.generalledger.uri=${CMB_GL_SERVER_URL}
 app.organization.uri=${CMB_ORGA_CODE}

econnect/src/main/resources/application.properties

@@ -15,58 +15,9 @@ spring.jpa.properties.hibernate.connection.useUnicode=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 spring.jpa.hibernate.ddl-auto=update
 
+spring.profiles.active=@spring.profiles.active@
+
 jwt.secret = D1kD4fP8wQ2zL6hM9sR3vX7yU0tJ5nB2cV8pG4qW6eY1iK3oA9uH7jN2mZ5xT9bS4rF0lP3dQ8wE1
 jwt.expiration = 86400000
 jwt.refresh-expiration= 604800000
 
-# User to Environment Mapping
-#app.user.01.environment=dev
-#app.user.02.environment=dev
-#app.user.test.environment=dev
-#
-#app.user.liveuser.environment=live
-#app.user.produser.environment=live
-#app.user.admin.environment=live
-#
-#app.user.uatuser.environment=uat
-#app.user.qa.environment=uat
-
-# Environment-specific security URLs
-#app.environment.dev.securityUri=http://localhost:9090/security/auth/user
-#app.environment.uat.securityUri=http://uat-security-server:9090/security/auth/user
-#app.environment.live.securityUri=https://live-security-server.com/security/auth/user
-
-# Default environment
-#app.environment.default=dev
-
-# ${CMB_SQL_DB_USER}
-# ${CMB_SQL_DB_USER}
-#app.security.uri=http://localhost:9095/security/auth/user
-#app.deposit.uri=http://localhost:9095
-#app.generalledger.uri=http://localhost:9093
-#app.organization.uri=0005
-
-
-#app.security.uri=http://localhost:9090/security/auth/user
-
-# ${CMB_SQL_DB_USER}
-# ${CMB_SQL_DB_USER}
-#app.deposit.uri=http://localhost:9095
-#app.generalledger.uri=http://localhost:9093
-#app.organization.uri=0005
-
-app.deposit.uri=${CMB_DEPOSIT_SERVER_URL}
-app.generalledger.uri=${CMB_GL_SERVER_URL}
-app.organization.uri=${CMB_ORGA_CODE}
-app.security.uri=${CMB_SECURITY_SERVER_URL}/security/auth/user
-
-
-# Deposit URLs
-#app.environment.dev.depositUri=http://localhost:9095/deposit
-#app.environment.uat.depositUri=http://uat-deposit-server:9095/deposit
-#app.environment.live.depositUri=https://live-deposit-server.com/deposit
-
-# GL URLs
-#app.environment.dev.generalLedgerUri=http://localhost:9093/generalledger
-#app.environment.uat.generalLedgerUri=http://uat-gl-server:9093/generalledger
-#app.environment.live.generalLedgerUri=https://live-gl-server.com/generalledger