Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tattva navjeet #1577

Open
wants to merge 102 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
5331b9a
updated code
Basudev-S Feb 28, 2024
2675daa
Update application-config.properties
Basudev-S Feb 28, 2024
0b153a9
Merge branch 'upyog:master' into master
flatlineratheist Mar 16, 2024
efa3b22
Update CreateVoucher.java
Basudev-S Mar 27, 2024
dff1f11
Merge branch 'upyog:master' into master
flatlineratheist Apr 22, 2024
457fc35
Update MDMSApplicationRunnerImpl.java
flatlineratheist May 1, 2024
8105ad8
fund disbursment
mohsinansarirepo May 7, 2024
70540b5
Update application-config.properties
flatlineratheist Jun 23, 2024
9832299
bmc
flatlineratheist Jul 6, 2024
f08899d
welp
flatlineratheist Jul 6, 2024
8c5ae98
bmc
flatlineratheist Jul 8, 2024
1aaddf1
latest UI
flatlineratheist Jul 21, 2024
ab7c4b0
pomtest
flatlineratheist Jul 25, 2024
c5db56c
buildtest
flatlineratheist Jul 30, 2024
3e346ec
Update Dockerfile
flatlineratheist Jul 31, 2024
cf2705c
Update Dockerfile
flatlineratheist Jul 31, 2024
d67370e
Update Dockerfile
flatlineratheist Aug 2, 2024
25fea24
Update pom.xml
flatlineratheist Aug 2, 2024
985eb04
Update Dockerfile
flatlineratheist Aug 9, 2024
f7bcea6
Update Dockerfile
flatlineratheist Aug 9, 2024
178e35d
Update Dockerfile
flatlineratheist Aug 9, 2024
5e13923
update docker
flatlineratheist Aug 9, 2024
f9ea5bb
service rename
flatlineratheist Aug 9, 2024
98a84b6
latest
flatlineratheist Aug 12, 2024
8894cc0
updaed code
flatlineratheist Aug 12, 2024
2fac8e0
cnages
flatlineratheist Aug 12, 2024
e80ca4c
dbdocker
flatlineratheist Aug 12, 2024
aa0a7e6
ui
flatlineratheist Aug 12, 2024
841bde2
db
flatlineratheist Aug 12, 2024
583008c
lckfile
flatlineratheist Aug 12, 2024
f3d2f3e
Update V20240730103100__bmc_welfare_ddl.sql
flatlineratheist Aug 12, 2024
fbba4de
flywayscript
flatlineratheist Aug 12, 2024
3a038d8
flywayscript
flatlineratheist Aug 12, 2024
015a692
latest
flatlineratheist Aug 13, 2024
61d7f1a
docker
flatlineratheist Aug 13, 2024
691d530
migrate
flatlineratheist Aug 13, 2024
5a47b45
java
flatlineratheist Aug 13, 2024
265063c
Update start.sh
flatlineratheist Aug 13, 2024
d762640
Update Dockerfile
flatlineratheist Aug 13, 2024
a4f9fbe
Update start.sh
flatlineratheist Aug 13, 2024
8b53ded
Update Dockerfile
flatlineratheist Aug 13, 2024
4b8cfd9
Update Dockerfile
flatlineratheist Aug 13, 2024
38531f1
Update start.sh
flatlineratheist Aug 13, 2024
d90470b
Update Dockerfile
flatlineratheist Aug 13, 2024
3f565f5
Update start.sh
flatlineratheist Aug 13, 2024
28d30e5
logback
flatlineratheist Aug 13, 2024
8659944
logback
flatlineratheist Aug 13, 2024
6ddae0b
Update Dockerfile
flatlineratheist Aug 13, 2024
d639f7c
Update V20240730103100__bmc_welfare_ddl.sql
navajitmishra Aug 13, 2024
a4dc653
Update Dockerfile
flatlineratheist Aug 13, 2024
5331ece
Update Dockerfile
flatlineratheist Aug 13, 2024
3d4b53f
Update Dockerfile
flatlineratheist Aug 13, 2024
e21ae2a
Update Dockerfile
flatlineratheist Aug 13, 2024
aca1d8d
Update application.properties
flatlineratheist Aug 14, 2024
d947f3d
Update BankApiController.java
navajitmishra Aug 14, 2024
f19a052
Update CommonApiController.java
navajitmishra Aug 14, 2024
03e7b68
Update UserApiController.java
navajitmishra Aug 14, 2024
b830650
Update SchemeApplicationController.java
navajitmishra Aug 14, 2024
6a4668d
Update SchemeApiController.java
navajitmishra Aug 14, 2024
f99ef12
Update SchemeApplicationController.java
navajitmishra Aug 14, 2024
fc8c734
Update UserService.java
navajitmishra Aug 14, 2024
a281462
Update BmcApplicationService.java
navajitmishra Aug 14, 2024
1b3927a
frontend
flatlineratheist Aug 17, 2024
7119a00
changes
flatlineratheist Aug 17, 2024
84f19de
docker update
flatlineratheist Aug 17, 2024
f057bbd
v2.1
flatlineratheist Aug 21, 2024
d40ee87
v2.1
flatlineratheist Aug 21, 2024
f44dd02
package
flatlineratheist Aug 21, 2024
30634ed
package.jsonbmc
flatlineratheist Aug 21, 2024
f8b5d87
docker
flatlineratheist Aug 21, 2024
9ffd4a7
update
flatlineratheist Aug 21, 2024
5271b20
update
flatlineratheist Aug 21, 2024
39ca7db
update
flatlineratheist Aug 21, 2024
c4e6f8a
update
flatlineratheist Aug 21, 2024
3af54ce
comment
flatlineratheist Aug 21, 2024
decbe3a
comment
flatlineratheist Aug 21, 2024
9f760e8
hook
flatlineratheist Aug 21, 2024
2e404cb
packageudate
flatlineratheist Aug 22, 2024
e6921b9
changesinweb
flatlineratheist Aug 22, 2024
c6ca529
changesinweb
flatlineratheist Aug 22, 2024
9227aac
update
flatlineratheist Aug 22, 2024
79dc3e4
nameupdate
flatlineratheist Aug 22, 2024
cd0097f
nameupdate
flatlineratheist Aug 22, 2024
bde65b3
nameupdate
flatlineratheist Aug 22, 2024
7e518d2
nameupdate
flatlineratheist Aug 22, 2024
039a049
nameupdate
flatlineratheist Aug 22, 2024
8e3027e
djas
flatlineratheist Aug 22, 2024
ade0698
oldcoode
flatlineratheist Aug 22, 2024
44948d4
Aug13
flatlineratheist Aug 23, 2024
5c06e8f
withdb docker
flatlineratheist Aug 23, 2024
913a18d
Update BankApiController.java
navajitmishra Aug 23, 2024
cd6f88a
Update CommonApiController.java
navajitmishra Aug 23, 2024
92a7be5
Update EmployeeWorkflowController.java
navajitmishra Aug 23, 2024
3115846
Update SchemeApiController.java
navajitmishra Aug 23, 2024
2ef6bb5
Update SchemeApplicationController.java
navajitmishra Aug 23, 2024
cf8a2e7
Update UserApiController.java
navajitmishra Aug 23, 2024
aa6c960
Update VerifierApiController.java
navajitmishra Aug 23, 2024
0939936
docker update
flatlineratheist Aug 23, 2024
3a7fbe7
Update OtpSMSRepository.java
flatlineratheist Aug 23, 2024
988336a
Verfied-Working-Code
flatlineratheist Aug 23, 2024
9b250c4
otp
flatlineratheist Sep 3, 2024
0296a9a
Update OtpSMSRepository.java
navajitmishra Sep 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions build/maven/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

FROM upyogio/alpine-maven-builder-jdk-8:1-master-NA-6036091e AS build
# FROM ghcr.io/egovernments/alpine-maven-builder-jdk-8:1-master-na-6036091e AS build
FROM jelastic/maven:3.9.5-openjdk-21 AS build
#FROM ghcr.io/egovernments/alpine-maven-builder-jdk-8:1-master-na-6036091e AS build
ARG WORK_DIR
WORKDIR /app

Expand All @@ -16,7 +15,7 @@ RUN mvn -B -f /app/pom.xml package


# Create runtime image
FROM upyogio/8-openjdk-alpine
FROM jelastic/maven:3.9.5-openjdk-21
#FROM ghcr.io/egovernments/8-openjdk-alpine:latest


Expand All @@ -26,4 +25,4 @@ COPY --from=build /app/target/*.jar /app/start.sh /opt/egov/

RUN chmod +x /opt/egov/start.sh

CMD ["/opt/egov/start.sh"]
CMD ["/opt/egov/start.sh"]
11 changes: 8 additions & 3 deletions build/maven/start.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
#!/bin/sh

if [[ -z "${JAVA_OPTS}" ]];then
# Check if JAVA_OPTS is empty and set default values if it is
if [ -z "${JAVA_OPTS}" ]; then
export JAVA_OPTS="-Xmx64m -Xms64m"
fi

if [ x"${JAVA_ENABLE_DEBUG}" != x ] && [ "${JAVA_ENABLE_DEBUG}" != "false" ]; then
# Check if JAVA_ENABLE_DEBUG is set and not false
if [ -n "${JAVA_ENABLE_DEBUG}" ] && [ "${JAVA_ENABLE_DEBUG}" != "false" ]; then
java_debug_args="-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=${JAVA_DEBUG_PORT:-5005}"
fi

exec java ${java_debug_args} ${JAVA_OPTS} ${JAVA_ARGS} -jar /opt/egov/*.jar
java_opts_preview="--enable-preview"

# Execute the Java application with the provided arguments
exec java ${java_debug_args} ${JAVA_OPTS} ${JAVA_ARGS} -jar /opt/egov/*.jar
18 changes: 18 additions & 0 deletions business-services/bmc-service-v1/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Swagger generated server

Spring Boot Server


## Overview
This server was generated by the [swagger-codegen](https://github.com/swagger-api/swagger-codegen) project.
By using the [OpenAPI-Spec](https://github.com/swagger-api/swagger-core), you can easily generate a server stub.
This is an example of building a swagger-enabled server in Java using the SpringBoot framework.

The underlying library integrating swagger to SpringBoot is [springfox](https://github.com/springfox/springfox)

Start your server as an simple java application

You can view the api documentation in swagger-ui by pointing to
http://localhost:8080/

Change default port value in application.properties
45 changes: 45 additions & 0 deletions business-services/bmc-service-v1/model/AadharUser.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
package digit.bmc.model;

import java.sql.Date;
import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.persistence.Entity;

import jakarta.persistence.Id;
import jakarta.persistence.Table;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;

@Entity
@Data
@Getter
@Setter
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Table(name = "eg_bmc_aadharuser")
public class AadharUser {

@Id
private Long id;
private String aadharRef;
private Long userId;
private String tenantId;
@JsonProperty("father")
private String aadharFatherName;
@JsonProperty("aadharName")
private String aadharName;
@JsonProperty("dob")
private Date aadharDob;
private String aadharMobile;
@JsonProperty("gender")
private String gender;
private Long createdOn;
private Long modifiedOn;
private String createdBy;
private String modifiedBy;

}
140 changes: 140 additions & 0 deletions business-services/bmc-service-v1/model/Application.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
package digit.bmc.model;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonProperty;

import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Table;
@Entity
@Table
public class Application {

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@JsonProperty("id")
private Long id = null;
@JsonProperty
@Column(name = "uuid")
private String uuid = null;
@JsonProperty
@Column(name = "optedid")
private Integer optedId= null;
@JsonProperty
@Column(name = "application_status")
private String applicationStatus = null;
@JsonProperty
@Column(name = "verification_status")
private String verificationStatus = null;
@JsonProperty
@Column(name = "first_approval_status")
private String firstApprovalStatus = null;
@JsonProperty
@Column(name = "random_selection")
private Boolean randomSelection = null;
@JsonProperty
@Column(name = "final_approval")
private Boolean finalApproval = null;
@JsonProperty
@Column(name = "submitted")
private Boolean submitted = null;
@JsonProperty
@Column(name = "modifiedon")
private Date modifiedOn = null;
@JsonProperty
@Column(name = "createdon")
private Date createdOn = null;
@JsonProperty
@Column(name = "createdby")
private Integer createdBy = null;
@JsonProperty
@Column(name = "modifiedby")
private Integer modifiedBy = null;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public String getUuid() {
return uuid;
}
public void setUuid(String uuid) {
this.uuid = uuid;
}
public Integer getOptedId() {
return optedId;
}
public void setOptedId(Integer optedId) {
this.optedId = optedId;
}
public String getApplicationStatus() {
return applicationStatus;
}
public void setApplicationStatus(String applicationStatus) {
this.applicationStatus = applicationStatus;
}
public String getVerificationStatus() {
return verificationStatus;
}
public void setVerificationStatus(String verificationStatus) {
this.verificationStatus = verificationStatus;
}
public String getFirstApprovalStatus() {
return firstApprovalStatus;
}
public void setFirstApprovalStatus(String firstApprovalStatus) {
this.firstApprovalStatus = firstApprovalStatus;
}
public Boolean getRandomSelection() {
return randomSelection;
}
public void setRandomSelection(Boolean randomSelection) {
this.randomSelection = randomSelection;
}
public Boolean getFinalApproval() {
return finalApproval;
}
public void setFinalApproval(Boolean finalApproval) {
this.finalApproval = finalApproval;
}
public Boolean getSubmitted() {
return submitted;
}
public void setSubmitted(Boolean submitted) {
this.submitted = submitted;
}
public Date getModifiedOn() {
return modifiedOn;
}
public void setModifiedOn(Date modifiedOn) {
this.modifiedOn = modifiedOn;
}
public Date getCreatedOn() {
return createdOn;
}
public void setCreatedOn(Date createdOn) {
this.createdOn = createdOn;
}
public Integer getCreatedBy() {
return createdBy;
}
public void setCreatedBy(Integer createdBy) {
this.createdBy = createdBy;
}
public Integer getModifiedBy() {
return modifiedBy;
}
public void setModifiedBy(Integer modifiedBy) {
this.modifiedBy = modifiedBy;
}

// code



}
Loading