Commit 55fa55dd by guojuxing

Merge remote-tracking branch 'origin/developer' into developer

parents 0f17131f 970bad1a
......@@ -233,15 +233,15 @@ public class QrcodeController {
}
@RequestMapping("take-applet-qrcode")
public RestResponse takeAppletQrcode(String appkey, Integer pathId){
public RestResponse takeAppletQrcode(String appkey, Integer pageId){
String path = "pages/customView/customView";
byte[] appletQrcode = this.createAppletQrcode(appkey, path);
byte[] appletQrcode = this.createAppletQrcode(appkey, path, pageId+"");
UploadResult uploadResult = QQCloudPicUtils.uploadLocalPicStream("pic01", "", appletQrcode);
Map<String, Object> pic = new HashMap<>();
pic.put("fileId", uploadResult.getFileId());
pic.put("url", uploadResult.getUrl());
pic.put("downloadUrl", uploadResult.getDownloadUrl());
pic.put("path", path+"?pageId="+pathId);
pic.put("path", path+"?pageId="+pageId);
return RestResponse.success(pic);
}
......@@ -249,7 +249,7 @@ public class QrcodeController {
@IgnoreLogin
public RestResponse takeStoreQrcode(String appkey, Integer id, Integer qrcodeType){
String path = "pages/index/index?qrcodeParam="+id+"&qrcodeType="+qrcodeType;
byte[] appletQrcode = this.createAppletQrcode(appkey, path);
byte[] appletQrcode = this.createAppletQrcode(appkey, path, id+"");
UploadResult uploadResult = QQCloudPicUtils.uploadLocalPicStream("pic01", "", appletQrcode);
Map<String, Object> pic = new HashMap<>();
pic.put("fileId", uploadResult.getFileId());
......@@ -313,7 +313,7 @@ public class QrcodeController {
appletPath += "?qrcodeParam="+qrcodeId;
String[] appletArr = dto.getAppletIds().split(",");
for (String s : appletArr) {
byte[] appletQrcode = createAppletQrcode(s, appletPath);
byte[] appletQrcode = createAppletQrcode(s, appletPath, "");
if(appletQrcode != null){
ZipEntry e = new ZipEntry(content.getTitle() + File.separator + s + File.separator + content.getTitle() + ".jpg");
zipOutputStream.putNextEntry(e);
......@@ -356,8 +356,8 @@ public class QrcodeController {
return null;
}
private byte[] createAppletQrcode(String appkey, String path){
ServiceResponse<Map<String, Object>> wxaQrcode = this.weixinWxaFunService.getWxaCodeUnlimit(appkey, path, "31");
private byte[] createAppletQrcode(String appkey, String path, String scene){
ServiceResponse<Map<String, Object>> wxaQrcode = this.weixinWxaFunService.getWxaCodeUnlimit(appkey, path, scene);
if(wxaQrcode.isSuccess()){
Map<String, Object> result = wxaQrcode.getResult();
return (byte[]) result.get("content");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment