Merge branches 'dev' and 'dev_heart' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_heart

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.4
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.5
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-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.0.4</version>
+    <version>0.0.5</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.72
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.73
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.72</version>
+    <version>0.0.73</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/constant/CodeConstant.java

@@ -49,6 +49,9 @@ public interface CodeConstant {
 
 	String OPER_UPLOAD = "上传代码";
 	String OPER_SUBMIT = "提交审核";
+	String OPER_SUCCESS = "审核成功";
+	String OPER_FAILED = "审核被拒绝";
+	String OPER_DELAY = "审核延后";
 	String OPER_UNDO = "审核撤回";
 	String OPER_RELEASE = "发布";
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -178,18 +178,18 @@ public class CodeServiceImpl implements CodeService {
 					if (result.getStatus() == NumConstant.ZERO) {
 						code.setStatus(CodeConstant.AUDIT_SUCCESS);
 						auditResult.setResult(CodeConstant.AUDIT_SUCCESS);
-						codeOperationHistoryService.updateDescribe(code.getId(), "审核成功");
+						saveOperation(formDTO.getCustomerId(), code.getId(), code.getUserVersion(), CodeConstant.OPER_SUCCESS, "审核成功");
 					} else if (result.getStatus() == NumConstant.ONE) {
 						code.setStatus(CodeConstant.AUDIT_FAILED);
 						auditResult.setResult(CodeConstant.AUDIT_FAILED);
 						auditResult.setReason(result.getReason());
 						auditResult.setScreenShot(result.getScreenshot());
-						codeOperationHistoryService.updateDescribe(code.getId(), result.getReason());
+						saveOperation(formDTO.getCustomerId(), code.getId(), code.getUserVersion(), CodeConstant.OPER_FAILED, result.getReason());
 					} else if (result.getStatus() == NumConstant.FOUR) {
 						code.setStatus(CodeConstant.DELAY);
 						auditResult.setResult(CodeConstant.DELAY);
 						auditResult.setReason(result.getReason());
-						codeOperationHistoryService.updateDescribe(code.getId(), "审核延后");
+						saveOperation(formDTO.getCustomerId(), code.getId(), code.getUserVersion(), CodeConstant.OPER_DELAY, result.getReason());
 					}
 					codeCustomerService.update(code);
 					codeAuditResultService.update(auditResult);
@@ -238,6 +238,7 @@ public class CodeServiceImpl implements CodeService {
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
 			codeAuditResultService.save(codeAuditResultDTO);
 		} else {
+			codeAuditResultDTO.setAuditId(wxResult.getData());
 			codeAuditResultDTO.setResult(CodeConstant.AUDITING);
 			codeAuditResultService.update(codeAuditResultDTO);
 		}
@@ -349,10 +350,10 @@ public class CodeServiceImpl implements CodeService {
 			request.setAuditId(codeAuditResultDTO.getAuditId());
 			WxMaNewsReq wxMaNewsReq = new WxMaNewsReq();
 			wxMaNewsReq.setMediaId(mediaId);
-			WxResult<WxMaNewsResult> wxAuditResult = wxMaCodeService.getMaterial(authInfo.getAuthorizerAccessToken(), wxMaNewsReq);
+			WxResult<byte[]> wxAuditResult = wxMaCodeService.getMaterial(authInfo.getAuthorizerAccessToken(), wxMaNewsReq);
-			wxAuditResult.getData().getNewsItem().forEach(news -> {
+			MultipartFile file = new MockMultipartFile("file", "QRCode.jpg", "image/jpeg", wxAuditResult.getData());
-				urlList.add(news.getUrl());
+			Result<UploadImgResultDTO> uploadResult = ossFeignClient.uploadQrCode(file);
-			});
+			urlList.add(uploadResult.getData().getUrl());
 		});
 		result.setScreenshotUrl(urlList);
 		return result;

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java

@@ -110,7 +110,7 @@ public interface WxMaCodeService {
 	 * @author zhaoqifeng
 	 * @date 2020/7/16 14:52
 	 */
-	WxResult<WxMaNewsResult> getMaterial(String accessToken, WxMaNewsReq request);
+	WxResult<byte[]> getMaterial(String accessToken, WxMaNewsReq request);
 
 	/**
 	 * 设置服务器郁闷

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.wxapi.result.*;
 import com.epmet.wxapi.service.WxMaCodeService;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.reflect.TypeToken;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -19,7 +20,9 @@ import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 描述一下
@@ -198,19 +201,16 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult<WxMaNewsResult> getMaterial(String accessToken, WxMaNewsReq request) {
+	public WxResult<byte[]> getMaterial(String accessToken, WxMaNewsReq request) {
-		WxResult<WxMaNewsResult> result = new WxResult<>();
+		WxResult<byte[]> result = new WxResult<>();
 		String url = WxMaCodeConstant.GET_MATERIAL_URL + "?" + "access_token=" + accessToken;
-		Result<String> statusResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
+		Result<byte[]> statusResult = HttpClientManager.getInstance().getByteArray(url, toMap(request));
 		if (!statusResult.success()) {
 			result.setErrorCode(statusResult.getCode());
 			result.setErrorMsg(statusResult.getMsg());
 			return result;
 		}
-		Gson gson = new Gson();
+		result.ok(statusResult.getData());
-		InputStream inputStream = gson.fromJson(statusResult.getData(), InputStream.class);
-		WxMaNewsResult newsResult = gson.fromJson(statusResult.getData(), WxMaNewsResult.class);
-		result.ok(newsResult);
 		return result;
 	}
 
@@ -279,4 +279,12 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		Gson gson = gsonBuilder.create();
 		return gson.toJson(object);
 	}
+
+	private Map<String, Object> toMap(Object object) {
+		Gson gson = new Gson();
+		if(object == null){
+			return Collections.emptyMap();
+		}
+		return gson.fromJson(toJson(object), new TypeToken<Map<String, Object>>() {}.getType());
+	}
 }

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.83
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.84
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-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.83</version>
+    <version>0.3.84</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>