Merge branch 'dev_thirdplatform' into dev

epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java

@@ -16,7 +16,8 @@ public interface UserTokenFilter {
         //是否过期
         Claims claims = jwtTokenUtils.getClaimByToken(token);
         if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
-            throw new RenException(EpmetErrorCode.ERR401.getCode());
+//            throw new RenException(EpmetErrorCode.ERR401.getCode());
+            return null;
         }
         //获取用户ID
         String app = (String) claims.get("app");

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

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/29 13:36
+ */
+@Data
+public class CategoryResultDTO implements Serializable {
+	private static final long serialVersionUID = -5691303280428707533L;
+
+	/**
+	 * 一级类目名称
+	 */
+	private String firstClass;
+	/**
+	 * 二级类目名称
+	 */
+	private String secondClass;
+	/**
+	 * 三级类目名称
+	 */
+	private String thirdClass;
+	/**
+	 * 一级类目的ID编号
+	 */
+	private String firstId;
+	/**
+	 * 二级类目的ID编号
+	 */
+	private String secondId;
+	/**
+	 * 三级类目的ID编号
+	 */
+	private String thirdId;
+}

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

@@ -1,12 +1,10 @@
 package com.epmet.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.CodeService;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -179,4 +177,30 @@ public class CodeController {
 		String result = codeService.mediaUpload(formDTO);
 		return new Result<String>().ok(result);
 	}
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 15:45
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
+	 */
+	@PostMapping("getpage")
+	public Result<List<String>> getPage(@RequestBody CodeCommonFormDTO formDTO){
+		List<String> result = codeService.getPage(formDTO);
+		return new Result<List<String>>().ok(result);
+	}
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 15:45
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CategoryResultDTO>>
+	 */
+	@PostMapping("getcategory")
+	public Result<List<CategoryResultDTO>> getCategory(@RequestBody CodeCommonFormDTO formDTO) {
+		List<CategoryResultDTO> result = codeService.getCategory(formDTO);
+		return new Result<List<CategoryResultDTO>>().ok(result);
+	}
 }

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

@@ -1,9 +1,11 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CategoryResultDTO;
+import com.epmet.dto.result.QrCodeResultDTO;
+import com.epmet.dto.result.ReasonResultDTO;
+import com.epmet.dto.result.TemplateListResultDTO;
 
 import java.util.List;
 
@@ -118,4 +120,22 @@ public interface CodeService {
 	 * @date 2020/7/17 11:20
 	 */
 	String mediaUpload(MediaUploadFormDTO formDTO);
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 13:34
+	 * @param formDTO
+	 * @return java.util.List<java.lang.String>
+	 */
+	List<String> getPage(CodeCommonFormDTO formDTO);
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 13:34
+	 * @param formDTO
+	 * @return java.util.List<java.lang.String>
+	 */
+	List<CategoryResultDTO> getCategory(CodeCommonFormDTO formDTO);
 }

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

@@ -425,6 +425,34 @@ public class CodeServiceImpl implements CodeService {
 		}
 	}
 
+	@Override
+	public List<String> getPage(CodeCommonFormDTO formDTO) {
+		//获取上传代码信息
+		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		//调用微信API获取获取体验版二维码
+		WxResult<List<String>> wxResult = wxMaCodeService.getPage(authInfo.getAuthorizerAccessToken());
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		return wxResult.getData();
+	}
+
+	@Override
+	public List<CategoryResultDTO> getCategory(CodeCommonFormDTO formDTO) {
+		//获取上传代码信息
+		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		//调用微信API获取获取体验版二维码
+		WxResult<List<WxMaCategoryResult>> wxResult = wxMaCodeService.getCategory(authInfo.getAuthorizerAccessToken());
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		return ConvertUtils.sourceToTarget(wxResult.getData(), CategoryResultDTO.class);
+	}
+
 	private void saveOperation(String customerId, String codeId, String version, String operation, String describe) {
 		CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO();
 		operationDTO.setCustomerId(customerId);

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java

@@ -12,6 +12,7 @@ import java.io.Serializable;
  */
 @Data
 public class WxMaCategoryResult implements Serializable {
+	private static final long serialVersionUID = 2504852726988873959L;
 	/**
 	 * 一级类目名称
 	 */
@@ -37,16 +38,4 @@ public class WxMaCategoryResult implements Serializable {
 	 */
 	private String thirdId;
 
-	/**
-	 * 小程序的页面，可通过“获取小程序的第三方提交代码的页面配置”接口获得
-	 */
-	private String address;
-	/**
-	 * 小程序的标签，多个标签用空格分隔，标签不能多于10个，标签长度不超过20
-	 */
-	private String tag;
-	/**
-	 * 小程序页面的标题,标题长度不超过32
-	 */
-	private String title;
 }

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

@@ -56,7 +56,7 @@ public interface WxMaCodeService {
 	 * @param accessToken 提交审核参数
 	 * @return List<WxMaCategory>
 	 */
-	WxResult getCategory(String accessToken);
+	WxResult<List<WxMaCategoryResult>> getCategory(String accessToken);
 
 	/**
 	 * 获取小程序的第三方提交代码的页面配置（仅供第三方开发者代小程序调用）.
@@ -64,7 +64,7 @@ public interface WxMaCodeService {
 	 * @param accessToken 提交审核参数
 	 * @return page_list 页面配置列表
 	 */
-	WxResult getPage(String accessToken);
+	WxResult<List<String>> getPage(String accessToken);
 
 	/**
 	 * 将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用）.

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

@@ -97,7 +97,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult getCategory(String accessToken) {
+	public WxResult<List<WxMaCategoryResult>> getCategory(String accessToken) {
 		WxResult<List<WxMaCategoryResult>> result = new WxResult<>();
 		String url = WxMaCodeConstant.GET_CATEGORY_URL + "?" + "access_token=" + accessToken;
 		Result<String> getCategoryResult = HttpClientManager.getInstance().sendGet(url, null);
@@ -115,7 +115,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult getPage(String accessToken) {
+	public WxResult<List<String>> getPage(String accessToken) {
 		WxResult<List<String>> result = new WxResult<>();
 		String url = WxMaCodeConstant.GET_PAGE_URL + "?" + "access_token=" + accessToken;
 		Result<String> getPageResult = HttpClientManager.getInstance().sendGet(url, null);