diff --git a/Dockerfile b/Dockerfile
index 67d7b07698f993c8f5ee8121b5fb5bb32e3bd3dc..e2e91baed85300b6f09350eaf18b44f3768dee1d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,6 @@ RUN apt-get update \
xfonts-base \
xz-utils
-COPY compentency-tool-0.0.1-SNAPSHOT.jar /opt/
+COPY target/compentency-passbook-0.0.1-SNAPSHOT.jar /opt/
#HEALTHCHECK --interval=30s --timeout=30s CMD curl --fail http://localhost:7001/actuator/health || exit 1
-CMD ["java", "-XX:+PrintFlagsFinal", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-jar", "/opt/compentency-tool-0.0.1-SNAPSHOT.jar"]
+CMD ["java", "-XX:+PrintFlagsFinal", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-jar", "/opt/compentency-passbook-0.0.1-SNAPSHOT.jar"]
diff --git a/src/main/java/com/sphere/compentency/common/utils/AppProperties.java b/src/main/java/com/sphere/compentency/common/utils/AppProperties.java
index fefb193cc0dc7a26a300e632ac52fc98e86e74f3..66f1e81e52b34f7b94142ac3e9a2d5be94484c58 100644
--- a/src/main/java/com/sphere/compentency/common/utils/AppProperties.java
+++ b/src/main/java/com/sphere/compentency/common/utils/AppProperties.java
@@ -5,125 +5,102 @@ import org.springframework.stereotype.Component;
@Component
public class AppProperties {
- @Value("${kafka.topic}")
- private String kafkaTopic;
-
- @Value("${kafka.groupID}")
- private String kafkaGroupID;
-
- @Value("${get.hierarchy}")
- private String getHierarchyApi;
-
- @Value("${Api.key}")
- private String Apikey;
-
- @Value("${get.entityById}")
- private String getEntityById;
- @Value("${passbook.update.url}")
- private String passbookUpdateUrl;
-
- @Value("${kafka.bootstrapServers}")
- private String kafkaBootstrapServers;
-
- public String getKafkaBootstrapServers() {
- return kafkaBootstrapServers;
- }
-
- public void setKafkaBootstrapServers(String kafkaBootstrapServers) {
- this.kafkaBootstrapServers = kafkaBootstrapServers;
- }
-
- public String getKafkaTopic() {
- return kafkaTopic;
- }
-
- public void setKafkaTopic(String kafkaTopic) {
- this.kafkaTopic = kafkaTopic;
- }
-
- public String getKafkaGroupID() {
- return kafkaGroupID;
- }
-
- public void setKafkaGroupID() {
- this.kafkaGroupID = kafkaGroupID;
- }
-
- public String getGetHierarchyApi() {
- return getHierarchyApi;
- }
-
- public void setGetHierarchyApi(String getHierarchyApi) {
- this.getHierarchyApi = getHierarchyApi;
- }
-
- public String getApikey() {
- return Apikey;
- }
-
- public void setApikey(String apikey) {
- Apikey = apikey;
- }
-
- public String getGetEntityById() {
- return getEntityById;
- }
-
- public void setGetEntityById(String getEntityById) {
- this.getEntityById = getEntityById;
- }
-
- public String getPassbookUpdateUrl() {
- return passbookUpdateUrl;
- }
-
- public void setPassbookUpdateUrl(String passbookUpdateUrl) {
- this.passbookUpdateUrl = passbookUpdateUrl;
- }
-
- @Value("${user.read.api}")
- private String UserReadApi;
-
- @Value("${content.read.api}")
- private String ContentReadAapi;
-
- @Value("${generate.token}")
- private String GenerateToken;
-
- public String getGenerateToken() {
- return GenerateToken;
- }
-
- public void setGenerateToken(String generateToken) {
- GenerateToken = generateToken;
- }
-
- public String getVerifyToken() {
- return VerifyToken;
- }
-
- public void setVerifyToken(String verifyToken) {
- VerifyToken = verifyToken;
- }
-
- @Value("${verify.token}")
- private String VerifyToken;
-
- public String getUserReadApi() {
- return UserReadApi;
- }
-
- public void setUserReadApi(String userReadApi) {
- UserReadApi = userReadApi;
- }
-
- public String getContentReadAapi() {
- return ContentReadAapi;
- }
-
- public void setContentReadAapi(String contentReadAapi) {
- ContentReadAapi = contentReadAapi;
- }
-
-
+ @Value("${kafka.topic}")
+ private String kafkaTopic;
+
+ @Value("${kafka.groupID}")
+ private String kafkaGroupID;
+
+ @Value("${get.hierarchy}")
+ private String getHierarchyApi;
+
+ @Value("${Api.key}")
+ private String Apikey;
+
+ @Value("${get.entityById}")
+ private String getEntityById;
+ @Value("${passbook.update.url}")
+ private String passbookUpdateUrl;
+
+ @Value("${kafka.bootstrapServers}")
+ private String kafkaBootstrapServers;
+
+ public String getKafkaBootstrapServers() {
+ return kafkaBootstrapServers;
+ }
+
+ public void setKafkaBootstrapServers(String kafkaBootstrapServers) {
+ this.kafkaBootstrapServers = kafkaBootstrapServers;
+ }
+
+ public String getKafkaTopic() {
+ return kafkaTopic;
+ }
+
+ public void setKafkaTopic(String kafkaTopic) {
+ this.kafkaTopic = kafkaTopic;
+ }
+
+ public String getKafkaGroupID() {
+ return kafkaGroupID;
+ }
+
+ public void setKafkaGroupID() {
+ this.kafkaGroupID = kafkaGroupID;
+ }
+
+ public String getGetHierarchyApi() {
+ return getHierarchyApi;
+ }
+
+ public void setGetHierarchyApi(String getHierarchyApi) {
+ this.getHierarchyApi = getHierarchyApi;
+ }
+
+ public String getApikey() {
+ return Apikey;
+ }
+
+ public void setApikey(String apikey) {
+ Apikey = apikey;
+ }
+
+ public String getGetEntityById() {
+ return getEntityById;
+ }
+
+ public void setGetEntityById(String getEntityById) {
+ this.getEntityById = getEntityById;
+ }
+
+ public String getPassbookUpdateUrl() {
+ return passbookUpdateUrl;
+ }
+
+ public void setPassbookUpdateUrl(String passbookUpdateUrl) {
+ this.passbookUpdateUrl = passbookUpdateUrl;
+ }
+
+ @Value("${user.read.api}")
+ private String UserReadApi;
+
+ @Value("${content.read.api}")
+ private String ContentReadAapi;
+
+ public String getUserReadApi() {
+ return UserReadApi;
+ }
+
+ public void setUserReadApi(String userReadApi) {
+ UserReadApi = userReadApi;
+ }
+
+ public String getContentReadAapi() {
+ return ContentReadAapi;
+ }
+
+ public void setContentReadAapi(String contentReadAapi) {
+ ContentReadAapi = contentReadAapi;
+ }
+
}
diff --git a/src/main/java/com/sphere/compentency/external/service/ExternalService.java b/src/main/java/com/sphere/compentency/external/service/ExternalService.java
index 921256eea884b1aed91ec29479167ce00f87cce3..3f0e3315c2041f4d1d5b5e24c7c7980e37df9330 100644
--- a/src/main/java/com/sphere/compentency/external/service/ExternalService.java
+++ b/src/main/java/com/sphere/compentency/external/service/ExternalService.java
@@ -10,7 +10,7 @@ public interface ExternalService {
public ResponseEntity<String> read_user(Map<String,String> headers,String UserID);
public ResponseEntity<String> read_content(String ContentID);
- public ResponseEntity<String> Verify_token(Map<String, String> headers);
- public ResponseEntity<String> Generate_token(MultiValueMap<String, String> map);
+// public ResponseEntity<String> Verify_token(Map<String, String> headers);
+// public ResponseEntity<String> Generate_token(MultiValueMap<String, String> map);
}
diff --git a/src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java b/src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java
index 46acfd5ec3dd2e4565bc2e715568cdf8f5826ca1..eca1fd237c6d8e889647bd10b9b3aad692bcaf72 100644
--- a/src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java
+++ b/src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java
@@ -64,30 +64,30 @@ public class ExternalServiceImpl implements ExternalService {
}
- @Override
- public ResponseEntity<String> Generate_token(MultiValueMap<String, String> map) {
- // TODO Auto-generated method stub
- HttpHeaders headers = new HttpHeaders();
- headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
- HttpEntity<MultiValueMap<String, String>> body_request = new HttpEntity<>(map, headers);
-
- ResponseEntity<String> response=restTemplate.exchange(props.getGenerateToken(),HttpMethod.POST,body_request,String.class);
-
- return response;
- }
-
- @Override
- public ResponseEntity<String> Verify_token(Map<String, String> headers) {
- // TODO Auto-generated method stub
- HttpHeaders header=new HttpHeaders();
- header.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
- header.add("Authorization",headers.get("authorization") );
- HttpEntity<String> entity=new HttpEntity<String>("parameters",header);
- System.out.println(props.getVerifyToken());
- System.out.println(headers.get("authorization") );
- ResponseEntity<String> response=restTemplate.exchange(props.getVerifyToken(),HttpMethod.GET,entity,String.class);
-
- return response;
- }
+// @Override
+// public ResponseEntity<String> Generate_token(MultiValueMap<String, String> map) {
+// // TODO Auto-generated method stub
+// HttpHeaders headers = new HttpHeaders();
+// headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+// HttpEntity<MultiValueMap<String, String>> body_request = new HttpEntity<>(map, headers);
+//
+// ResponseEntity<String> response=restTemplate.exchange(props.getGenerateToken(),HttpMethod.POST,body_request,String.class);
+//
+// return response;
+// }
+//
+// @Override
+// public ResponseEntity<String> Verify_token(Map<String, String> headers) {
+// // TODO Auto-generated method stub
+// HttpHeaders header=new HttpHeaders();
+// header.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+// header.add("Authorization",headers.get("authorization") );
+// HttpEntity<String> entity=new HttpEntity<String>("parameters",header);
+// System.out.println(props.getVerifyToken());
+// System.out.println(headers.get("authorization") );
+// ResponseEntity<String> response=restTemplate.exchange(props.getVerifyToken(),HttpMethod.GET,entity,String.class);
+//
+// return response;
+// }
}
diff --git a/src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java b/src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java
index bc63eff50d73178662165aca3bcd860aa3a29a4c..ca34b785074b8bb27a286b5ea95c7bc9d231406a 100644
--- a/src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java
+++ b/src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java
@@ -32,23 +32,23 @@ public class ServiceController {
return externalService.read_content(ContentID);
}
- @PostMapping(value = "/generate-token",consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE})
- public ResponseEntity<String> GenerateToken(String username,String password,String client_id,String grant_type){
- System.out.println("generate token : "+username+password+client_id+grant_type);
-
- MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
- map.add("username",username);
- map.add("password",password);
- map.add("client_id",client_id);
- map.add("grant_type",grant_type);
- return externalService.Generate_token(map);
-
- }
+// @PostMapping(value = "/generate-token",consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE})
+// public ResponseEntity<String> GenerateToken(String username,String password,String client_id,String grant_type){
+// System.out.println("generate token : "+username+password+client_id+grant_type);
+//
+// MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+// map.add("username",username);
+// map.add("password",password);
+// map.add("client_id",client_id);
+// map.add("grant_type",grant_type);
+// return externalService.Generate_token(map);
+//
+// }
- @GetMapping("/verify-token")
- public ResponseEntity<String> VerifyToken(@RequestHeader Map<String,String> headers){
- System.out.println(headers);
- return externalService.Verify_token(headers);
- }
+// @GetMapping("/verify-token")
+// public ResponseEntity<String> VerifyToken(@RequestHeader Map<String,String> headers){
+// System.out.println(headers);
+// return externalService.Verify_token(headers);
+// }
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 80f41ce3e5a35721a13f691e4a85382f5806d0c7..6720049c7667c4488631ef688952de85f0b45d06 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -8,20 +8,21 @@ spring.jpa.properties.hibernate.dialect= org.hibernate.dialect.PostgreSQLDialect
# Hibernate ddl auto (create, create-drop, validate, update)
spring.jpa.hibernate.ddl-auto= update
+#Enable database initialization
+spring.datasource.initialization-mode=always
+
+user.read.api = https://uphrh.in/learner/user/v5/read
+content.read.api = https://uphrh.in/content/v2/read
-user.read.api = https://aastrika-stage.tarento.com/api/user/v2/read/
-content.read.api = https://aastrika-stage.tarento.com/api/content/v1/read/
-generate.token = https://aastrika-stage.tarento.com/auth/realms/sunbird/protocol/openid-connect/token
-verify.token = https://aastrika-stage.tarento.com/auth/realms/sunbird/protocol/openid-connect/userinfo
kafka.bootstrapServers = localhost:9092
kafka.topic = dev.issue.certificate.request
kafka.groupID = dev-activity-aggregate-updater-group
-get.hierarchy=https://sphere.aastrika.org/api/private/content/v3/hierarchy/
-Api.key=bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJYUkZWVDBidDlBNGdsWm5uSUF5d1BJYWFzdjRReGFHWSJ9.APB-Ma_1l_R5l0xRddDhhlYkxBxxwZzcQofyhoif2bE
-get.entityById = http://localhost:8083/getEntityById/
-passbook.update.url = https://aastrika-stage.tarento.com/api/user/v1/passbook
+get.hierarchy= https://uphrh.in/course/v1/hierarchy
+Api.key=bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJSR3RkMkZzeG1EMnJER3I4dkJHZ0N6MVhyalhZUzBSSyJ9.kMLn6177rvY53i0RAN3SPD5m3ctwaLb32pMYQ65nBdA
+get.entityById = http://localhost:8087/getEntityById/
+passbook.update.url = https://uphrh.in/api/user/v1/passbook
server.port = 8087