From dfdc7ea8de35cd0b83b7714f03c98d1e5ad46259 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 15 May 2020 16:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BE=A4=E7=BB=84=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E7=9A=84execution=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-gateway/pom.xml                              | 14 +++++++++-----
 .../com/epmet/service/impl/IssueServiceImpl.java   |  2 +-
 .../src/main/resources/mapper/IssueDao.xml         |  4 ++--
 .../java/com/epmet/aspect/RequestLogAspect.java    |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index b96276ef8a..2f1ae4827d 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -136,7 +136,8 @@
                 <!--   15、居民端个人信息            -->
                 <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
                 <!--   16、居民端楼院校组             -->
-                <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
+                <!--<gateway.routes.resi-group-server.uri>http://localhost:8095</gateway.routes.resi-group-server.uri>-->
+                 <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
                 <!--   17、党员认证、热心居民申请             -->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
                 <!--   18、政府端网格管理             -->
@@ -150,7 +151,8 @@
                 <!--  21、居民端党群e事              -->
                 <gateway.routes.resi-hall-server.uri>lb://resi-hall-server</gateway.routes.resi-hall-server.uri>
                 <!--  22、政府工作端议题管理             -->
-                <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
+                <!--<gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>-->
+                 <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
                 <!--  23、政府工作端项目管理             -->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
                 <!--  24、公共服务              -->
@@ -171,7 +173,7 @@
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>EpmEtrEdIs!q@w</spring.redis.password>
                 <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
+                <nacos.register-enabled>false</nacos.register-enabled>
                 <nacos.server-addr>192.168.10.150:8848</nacos.server-addr>
                 <nacos.discovery.namespace>67e3c350-533e-4d7c-9f8f-faf1b4aa82ae</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
@@ -208,7 +210,8 @@
                 <!--   15、居民端个人信息            -->
                 <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
                 <!--   16、居民端楼院校组             -->
-                <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>
+                <gateway.routes.resi-group-server.uri>http://localhost:8095</gateway.routes.resi-group-server.uri>
+               <!-- <gateway.routes.resi-group-server.uri>lb://resi-group-server</gateway.routes.resi-group-server.uri>-->
                 <!--   17、党员认证、热心居民申请             -->
                 <gateway.routes.resi-partymember-server.uri>lb://resi-partymember-server</gateway.routes.resi-partymember-server.uri>
                 <!--18.政府端-权限-服务-->
@@ -220,7 +223,8 @@
                 <!--  21、居民端党群e事              -->
                 <gateway.routes.resi-hall-server.uri>lb://resi-hall-server</gateway.routes.resi-hall-server.uri>
                 <!--  22、政府工作端议题管理             -->
-                <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>
+                <gateway.routes.gov-issue-server.uri>http://localhost:8101</gateway.routes.gov-issue-server.uri>
+               <!-- <gateway.routes.gov-issue-server.uri>lb://gov-issue-server</gateway.routes.gov-issue-server.uri>-->
                 <!--  23、政府工作端项目管理             -->
                 <gateway.routes.gov-project-server.uri>lb://gov-project-server</gateway.routes.gov-project-server.uri>
                 <!--  24、公共服务              -->
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 794d64760a..250d1e1a56 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -266,7 +266,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
         issueDTO.setIssueStatus(ModuleConstants.ISSUE_STATUS_VOTING);
         issueDTO.setDecidedTime(issueShiftedFromTopicFormDTO.getCreatedTime());
         int issueAffectedRow = baseDao.insertOne(issueDTO);
-        if(issueAffectedRow == 1 && StringUtils.isNotBlank(issueDTO.getId())){
+        if(issueAffectedRow == NumConstant.ONE && StringUtils.isNotBlank(issueDTO.getId())){
           //2.新增议题流程
             IssueProcessDTO issueProcessDTO = new IssueProcessDTO();
             issueProcessDTO.setIssueId(issueDTO.getId());
diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
index a783ebb88b..87245109b1 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueDao.xml
@@ -193,8 +193,8 @@
     <select id="selectVotingList" parameterType="com.epmet.dto.form.CommonIssueListFormDTO" resultType="com.epmet.dto.result.VotingIssueListResultDTO">
         SELECT
             ID AS issueId,
-            IFNULL(ISSUE_TITLE,''),
-            IFNULL(SUGGESTION,''),
+            IFNULL(ISSUE_TITLE,'') AS issueTitle,
+            IFNULL(SUGGESTION,'')AS suggestion,
             UNIX_TIMESTAMP( created_time ) AS issuePublishTime
         FROM
             issue
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/aspect/RequestLogAspect.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
index 49581cf63c..6b60f0c38c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/aspect/RequestLogAspect.java
@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletRequest;
 public class RequestLogAspect extends BaseRequestLogAspect {
 
     @Override
-    @Around(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
+    @Around(value = "execution(* com.epmet.modules.*.controller.*Controller*.*(..)) ")
     public Object proceed(ProceedingJoinPoint point) throws Throwable {
         return super.proceed(point, getRequest());
     }