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 @@
111
111
-
-
+ wxdd8530c5f4926766
+ 5bf4fb813145431b3493a10aa7e041e9
- wx5d3e97461d248397
- bfed51b731e53db9affb9e6131e7ae12
+
+
wx9f20a46906ab2c3e
dc13065f79429979d9f687d249eb5c4e
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 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 @@
+
+
@@ -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 @@
9063
- 2
- 47.104.224.45
- 6379
- elink@888
+ 7
+ r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
+ 10001
+ elink!888
-
+
- epdc
- elink833066
+ root
+ Abc@123456
false
- 47.104.224.45:8848
+ 115.29.142.202:8848
- a746dde3-7a13-4521-b986-7369b0b7c269
+ 305e0faa-d935-4fe1-b3a0-2634da67adb3
47.104.85.99:9876;114.215.125.123:9876
organizationGroup
@@ -173,16 +173,16 @@
10007
- 2
- 118.190.232.100
- 9603
- epdc!redis@master1405
+ 7
+ r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
+ 10001
+ elink!888
-
+
- epdc
- elink833066
+ root
+ Abc@123456
true
115.29.142.202:8848
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 @@
9065
- 2
- 118.190.232.100
- 9603
- epdc!redis@master1405
+ 7
+ r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com
+ 10001
+ elink!888
@@ -176,9 +176,9 @@
Abc@123456
false
- 47.104.224.45:8848
+ 115.29.142.202:8848
- a746dde3-7a13-4521-b986-7369b0b7c269
+ 305e0faa-d935-4fe1-b3a0-2634da67adb3