You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by be...@apache.org on 2022/04/23 06:22:24 UTC

[fineract-cn-identity] 01/01: Remove Eureka & Client Side Load Balancer

This is an automated email from the ASF dual-hosted git repository.

benura pushed a commit to branch remove-eureka
in repository https://gitbox.apache.org/repos/asf/fineract-cn-identity.git

commit 2429194427d3b19fde5b2f7a344a959841118f61
Author: BLasan <be...@gmail.com>
AuthorDate: Sat Apr 23 11:52:13 2022 +0530

    Remove Eureka & Client Side Load Balancer
---
 .../cn/identity/api/v1/client/IdentityManager.java         |  2 +-
 service/build.gradle                                       |  2 +-
 service/src/main/resources/application.yml                 | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java b/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java
index a41a41e..2d00923 100644
--- a/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java
+++ b/api/src/main/java/org/apache/fineract/cn/identity/api/v1/client/IdentityManager.java
@@ -49,7 +49,7 @@ import org.springframework.web.bind.annotation.RequestParam;
  * @author Myrle Krantz
  */
 @SuppressWarnings("unused")
-@FeignClient(name="identity-v1", path="/identity/v1", configuration=CustomFeignClientsConfiguration.class)
+@FeignClient(path="/identity/v1", url = "http://identity-service:2021", configuration=CustomFeignClientsConfiguration.class)
 public interface IdentityManager extends Anubis {
   String REFRESH_TOKEN = "Identity-RefreshToken";
   @RequestMapping(value = "/token?grant_type=password", method = RequestMethod.POST,
diff --git a/service/build.gradle b/service/build.gradle
index fbe2c87..d405d0a 100644
--- a/service/build.gradle
+++ b/service/build.gradle
@@ -45,7 +45,7 @@ bootRepackage {
 dependencies {
     compile(
             [group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'],
-            [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka'],
+            [group: 'org.springframework.boot', name: 'spring-boot-starter-web'],
             [group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'],
             [group: 'org.hibernate', name: 'hibernate-validator', version: versions.hibernatevalidator],
             [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang],
diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml
index e570045..3b6160d 100644
--- a/service/src/main/resources/application.yml
+++ b/service/src/main/resources/application.yml
@@ -24,13 +24,13 @@ spring:
     config:
       enabled: false
 
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-      registerWithEureka: false
-  instance:
-    homePageUrl: "http://${eureka.hostname}:2021/identity/v1/"
+# eureka:
+#   client:
+#     serviceUrl:
+#       defaultZone: http://localhost:8761/eureka/
+#       registerWithEureka: false
+#   instance:
+#     homePageUrl: "http://${eureka.hostname}:2021/identity/v1/"
 
 server:
   port: 2021