Browse Source

Merge remote-tracking branch 'remotes/origin/dev' into release

dev_shibei_match
jianjun 5 years ago
parent
commit
32e4f87072
  1. 2
      epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml
  2. 2
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  3. 4
      epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java
  4. 2
      epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml
  5. 2
      epmet-module/gov-voice/gov-voice-server/pom.xml
  6. 1
      epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

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

@ -3,7 +3,7 @@ services:
epmet-oss-server:
container_name: epmet-oss-server-dev
# image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.18
image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.20
ports:
- "8083:8083"
network_mode: host # 使用现有网络

2
epmet-module/epmet-oss/epmet-oss-server/pom.xml

@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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">
<modelVersion>4.0.0</modelVersion>
<version>0.3.18</version>
<version>0.3.20</version>
<parent>
<groupId>com.epmet</groupId>
<artifactId>epmet-oss</artifactId>

4
epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@ -29,6 +29,7 @@ import com.epmet.utils.ModuleConstant;
import com.google.gson.Gson;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@ -37,7 +38,6 @@ import org.springframework.web.multipart.MultipartFile;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Arrays;
import java.util.Date;
import java.util.Map;
/**
@ -48,6 +48,7 @@ import java.util.Map;
@RestController
@RequestMapping("file")
@Api(tags="文件上传")
@Slf4j
public class OssController {
@Autowired
private OssService ossService;
@ -191,6 +192,7 @@ public class OssController {
// 校验文件类型
if (!MediaType.IMAGE_PNG_VALUE.equals(file.getContentType()) && !MediaType.IMAGE_JPEG_VALUE.equals(file.getContentType())) {
log.error("uploadArticleImg file type:{} is not support 2 upload",file.getContentType() == null? null:file.getContentType());
throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
}

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

@ -2,7 +2,7 @@ version: "3.7"
services:
gov-voice-server:
container_name: gov-voice-server-dev
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.44
image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.45
ports:
- "8105:8105"
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"
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>
<version>0.3.44</version>
<version>0.3.45</version>
<parent>
<artifactId>gov-voice</artifactId>
<groupId>com.epmet</groupId>

1
epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@ -147,6 +147,7 @@
WHERE DEL_FLAG = '0'
AND (STATUS_FLAG = 'unpublish' OR STATUS_FLAG = 'auditfail')
AND CREATED_BY = #{userId}
ORDER BY CREATED_TIME DESC
</select>
<!-- 文章预览-获取文章基本属性 -->
<select id="selectDraftDetail" parameterType="java.lang.String" resultType="com.epmet.dto.result.DraftDetailResultDTO">

Loading…
Cancel
Save