From ddc324e5239b3733c4309088afa3e28849cf4a34 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Mon, 21 Feb 2022 14:16:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=A5=E5=8F=A3=E4=BA=8B=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-api/epdc-api-server/pom.xml          |  8 ++---
 .../src/main/resources/application.yml        |  4 +--
 .../result/EventAppDetailResultDTO.java       |  8 +++++
 .../resources/mapper/events/EpdcEventsDao.xml | 14 ++++----
 .../epdc-group/epdc-group-server/pom.xml      | 32 +++++++++----------
 .../epdc-oss/epdc-oss-server/pom.xml          | 26 +++++++--------
 6 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
index a183e27ff..69b8f93da 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
@@ -243,11 +243,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>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>wx5d3e97461d248397</wx.ma.appId>-->
+                <!--<wx.ma.secret>bfed51b731e53db9affb9e6131e7ae12</wx.ma.secret>-->
                 <!--工作端小程序-->
                 <work.wx.ma.appId>wx9f20a46906ab2c3e</work.wx.ma.appId>
                 <work.wx.ma.secret>dc13065f79429979d9f687d249eb5c4e</work.wx.ma.secret>
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
index 2554eb8a4..93f5e24de 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
@@ -71,8 +71,8 @@ spring:
     multipart:
       enabled: true
       file-size-threshold: 0
-      max-file-size: 10MB
-      max-request-size: 10MB
+      max-file-size: 1024MB
+      max-request-size: 1024MB
 
 management:
   endpoints:
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
index 821393af2..c3823c689 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
@@ -41,6 +41,14 @@ public class EventAppDetailResultDTO implements Serializable {
      * 图片
      */
     private List<String> images;
+    /**
+     * 语音
+     */
+    private String voice;
+    /**
+     * 时长
+     */
+    private String duration;
     /**
      * 事件地址
      */
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
index 7f9908df4..497d79cb3 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
@@ -274,6 +274,8 @@
         <result property="nickname" column="NICK_NAME"/>
         <result property="avatar" column="USER_FACE"/>
         <result property="partyFlag" column="IS_PARTY_MEMBER"/>
+        <result property="voice" column="VOICE"/>
+        <result property="duration" column="DURATION"/>
         <collection property="images" ofType="java.lang.String">
             <result property="image" column="IMG_URL"/>
         </collection>
@@ -288,12 +290,12 @@
             eve.NICK_NAME,
             eve.USER_FACE,
             eve.IS_PARTY_MEMBER,
-            img.IMG_URL
-        FROM
-            epdc_events eve
-            LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID
-            AND img.DEL_FLAG = '0'
-            AND img.IMG_TYPE = 'events'
+            img.IMG_URL,
+            iii.IMG_URL as VOICE,
+            iii.DURATION
+        FROM epdc_events eve
+            LEFT JOIN epdc_img img ON eve.ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events'
+            LEFT JOIN epdc_img iii ON eve.ID = iii.REFERENCE_ID AND iii.DEL_FLAG = '0' AND iii.IMG_TYPE = 'eventsVoice'
         WHERE
             eve.DEL_FLAG = '0'
             AND eve.ID = #{eventId}
diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
index 1accf8eb6..a92268bdd 100644
--- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
@@ -128,21 +128,21 @@
 
                 <server.port>9063</server.port>
 
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>47.104.224.45</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>elink@888</spring.redis.password>
+                <spring.redis.index>7</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.232.100:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>a746dde3-7a13-4521-b986-7369b0b7c269</nacos.namespace>
+                <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
                 <!--RocketMQ-->
                 <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
                 <rocketmq.consumer.group>organizationGroup</rocketmq.consumer.group>
@@ -173,16 +173,16 @@
 
                 <server.port>10007</server.port>
 
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>118.190.232.100</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>7</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.232.100:3308/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
diff --git a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
index 6cfd9dc96..a42e28815 100644
--- a/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
@@ -164,10 +164,10 @@
 
                 <server.port>9065</server.port>
 
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>118.190.232.100</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>7</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
                     <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -176,9 +176,9 @@
                 <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
 
                 <nacos.register-enabled>false</nacos.register-enabled>
-                <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
-                <nacos.namespace>a746dde3-7a13-4521-b986-7369b0b7c269</nacos.namespace>
+                <nacos.namespace>305e0faa-d935-4fe1-b3a0-2634da67adb3</nacos.namespace>
                 <fastdfs.server-addr></fastdfs.server-addr>
             </properties>
             <!--<properties>
@@ -198,16 +198,16 @@
 
                 <server.port>10032</server.port>
 
-                <spring.redis.index>2</spring.redis.index>
-                <spring.redis.host>118.190.232.100</spring.redis.host>
-                <spring.redis.port>9603</spring.redis.port>
-                <spring.redis.password>epdc!redis@master1405</spring.redis.password>
+                <spring.redis.index>7</spring.redis.index>
+                <spring.redis.host>r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com</spring.redis.host>
+                <spring.redis.port>10001</spring.redis.port>
+                <spring.redis.password>elink!888</spring.redis.password>
 
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://118.190.232.100:3308/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-bp1l2b53j508j1176xo.mysql.rds.aliyuncs.com:3306/esua_epdc_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
-                <spring.datasource.druid.password>elink833066</spring.datasource.druid.password>
+                <spring.datasource.druid.username>root</spring.datasource.druid.username>
+                <spring.datasource.druid.password>Abc@123456</spring.datasource.druid.password>
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>115.29.142.202:8848</nacos.server-addr>