Skip to content
GitLab
Commit 100fc5ea authored by Radheshhathwar's avatar Radheshhathwar
Browse files

Changed Docker file and added few changes in application.properties

parent 878e007f
main
1 merge request!3Changed Docker file and added few changes in application.properties
Hide whitespace changes
Inline Side-by-side
Showing
with 153 additions and 175 deletions
+153 -175
Dockerfile
+ 2
− 2
View file @ 100fc5ea
......@@ -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"]
src/main/java/com/sphere/compentency/common/utils/AppProperties.java
+ 98
− 121
View file @ 100fc5ea
......@@ -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;
}
}
src/main/java/com/sphere/compentency/external/service/ExternalService.java
+ 2
− 2
View file @ 100fc5ea
......@@ -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);
}
src/main/java/com/sphere/compentency/external/service/impl/ExternalServiceImpl.java
+ 25
− 25
View file @ 100fc5ea
......@@ -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;
// }
}
src/main/java/com/sphere/compentency/externalservice/controller/ServiceController.java
+ 17
− 17
View file @ 100fc5ea
......@@ -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);
// }
}
src/main/resources/application.properties
+ 9
− 8
View file @ 100fc5ea
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment