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

居民端小程序接口事件添加语音时长

feature/dangjian
wanggongfeng 4 years ago
parent
594229c9b8
commit
ddc324e523
6 changed files with 51 additions and 41 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
  2. 4
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
  3. 8
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
  4. 14
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
  5. 32
      esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
  6. 26
      esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml

8
esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml
View File

@ -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>

4
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
View File

@ -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:

8
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/events/result/EventAppDetailResultDTO.java
View File

@ -41,6 +41,14 @@ public class EventAppDetailResultDTO implements Serializable {
* 图片
*/
private List<String> images;
/**
* 语音
*/
private String voice;
/**
* 时长
*/
private String duration;
/**
* 事件地址
*/

14
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/events/EpdcEventsDao.xml
View File

@ -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}

32
esua-epdc/epdc-module/epdc-group/epdc-group-server/pom.xml
View File

@ -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>

26
esua-epdc/epdc-module/epdc-oss/epdc-oss-server/pom.xml
View File

@ -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>

Write Preview
Loading…
Cancel
Save