diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatApiController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatApiController.java index 65c157a4f..abde37b2a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatApiController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatApiController.java @@ -1,5 +1,8 @@ package com.iformall.controller; +import com.iformall.common.ErrorCode; +import com.iformall.common.Result; +import com.iformall.common.ResultData; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.enums.EnumWxAuthorizationInfoType; import com.iformall.enums.EnumWxAuthorizationStatus; @@ -7,26 +10,27 @@ import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.wechat.WxOpenService; import io.swagger.annotations.Api; import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.open.api.WxOpenMaService; +import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate; +import me.chanjar.weixin.open.bean.ma.WxMaOpenCommitExtInfo; import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult; import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.List; /** * Stormeye Wu */ @Controller -@RequestMapping("/wtauth") +@RequestMapping("/wt_auth") @Api(description = "微信第三方开放平台授权相关接口") public class WechatApiController { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -39,13 +43,17 @@ public class WechatApiController { @GetMapping("/goto_auth_url_show") @ResponseBody public String gotoPreAuthUrlShow() { - return "go"; + return "" + + "" + + "go" + + "" + + ""; } @GetMapping("/goto_auth_url") public void gotoPreAuthUrl(HttpServletRequest request, HttpServletResponse response) { String host = request.getHeader("host"); - String url = "https://" + host + "/api/wtauth/jump"; + String url = "https://" + host + "/api/wt_auth/jump"; try { url = openService.getWxOpenComponentService().getPreAuthUrl(url); response.sendRedirect(url); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java new file mode 100644 index 000000000..c0d8b61d3 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -0,0 +1,43 @@ +package com.iformall.controller; + +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.service.wechat.WxOpenService; +import io.swagger.annotations.Api; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.open.api.WxOpenMaService; +import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate; +import me.chanjar.weixin.open.bean.ma.WxMaOpenCommitExtInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * Stormeye Wu + */ +@Controller +@RequestMapping("/weappCode") +@Api(description = "微信第三方开发平台-小程序模板管理") +public class WechatWeappCodeController { + private final Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private WxOpenService openService; + + @PostMapping("/codeCommit") + public ResultData codeCommit(Long templateId, String userVersion, String userDesc, WxMaOpenCommitExtInfo extInfo) { + try { + WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(extInfo.getExtAppid()); + return new ResultData(openMaService.codeCommit(templateId, userVersion, userDesc, extInfo)) ; + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(Result.ERROR); + } +} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java new file mode 100644 index 000000000..66009f661 --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappDraftTemplateController.java @@ -0,0 +1,49 @@ +package com.iformall.controller; + +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.domain.po.WxAuthorizerInfo; +import com.iformall.enums.EnumWxAuthorizationStatus; +import com.iformall.service.WxAuthorizerInfoService; +import com.iformall.service.wechat.WxOpenService; +import io.swagger.annotations.Api; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.open.api.WxOpenMaService; +import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate; +import me.chanjar.weixin.open.bean.ma.WxMaOpenCommitExtInfo; +import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult; +import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; + +/** + * Stormeye Wu + */ +@Controller +@RequestMapping("/weappDraftTemplate") +@Api(description = "微信第三方开发平台-小程序草稿模板管理") +public class WechatWeappDraftTemplateController { + private final Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private WxOpenService openService; + + + @GetMapping("/tempDraftList") + @ResponseBody + public List getTempDraftList() { + try { + return openService.getWxOpenComponentService().getTemplateDraftList(); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return null; + } +} diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java new file mode 100644 index 000000000..e8f50f04e --- /dev/null +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WechatWeappTemplateController.java @@ -0,0 +1,54 @@ +package com.iformall.controller; + +import com.iformall.common.Result; +import com.iformall.common.ResultData; +import com.iformall.service.wechat.WxOpenService; +import io.swagger.annotations.Api; +import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.open.api.WxOpenMaService; +import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate; +import me.chanjar.weixin.open.bean.ma.WxMaOpenCommitExtInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * Stormeye Wu + */ +@Controller +@RequestMapping("/weappTemplate") +@Api(description = "微信第三方开发平台-小程序模板管理") +public class WechatWeappTemplateController { + private final Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private WxOpenService openService; + + @GetMapping("/tempList") + @ResponseBody + public List getTempList() { + try { + return openService.getWxOpenComponentService().getTemplateList(); + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return null; + } + + @PostMapping("/codeCommit") + public ResultData codeCommit(String appId, Long templateId, String userVersion, String userDesc, WxMaOpenCommitExtInfo extInfo) { + try { + WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); + return new ResultData(openMaService.codeCommit(templateId, userVersion, userDesc, extInfo)) ; + } catch (WxErrorException e) { + logger.error(e.getMessage()); + } + return new ResultData(Result.ERROR); + } +}