elink-star
/
esua-epdc-cloud
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

错误提交回滚之前版本

feature/dangjian
wanggongfeng 6 years ago
parent
4cb48d1c5f
commit
f5b44f129f
8 changed files with 19 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java
  2. 2
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
  3. 2
      esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
  4. 29
      esua-epdc/epdc-gateway/pom.xml
  5. 2
      esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
  6. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
  7. 2
      renren-cloud-generator/src/main/resources/application.yml
  8. 2
      renren-cloud-generator/src/main/resources/generator.properties

2
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/feign/ParamsFeignClient.java
View File

@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author Mark sunlightcs@gmail.com * @author Mark sunlightcs@gmail.com
* @since 1.1.0 * @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 { public interface ParamsFeignClient {
/** /**

2
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
View File

@ -22,7 +22,7 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com * @author Mark sunlightcs@gmail.com
* @since 1.0.0 * @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 { public interface ResourceFeignClient {
/** /**
* 获取所有资源列表 * 获取所有资源列表

2
esua-epdc/epdc-auth/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java
View File

@ -28,7 +28,7 @@ import java.util.List;
* @author Mark sunlightcs@gmail.com * @author Mark sunlightcs@gmail.com
* @since 1.0.0 * @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 { public interface UserFeignClient {
/** /**

29
esua-epdc/epdc-gateway/pom.xml
View File

@ -98,26 +98,21 @@
<spring.redis.password>elink@888</spring.redis.password> <spring.redis.password>elink@888</spring.redis.password>
<!-- gateway routes --> <!-- gateway routes -->
<!--<gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>--> <gateway.routes.epdc-auth-server.uri>lb://epdc-auth-server</gateway.routes.epdc-auth-server.uri>
<gateway.routes.epdc-auth-server.uri>http://127.0.0.1:9091</gateway.routes.epdc-auth-server.uri> <gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>
<!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<!-- <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>--> <!-- <gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri> <gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server
<!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>--> </gateway.routes.epdc-activiti-server.uri>
<!-- <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>-->
<!--<gateway.routes.epdc-admin-server.uri>lb://epdc-admin-server</gateway.routes.epdc-admin-server.uri>-->
<gateway.routes.epdc-admin-server.uri>http://127.0.0.1:9092</gateway.routes.epdc-admin-server.uri>
<gateway.routes.epdc-activiti-server.uri>lb://epdc-activiti-server</gateway.routes.epdc-activiti-server.uri>
<!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>--> <!--<gateway.routes.epdc-api-server.uri>lb://epdc-api-server</gateway.routes.epdc-api-server.uri>-->
<gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri> <gateway.routes.epdc-api-server.uri>http://127.0.0.1:9040</gateway.routes.epdc-api-server.uri>
<gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri> <gateway.routes.epdc-app-server.uri>lb://epdc-app-server</gateway.routes.epdc-app-server.uri>
<!-- <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>--> <!-- <gateway.routes.epdc-app-server.uri>http://127.0.0.1:9058</gateway.routes.epdc-app-server.uri>-->
<!--<gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>--> <gateway.routes.epdc-heart-server.uri>lb://epdc-heart-server</gateway.routes.epdc-heart-server.uri>
<gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri> <!-- <gateway.routes.epdc-heart-server.uri>http://127.0.0.1:9060</gateway.routes.epdc-heart-server.uri>-->
<gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri> <gateway.routes.epdc-job-server.uri>lb://epdc-job-server</gateway.routes.epdc-job-server.uri>
<!-- <gateway.routes.epdc-job-server.uri>http://127.0.0.1:9061</gateway.routes.epdc-job-server.uri>--> <!-- <gateway.routes.epdc-job-server.uri>http://127.0.0.1:9061</gateway.routes.epdc-job-server.uri>-->
<!--<gateway.routes.epdc-message-server.uri>lb://epdc-message-server</gateway.routes.epdc-message-server.uri>--> <gateway.routes.epdc-message-server.uri>lb://epdc-message-server
<gateway.routes.epdc-message-server.uri>http://127.0.0.1:9062</gateway.routes.epdc-message-server.uri> </gateway.routes.epdc-message-server.uri>
<!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>--> <!--<gateway.routes.epdc-news-server.uri>lb://epdc-news-server</gateway.routes.epdc-news-server.uri>-->
<gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri> <gateway.routes.epdc-news-server.uri>http://127.0.0.1:9064</gateway.routes.epdc-news-server.uri>
<gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri> <gateway.routes.epdc-oss-server.uri>lb://epdc-oss-server</gateway.routes.epdc-oss-server.uri>
@ -126,14 +121,14 @@
<gateway.routes.epdc-services-server.uri>lb://epdc-services-server <gateway.routes.epdc-services-server.uri>lb://epdc-services-server
</gateway.routes.epdc-services-server.uri> </gateway.routes.epdc-services-server.uri>
<!-- <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>--> <!-- <gateway.routes.epdc-services-server.uri>http://127.0.0.1:9067</gateway.routes.epdc-services-server.uri>-->
<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri> <!--<gateway.routes.epdc-user-server.uri>lb://epdc-user-server</gateway.routes.epdc-user-server.uri>-->
<!--<gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>--> <gateway.routes.epdc-user-server.uri>http://127.0.0.1:9068</gateway.routes.epdc-user-server.uri>
<gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri> <gateway.routes.epdc-demo-server.uri>lb://epdc-demo-server</gateway.routes.epdc-demo-server.uri>
<gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri> <gateway.routes.epdc-group-server.uri>http://127.0.0.1:9063</gateway.routes.epdc-group-server.uri>
<!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>--> <!--<gateway.routes.epdc-group-server.uri>lb://epdc-group-server</gateway.routes.epdc-group-server.uri>-->
<gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri> <gateway.routes.epdc-websocket-server.uri>lb://epdc-websocket-server</gateway.routes.epdc-websocket-server.uri>
<!-- <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-kpi-server.uri>--> <!-- <gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-kpi-server.uri>-->
<gateway.routes.epdc-custom-server.uri>http://127.0.0.1:9076</gateway.routes.epdc-custom-server.uri> <gateway.routes.epdc-custom-server.uri>lb://epdc-custom-server</gateway.routes.epdc-custom-server.uri>
<gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri> <gateway.routes.epdc-points-server.uri>lb://epdc-points-server</gateway.routes.epdc-points-server.uri>
<!-- <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>--> <!-- <gateway.routes.epdc-kpi-server.uri>lb://epdc-kpi-server</gateway.routes.epdc-kpi-server.uri>-->
<gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri> <gateway.routes.epdc-kpi-server.uri>http://127.0.0.1:9069</gateway.routes.epdc-kpi-server.uri>

2
esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/feign/ResourceFeignClient.java
View File

@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RequestParam;
* @author Mark sunlightcs@gmail.com * @author Mark sunlightcs@gmail.com
* @since 1.0.0 * @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 { public interface ResourceFeignClient {
/** /**

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java
View File

@ -58,7 +58,7 @@ public interface ActInfoFeignClient {
Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto); Result<ActInfoDetailAppResultDTO> getRejectDetail(ActInfoAppFormDTO formDto);
@GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "heart/appactinfo/canceldetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable("id") String id); Result<ActInfoDetailAppResultDTO> getCancelDetail(@PathVariable String id);
@GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "heart/actbanner/bannerlist", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<ActBannerDTO>> getBannerList(); Result<List<ActBannerDTO>> getBannerList();

2
renren-cloud-generator/src/main/resources/application.yml
View File

@ -9,7 +9,7 @@ spring:
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource
#MySQL配置 #MySQL配置
driverClassName: com.mysql.jdbc.Driver 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 username: epdc
password: elink833066 password: elink833066
#oracle配置 #oracle配置

2
renren-cloud-generator/src/main/resources/generator.properties
View File

@ -3,7 +3,7 @@
main= main=
#\u5305\u540D #\u5305\u540D
package=com.elink.esua.epdc package=com.elink.esua.epdc
moduleName=custom moduleName=kpi
#\u4F5C\u8005 #\u4F5C\u8005
author=qu author=qu
#\u7248\u672C\u53F7 #\u7248\u672C\u53F7

Write Preview
Loading…
Cancel
Save