Browse Source

Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

master
wxz 5 years ago
parent
commit
b81efa3fc7
  1. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  3. 5
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java
  4. 2
      epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

2
epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@ -2,7 +2,7 @@ version: "3.7"
services: services:
gov-voice-server: gov-voice-server:
container_name: gov-voice-server-dev container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.53 image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.54
ports: ports:
- "8105:8105" - "8105:8105"
network_mode: host # 使用现有网络 network_mode: host # 使用现有网络

2
epmet-module/gov-voice/gov-voice-server/pom.xml

@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>0.3.53</version> <version>0.3.54</version>
<parent> <parent>
<artifactId>gov-voice</artifactId> <artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId> <groupId>com.epmet</groupId>

5
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java

@ -71,4 +71,9 @@ public interface DraftConstant {
* 草稿预览内容大小长度 * 草稿预览内容大小长度
*/ */
Integer PREVIEW_CONTENT_MAX_LENGTH = 50; Integer PREVIEW_CONTENT_MAX_LENGTH = 50;
/**
* 草稿预览内容超过50 添加...
*/
String PREVIEW_CONTENT_MORE = "...";
} }

2
epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@ -227,7 +227,7 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
if (DraftConstant.TEXT.equals(fromDTO.getContentList().get(i).getContentType())) { if (DraftConstant.TEXT.equals(fromDTO.getContentList().get(i).getContentType())) {
content = fromDTO.getContentList().get(i).getContent(); content = fromDTO.getContentList().get(i).getContent();
if (content.length() > DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) { if (content.length() > DraftConstant.PREVIEW_CONTENT_MAX_LENGTH) {
content = content.substring(NumConstant.ZERO, DraftConstant.PREVIEW_CONTENT_MAX_LENGTH); content = content.substring(NumConstant.ZERO, DraftConstant.PREVIEW_CONTENT_MAX_LENGTH).concat(DraftConstant.PREVIEW_CONTENT_MORE);
} }
break; break;
} }

Loading…
Cancel
Save