diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java
index 6862e3776..7e5ae3941 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java
@@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author Mark sunlightcs@gmail.com
* @since 1.1.0
*/
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class,url = "http://127.0.0.1:9092")
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ParamsFeignClientFallback.class)
public interface ParamsFeignClient {
/**
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
index 175fbedaa..8077f0782 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
@@ -22,7 +22,7 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient",url = "http://127.0.0.1:9092")
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = ResourceFeignClientFallback.class, contextId = "ResourceFeignClient")
public interface ResourceFeignClient {
/**
* 获取所有资源列表
diff --git a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
index ca9671b3f..9b3557e17 100644
--- a/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
+++ b/esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
@@ -28,7 +28,7 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient",url = "http://127.0.0.1:9092")
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = UserFeignClientFallback.class, contextId = "UserFeignClient")
public interface UserFeignClient {
/**
diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml
index 3618c936c..a153a845b 100644
--- a/esua-epdc/epdc-gateway/pom.xml
+++ b/esua-epdc/epdc-gateway/pom.xml
@@ -98,26 +98,21 @@
elink@888
-
- http://127.0.0.1:9091
-
+ lb://epdc-auth-server
+ lb://epdc-admin-server
- lb://epdc-activiti-server
-
-
-
- http://127.0.0.1:9092
- lb://epdc-activiti-server
+ lb://epdc-activiti-server
+
http://127.0.0.1:9040
lb://epdc-app-server
-
- http://127.0.0.1:9060
+ lb://epdc-heart-server
+
lb://epdc-job-server
-
- http://127.0.0.1:9062
+ lb://epdc-message-server
+
http://127.0.0.1:9064
lb://epdc-oss-server
@@ -126,14 +121,14 @@
lb://epdc-services-server
- lb://epdc-user-server
-
+
+ http://127.0.0.1:9068
lb://epdc-demo-server
http://127.0.0.1:9063
lb://epdc-websocket-server
-
- http://127.0.0.1:9076
+
+ lb://epdc-custom-server
lb://epdc-points-server
http://127.0.0.1:9069
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
index 1c378fd9d..b52b556f8 100644
--- a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author Mark sunlightcs@gmail.com
* @since 1.0.0
*/
-@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class,url = "http://127.0.0.1:9091")
+@FeignClient(name = ServiceConstant.EPDC_AUTH_SERVER, fallback = ResourceFeignClientFallback.class)
public interface ResourceFeignClient {
/**
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
index 15c6742f8..95fd6e0e1 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
@@ -58,7 +58,7 @@ public interface ActInfoFeignClient {
Result getRejectDetail(ActInfoAppFormDTO formDto);
@GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
- Result getCancelDetail(@PathVariable("id") String id);
+ Result getCancelDetail(@PathVariable String id);
@GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
Result> getBannerList();
diff --git a/renren-cloud-generator/src/main/resources/application.yml b/renren-cloud-generator/src/main/resources/application.yml
index b014c4c3a..91fe3458c 100644
--- a/renren-cloud-generator/src/main/resources/application.yml
+++ b/renren-cloud-generator/src/main/resources/application.yml
@@ -9,7 +9,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置
driverClassName: com.mysql.jdbc.Driver
- url: jdbc:mysql://47.104.224.45:3308/esua_epdc_custom?useUnicode=true&characterEncoding=UTF-8&useSSL=false
+ url: jdbc:mysql://47.104.224.45:3308/esua_epdc_kpi?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: epdc
password: elink833066
#oracle配置
diff --git a/renren-cloud-generator/src/main/resources/generator.properties b/renren-cloud-generator/src/main/resources/generator.properties
index 0490a3067..9e9f68440 100644
--- a/renren-cloud-generator/src/main/resources/generator.properties
+++ b/renren-cloud-generator/src/main/resources/generator.properties
@@ -3,7 +3,7 @@
main=
#\u5305\u540D
package=com.elink.esua.epdc
-moduleName=custom
+moduleName=kpi
#\u4F5C\u8005
author=qu
#\u7248\u672C\u53F7