第三方代码上传

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/HttpClientManager.java

@@ -20,7 +20,9 @@ import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
+import org.apache.http.entity.mime.HttpMultipartMode;
 import org.apache.http.entity.mime.MultipartEntityBuilder;
 import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -36,6 +38,8 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URLEncoder;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -139,11 +143,20 @@ public class HttpClientManager {
 		try {
 			HttpPost httppost = new HttpPost(url);
 			httppost.setConfig(requestConfig);
-			httppost.addHeader("Content-Type", "application/json; charset=utf-8");
+			String boundaryStr = "------------" + System.currentTimeMillis();
-			FileBody fileBody = new FileBody(file);
+			httppost.addHeader("Connection", "keep-alive");
-			HttpEntity reqEntity = MultipartEntityBuilder.create()
+			httppost.addHeader("Accept", "*/*");
-					.addPart("media", fileBody).build();
+			httppost.addHeader("Content-Type", "multipart/form-data;boundary=" + boundaryStr);
-			httppost.setEntity(reqEntity);
+			httppost.addHeader("User-Agent", "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0) ");
+			MultipartEntityBuilder meb = MultipartEntityBuilder.create();
+			meb.setBoundary(boundaryStr).setCharset(StandardCharsets.UTF_8).setMode(HttpMultipartMode.BROWSER_COMPATIBLE);
+			meb.addBinaryBody("media", file, ContentType.APPLICATION_OCTET_STREAM, file.getName());
+			HttpEntity entity = meb.build();
+			httppost.setEntity(entity);
+//			FileBody fileBody = new FileBody(file);
+//			HttpEntity reqEntity = MultipartEntityBuilder.create()
+//					.addPart("media", fileBody).build();
+//			httppost.setEntity(reqEntity);
 			return execute(httppost);
 		} catch (Exception e) {
 			log.error("send exception", e);

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/CodeOperationHistoryDTO.java

@@ -61,7 +61,7 @@ public class CodeOperationHistoryDTO implements Serializable {
     /**
      * 描述
      */
-	private String describe;
+	private String description;
 
     /**
      * 乐观锁

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/form/UploadListFormDTO.java

@@ -38,9 +38,9 @@ public class UploadListFormDTO implements Serializable {
 	/**
 	 * 页数
 	 */
-	private Integer page;
+	private Integer pageNo;
 	/**
 	 * 页面条数
 	 */
-	private Integer limit;
+	private Integer pageSize;
 }

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -135,6 +135,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-oss-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java

@@ -49,7 +49,7 @@ public class CodeController {
 	 * @date 2020/7/17 16:22
 	 */
 	@PostMapping("getextjson")
-	public Result<String> getExtJson(CodeUploadFormDTO formDTO) {
+	public Result<String> getExtJson(@RequestBody CodeUploadFormDTO formDTO) {
 		String extJson = codeService.getExtJson(formDTO);
 		return new Result<String>().ok(extJson);
 	}
@@ -175,7 +175,7 @@ public class CodeController {
 	 * @date 2020/7/17 11:20
 	 */
 	@PostMapping("mediaupload")
-	public Result<String> mediaUpload(@RequestBody MediaUploadFormDTO formDTO) {
+	public Result<String> mediaUpload(MediaUploadFormDTO formDTO) {
 		String result = codeService.mediaUpload(formDTO);
 		return new Result<String>().ok(result);
 	}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/entity/CodeOperationHistoryEntity.java

@@ -61,6 +61,6 @@ public class CodeOperationHistoryEntity extends BaseEpmetEntity {
     /**
      * 描述
      */
-	private String describe;
+	private String description;
 
 }

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

@@ -107,7 +107,7 @@ public class CodeCustomerServiceImpl extends BaseServiceImpl<CodeCustomerDao, Co
 
     @Override
     public PageData getCodeList(UploadListFormDTO formDTO) {
-        PageHelper.startPage(formDTO.getPage(), formDTO.getLimit());
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<UploadListResultDTO> list = baseDao.selectCodeList(formDTO);
         PageInfo<UploadListResultDTO> pageInfo = new PageInfo<>(list);
         return new PageData<>(list, pageInfo.getTotal());

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

@@ -13,8 +13,12 @@ import com.epmet.dao.AuthorizationInfoDao;
 import com.epmet.dao.ComponentAccessTokenDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CodeHistoryResultDTO;
+import com.epmet.dto.result.QrCodeResultDTO;
+import com.epmet.dto.result.ReasonResultDTO;
+import com.epmet.dto.result.TemplateListResultDTO;
 import com.epmet.feign.OperCrmOpenFeignClient;
+import com.epmet.feign.OssFeignClient;
 import com.epmet.service.*;
 import com.epmet.wxapi.param.WxMaCodeAuditStatusReq;
 import com.epmet.wxapi.param.WxMaCodeCommitReq;
@@ -24,8 +28,6 @@ import com.epmet.wxapi.result.*;
 import com.epmet.wxapi.service.WxMaCodeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,8 @@ public class CodeServiceImpl implements CodeService {
 	private CodeMediaService codeMediaService;
 	@Autowired
 	private CodeExtService codeExtService;
+	@Autowired
+	private OssFeignClient ossFeignClient;
 
 	@Override
 	public List<TemplateListResultDTO> templateList() {
@@ -101,7 +105,7 @@ public class CodeServiceImpl implements CodeService {
 	@Transactional(rollbackFor = Exception.class)
 	public void upload(CodeUploadFormDTO formDTO) {
 		//是否授权
-		if (customerMpService.getAuthFlag(formDTO.getCustomerId(), formDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(formDTO.getCustomerId(), formDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
 		//获取小程序调用令牌
@@ -148,6 +152,7 @@ public class CodeServiceImpl implements CodeService {
 		CodeCustomerDTO codeCustomerDTO = ConvertUtils.sourceToTarget(formDTO, CodeCustomerDTO.class);
 		codeCustomerDTO.setCustomerName(customerInfo.getData().getCustomerName());
 		codeCustomerDTO.setExtJson(formDTO.getExtJson());
+		codeCustomerDTO.setAppId(authInfo.getAuthorizerAppid());
 		codeCustomerDTO.setStatus(CodeConstant.UNAUDITED);
 		codeCustomerService.save(codeCustomerDTO);
 
@@ -158,37 +163,36 @@ public class CodeServiceImpl implements CodeService {
 	public PageData uploadList(UploadListFormDTO formDTO) {
 		//获取小程序调用令牌
 		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(formDTO.getCustomerId(), formDTO.getClientType());
-		if (null == authInfo) {
+		if (null != authInfo) {
-			throw new RenException("未授权");
+			List<CodeCustomerDTO> auditingList = codeCustomerService.getAuditingCodeList();
-		}
+			auditingList.forEach(code -> {
-		List<CodeCustomerDTO> auditingList = codeCustomerService.getAuditingCodeList();
+				//获取审核结果信息
-		auditingList.forEach(code -> {
+				CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(code.getId());
-			//获取审核结果信息
+				//调用微信API获取最新审核状态
-			CodeAuditResultDTO auditResult = codeAuditResultService.getAuditResultByCodeId(code.getId());
+				WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq();
-			//调用微信API获取最新审核状态
+				request.setAuditId(auditResult.getAuditId());
-			WxMaCodeAuditStatusReq request = new WxMaCodeAuditStatusReq();
+				WxResult<WxMaAuditStatusResult> wxAuditResult = wxMaCodeService.getAuditStatus(authInfo.getAuthorizerAccessToken(), request);
-			request.setAuditId(auditResult.getAuditId());
+				if (wxAuditResult.success()) {
-			WxResult<WxMaAuditStatusResult> wxAuditResult = wxMaCodeService.getAuditStatus(authInfo.getAuthorizerAccessToken(), request);
+					WxMaAuditStatusResult result = wxAuditResult.getData();
-			if (wxAuditResult.success()) {
+					if (result.getStatus() == NumConstant.ZERO) {
-				WxMaAuditStatusResult result = wxAuditResult.getData();
+						code.setStatus(CodeConstant.AUDIT_SUCCESS);
-				if (result.getStatus() == NumConstant.ZERO) {
+						auditResult.setResult(CodeConstant.AUDIT_SUCCESS);
-					code.setStatus(CodeConstant.AUDIT_SUCCESS);
+						codeOperationHistoryService.updateDescribe(code.getId(), "审核成功");
-					auditResult.setResult(CodeConstant.AUDIT_SUCCESS);
+					} else if (result.getStatus() == NumConstant.ONE) {
-					codeOperationHistoryService.updateDescribe(code.getId(), "审核成功");
+						code.setStatus(CodeConstant.AUDIT_FAILED);
-				} else if (result.getStatus() == NumConstant.ONE) {
+						auditResult.setResult(CodeConstant.AUDIT_FAILED);
-					code.setStatus(CodeConstant.AUDIT_FAILED);
+						auditResult.setReason(result.getReason());
-					auditResult.setResult(CodeConstant.AUDIT_FAILED);
+						codeOperationHistoryService.updateDescribe(code.getId(), result.getReason());
-					auditResult.setReason(result.getReason());
+					} else if (result.getStatus() == NumConstant.FOUR) {
-					codeOperationHistoryService.updateDescribe(code.getId(), result.getReason());
+						code.setStatus(CodeConstant.DELAY);
-				} else if (result.getStatus() == NumConstant.FOUR) {
+						auditResult.setResult(CodeConstant.DELAY);
-					code.setStatus(CodeConstant.DELAY);
+						codeOperationHistoryService.updateDescribe(code.getId(), "审核延后");
-					auditResult.setResult(CodeConstant.DELAY);
+					}
-					codeOperationHistoryService.updateDescribe(code.getId(), "审核延后");
+					codeCustomerService.update(code);
+					codeAuditResultService.update(auditResult);
 				}
-				codeCustomerService.update(code);
+			});
-				codeAuditResultService.update(auditResult);
+		}
-			}
-		});
 		return codeCustomerService.getCodeList(formDTO);
 	}
 
@@ -197,7 +201,7 @@ public class CodeServiceImpl implements CodeService {
 		//获取上传代码信息
 		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
 		//是否授权
-		if (customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
 		//获取小程序调用令牌
@@ -232,7 +236,7 @@ public class CodeServiceImpl implements CodeService {
 		//获取上传代码信息
 		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
 		//是否授权
-		if (customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
 		//获取审核结果信息
@@ -277,7 +281,7 @@ public class CodeServiceImpl implements CodeService {
 		//获取上传代码信息
 		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
 		//是否授权
-		if (customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
 		//获取小程序调用令牌
@@ -308,7 +312,7 @@ public class CodeServiceImpl implements CodeService {
 		//获取上传代码信息
 		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
 		//是否授权
-		if (customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
 		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
@@ -343,7 +347,7 @@ public class CodeServiceImpl implements CodeService {
 		//获取上传代码信息
 		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
 		//是否授权
-		if (customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
+		if (!customerMpService.getAuthFlag(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType())) {
 			throw new RenException("未授权");
 		}
 		//获取小程序调用令牌
@@ -383,7 +387,7 @@ public class CodeServiceImpl implements CodeService {
 			CodeMediaDTO codeMediaDTO = new CodeMediaDTO();
 			codeMediaDTO.setCodeId(formDTO.getCodeId());
 			codeMediaDTO.setMediaId(wxResult.getData().getMediaId());
-			codeMediaDTO.setMediaName(formDTO.getMedia().getName());
+			codeMediaDTO.setMediaName(formDTO.getMedia().getOriginalFilename());
 			codeMediaDTO.setMediaType(wxResult.getData().getType());
 			codeMediaService.save(codeMediaDTO);
 			return wxResult.getData().getMediaId();
@@ -399,7 +403,7 @@ public class CodeServiceImpl implements CodeService {
 		operationDTO.setCodeId(codeId);
 		operationDTO.setVersion(version);
 		operationDTO.setOperation(operation);
-		operationDTO.setDescribe(describe);
+		operationDTO.setDescription(describe);
 		codeOperationHistoryService.save(operationDTO);
 	}
 

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

@@ -143,4 +143,11 @@ public interface WxMaCodeConstant {
      * 新增临时素材
      */
     String MEDIA_UPLOAD_URL = "https://api.weixin.qq.com/wxa/setwebviewdomain";
+
+    /**
+     * 新增临时素材
+     */
+    String GET_TEMPLATE_URL = "https://api.weixin.qq.com/wxa/gettemplatelist";
+
+
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/param/WxMaDomainDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.wxapi.param;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/17 17:44
+ */
+@Data
+@Component
+@ConfigurationProperties(prefix = "third.domain")
+public class WxMaDomainDTO {
+	private List<String> requestDomain;
+	private List<String> wsRequestDomain;
+	private List<String> uploadDomain;
+	private List<String> downloadDomain;
+	private List<String> webviewDomain;
+}

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

@@ -11,6 +11,7 @@ import com.epmet.wxapi.service.WxMaCodeService;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -18,6 +19,8 @@ import java.io.File;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -30,21 +33,14 @@ import java.util.List;
 public class WxMaCodeServiceImpl implements WxMaCodeService {
 	private static final String ERR_CODE = "errcode";
 	private static final String ERR_MSG = "errmsg";
-	@Value("${third.domain.requestdomain}")
+
-	private List<String> requestDomain;
+	@Autowired
-	@Value("${third.domain.wsrequestdomain}")
+	private WxMaDomainDTO wxMaDomainDTO;
-	private List<String> wsRequestDomain;
-	@Value("${third.domain.uploaddomain}")
-	private List<String> uploadDomain;
-	@Value("${third.domain.downloaddomain}")
-	private List<String> downloadDomain;
-	@Value("${third.domain.webviewdomain}")
-	private List<String> webviewDomain;
 
 	@Override
 	public WxResult<List<WxMaTemplateResult>> getTemplateList(String accessToken) {
 		WxResult<List<WxMaTemplateResult>> result = new WxResult<>();
-		String url = WxMaCodeConstant.COMMIT_URL + "?" + "access_token=" + accessToken;
+		String url = WxMaCodeConstant.GET_TEMPLATE_URL + "?" + "access_token=" + accessToken;
 		Result<String> templateListResult = HttpClientManager.getInstance().sendGet(url, null);
 		if (!templateListResult.success()) {
 			result.setErrorCode(templateListResult.getCode());
@@ -54,7 +50,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		Gson gson = new Gson();
 		WxMaTemplateListResult templateList = gson.fromJson(templateListResult.getData(), WxMaTemplateListResult.class);
 		result.setErrorCode(templateList.getErrCode());
-		result.setErrorMsg(templateList.getErrMsg());
+		result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(templateList.getErrCode()));
 		result.setData(templateList.getTemplateList());
 		return result;
 	}
@@ -224,10 +220,10 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		String url = WxMaCodeConstant.MODIFY_DOMAIN_URL + "?" + "access_token=" + accessToken;
 		WxMaModifyDomainReq request = new WxMaModifyDomainReq();
 		request.setAction("set");
-		request.setRequestDomain(requestDomain);
+		request.setRequestDomain(wxMaDomainDTO.getRequestDomain());
-		request.setUploadDomain(uploadDomain);
+		request.setUploadDomain(wxMaDomainDTO.getUploadDomain());
-		request.setWsRequestDomain(wsRequestDomain);
+		request.setWsRequestDomain(wxMaDomainDTO.getWsRequestDomain());
-		request.setDownloadDomain(downloadDomain);
+		request.setDownloadDomain(wxMaDomainDTO.getDownloadDomain());
 		Result<String> modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
 		if (!modifyResult.success()) {
 			result.setErrorCode(modifyResult.getCode());
@@ -246,7 +242,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 		String url = WxMaCodeConstant.SET_WEBVIEW_DOMAIN_URL + "?" + "access_token=" + accessToken;
 		WxMaSetWebviewDomainReq request = new WxMaSetWebviewDomainReq();
 		request.setAction("set");
-		request.setWebViewDomain(webviewDomain);
+		request.setWebViewDomain(wxMaDomainDTO.getWebviewDomain());
 		Result<String> modifyResult = HttpClientManager.getInstance().sendPostByJSON(url, toJson(request));
 		if (!modifyResult.success()) {
 			result.setErrorCode(modifyResult.getCode());

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -105,8 +105,13 @@ third:
     aesKey: d6dbde92c67e11eabac1c03fd56f7847qazxswedcvg
     token: 1ae5f230c67f11eabac1c03fd56f7847
   domain:
-    requestdomain: "https://epmet-cloud.elinkservice.cn"
+    requestDomain:
-    wsrequestdomain: "https://epmet-cloud.elinkservice.cn"
+      - https://epmet-cloud.elinkservice.cn
-    uploaddomain: "https://epmet-cloud.elinkservice.cn"
+    wsRequestDomain:
-    downloaddomain: "https://epmet-cloud.elinkservice.cn"
+      - https://epmet-cloud.elinkservice.cn
-    webviewdomain: "https://epmet-cloud.elinkservice.cn"
+    uploadDomain:
+      - https://epmet-cloud.elinkservice.cn
+    downloadDomain:
+      - https://epmet-cloud.elinkservice.cn
+    webviewDomain:
+      - https://epmet-cloud.elinkservice.cn

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeCustomerDao.xml

@@ -31,8 +31,8 @@
                cc.USER_VERSION AS "version",
                cc.USER_DESC AS "codeInfo",
                cc.STATUS,
-               DATE_FORMAT(cc.CREATED_TIME,'%Y-%m-%d') AS "uploadTime",
+               DATE_FORMAT(cc.CREATED_TIME,'%Y-%m-%d %T') AS "uploadTime",
-               IFNULL(DATE_FORMAT(car.CREATED_TIME,'%Y-%m-%d'),'') AS "auditTime",
+               IFNULL(DATE_FORMAT(car.CREATED_TIME,'%Y-%m-%d %T'),'') AS "auditTime",
                car.AUDIT_ID
         FROM code_customer cc
         LEFT JOIN code_audit_result car ON cc.ID = car.CODE_ID AND car.DEL_FLAG = '0'

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/CodeOperationHistoryDao.xml

@@ -9,7 +9,7 @@
         <result property="codeId" column="CODE_ID"/>
         <result property="version" column="VERSION"/>
         <result property="operation" column="OPERATION"/>
-        <result property="describe" column="DESCRIBE"/>
+        <result property="description" column="DESCRIPTION"/>
         <result property="revision" column="REVISION"/>
         <result property="delFlag" column="DEL_FLAG"/>
         <result property="createdBy" column="CREATED_BY"/>
@@ -19,7 +19,7 @@
     </resultMap>
     <update id="updateDescribeByCodeId">
         UPDATE code_operation_history SET
-            `DESCRIBE` = #{describe}
+            `DESCRIPTION` = #{description}
         WHERE CODE_ID = #{codeId}
         AND OPERATION = 'audit'
     </update>
@@ -28,7 +28,7 @@
             DATE_FORMAT(coh.CREATED_TIME, '%Y-%m-%d') AS "operationTime",
             coh.VERSION,
             coh.OPERATION,
-            coh.`DESCRIBE`
+            coh.`DESCRIPTION`
         FROM code_operation_history coh
         INNER JOIN code_customer cc ON coh.CODE_ID = cc.ID
         WHERE

epmet-module/epmet-third/epmet-third-server/src/main/resources/mapper/ComponentAccessTokenDao.xml

@@ -28,7 +28,7 @@
             COMPONENT_ACCESS_TOKEN
         FROM
             component_access_token
-        WHERE delFlag = '0'
+        WHERE DEL_FLAG = '0'
     </select>
 
     <!-- 查询component_access_token 数量 -->

epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/feign/OperCrmOpenFeignClient.java

@@ -21,6 +21,6 @@ public interface OperCrmOpenFeignClient {
 	 * @param dto
 	 * @return
 	 */
-	@PostMapping("/oper/crm/getcostomerInfo")
+	@PostMapping("/oper/crm/customer/getcostomerInfo")
 	Result<CustomerDTO> getCustomerInfo(CustomerDTO dto);
 }