From 86d65992f0f7dcbeae6d9e6ac4a94f1968591a66 Mon Sep 17 00:00:00 2001
From: yujt <work@yujt.net.cn>
Date: Thu, 14 May 2020 10:53:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=A9=E4=B8=9A=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epdc-cloud-api/pom.xml                              | 13 +++++--------
 .../esua/epdc/controller/ApiPropertyController.java |  2 +-
 .../feign/fallback/PropertyFeignClientFallback.java | 13 +++++++++++++
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/epdc-cloud-api/pom.xml b/epdc-cloud-api/pom.xml
index 5c2b571..080a880 100644
--- a/epdc-cloud-api/pom.xml
+++ b/epdc-cloud-api/pom.xml
@@ -228,7 +228,7 @@
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
                 <nacos.ip>47.104.85.99</nacos.ip>
-                <nacos.namespace>6a3577b4-7b79-43f6-aebb-9c3f31263f6a</nacos.namespace>
+                <nacos.namespace>de000340-5fc4-45aa-bdbc-dd96852012ad</nacos.namespace>
 
                 <!--公众号配置-->
                 <wx.mp.configs.appId>wx3ef8f2cd12a19fcb</wx.mp.configs.appId>
@@ -236,14 +236,11 @@
                 <wx.mp.configs.token>111</wx.mp.configs.token>
                 <wx.mp.configs.aesKey>111</wx.mp.configs.aesKey>
                 <!--党群e家小程序配置-->
-                <!--                <wx.ma.appId>wxdd8530c5f4926766</wx.ma.appId>-->
-                <!--                <wx.ma.secret>5bf4fb813145431b3493a10aa7e041e9</wx.ma.secret>-->
-                <!--先锋市北小程序配置-->
-                <wx.ma.appId>wx5d3e97461d248397</wx.ma.appId>
-                <wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>
+                <wx.ma.appId>wx50ebeb95943868cd</wx.ma.appId>
+                <wx.ma.secret>c2719c261fe87b3e2d572552d2c8275d</wx.ma.secret>
                 <!--工作端小程序-->
-                <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
-                <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
+                <work.wx.ma.appId>wx6d45fd2f4dfe7ce4</work.wx.ma.appId>
+                <work.wx.ma.secret>54a30a48b100bbad20d7823cd9e1fb17</work.wx.ma.secret>
                 <!--数据分析端小程序-->
                 <analysis.wx.ma.appId>wxfa4afaa2b5f9c876</analysis.wx.ma.appId>
                 <analysis.wx.ma.secret>7db9f049c78c9a6cafa673deebe8330d</analysis.wx.ma.secret>
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
index d94a17a..3fb2f7f 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiPropertyController.java
@@ -232,7 +232,7 @@ public class ApiPropertyController {
      * @since 2020/5/13 16:10
      */
     @GetMapping("projectList")
-    public Result projectList(@LoginUser TokenDto userDetail, @RequestBody ProjectListFormDTO formDto) {
+    public Result projectList(@LoginUser TokenDto userDetail, ProjectListFormDTO formDto) {
         ValidatorUtils.validateEntity(formDto);
         return propertyService.projectList(userDetail, formDto);
     }
diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
index b61f8e3..6aed97e 100644
--- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
+++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/PropertyFeignClientFallback.java
@@ -8,6 +8,10 @@ import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO;
 import com.elink.esua.epdc.dto.group.GroupSettingStateDTO;
 import com.elink.esua.epdc.dto.group.form.*;
 import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.project.form.ProjectDetailFormDTO;
+import com.elink.esua.epdc.dto.project.form.ProjectListFormDTO;
+import com.elink.esua.epdc.dto.project.result.ProjectDetailResultDTO;
+import com.elink.esua.epdc.dto.project.result.ProjectListResultDTO;
 import com.elink.esua.epdc.dto.topic.form.*;
 import com.elink.esua.epdc.dto.topic.result.TopicDetailResultDTO;
 import com.elink.esua.epdc.dto.topic.result.TopicListResultDTO;
@@ -110,4 +114,13 @@ public class PropertyFeignClientFallback implements PropertyFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "listOfTopic", formDto);
     }
 
+    @Override
+    public Result<List<ProjectListResultDTO>> projectList(ProjectListFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectList", formDto);
+    }
+
+    @Override
+    public Result<List<ProjectDetailResultDTO>> projectDetail(ProjectDetailFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_GROUP_SERVER, "projectDetail", formDto);
+    }
 }