From b6cca90d06025850f72e8b84286a52c0921fa771 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 00:02:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BA=BF=E7=A8=8B=E6=B1=A0?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 21 +++++++++++-------- .../src/main/resources/application-dev.yml | 4 ++-- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index ad0162d41..283375223 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -2,6 +2,7 @@ package com.iformall.controller.app; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor; +import com.alibaba.druid.support.json.JSONUtils; import com.amazonaws.services.s3.model.ObjectMetadata; import com.iformall.common.ErrorCode; import com.iformall.common.Result; @@ -24,6 +25,7 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -59,24 +61,25 @@ public class WxAppinfoController extends BaseController { private UploadController uploadController; @Autowired - private WxCouponChannelMapper wxCouponChannelMapper; + private AsyncTaskExecutor asyncTaskExecutor; - ExecutorService fixedThreadPool = Executors.newFixedThreadPool(100); + @Autowired + private WxCouponChannelMapper wxCouponChannelMapper; @ApiOperation("加载老数据二维码") @GetMapping("/updateQrCode") public void updateQrCode(String p)throws ServletException, IOException { - if("xlldxx".equals(p)) { + if("xlldxx".equals(p)){ String pageUrl = "pages/index/index"; List list = wxMerchantMapper.findQrcodeEmptyList(); - for (WxMerchant merchant : list) { - fixedThreadPool.execute(new Runnable() { + for (WxMerchant merchant:list) { + asyncTaskExecutor.execute(new Runnable() { @Override public void run() { String param = merchant.getWeappScene(); - ResultData resultData = exportQrcode(null, null, merchant.getTenantId(), 1, pageUrl, param, 0, "", "", "店铺详情", true); - Map map = (Map) resultData.data; + ResultData resultData = exportQrcode(null,null,merchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); + Map map = (Map)resultData.data; String url = map.get("url"); merchant.setQrCode(url); wxMerchantMapper.updateByPrimaryKeySelective(merchant); @@ -94,11 +97,11 @@ public class WxAppinfoController extends BaseController { List list = wxCouponChannelMapper.findQrcodeEmptyList(); for (WxCouponChannel couponChannel:list) { - fixedThreadPool.execute(new Runnable() { + asyncTaskExecutor.execute(new Runnable() { @Override public void run() { String param = couponChannel.getWeappScene(); - ResultData resultData = exportQrcode(null,null,couponChannel.getTenantId(),1,pageUrl,param,0,"","","卷",true); + ResultData resultData = exportQrcode(null,null,couponChannel.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); Map map = (Map)resultData.data; String url = map.get("url"); couponChannel.setQrCode(url); diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 004b7cf79..6127ab1fb 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -113,8 +113,8 @@ fm: exception: false exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 - open: true - upload_dir: /home/test/server/uploads/ + open: false + upload_dir: ./upload/ ueditor: config: config.json From c2decb042d103a87771019d2360a420baf20a206 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 00:02:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BA=BF=E7=A8=8B=E6=B1=A0?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/src/main/resources/application-dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index 6127ab1fb..004b7cf79 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -113,8 +113,8 @@ fm: exception: false exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com deploy: 1 - open: false - upload_dir: ./upload/ + open: true + upload_dir: /home/test/server/uploads/ ueditor: config: config.json From cb161dfea5dd582b80d9f2caff808e491bdac1fa Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 31 May 2019 00:06:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?[=E4=BA=8C=E7=BB=B4=E7=A0=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:=E9=BB=98=E8=AE=A4=E6=8F=90=E4=BE=9B=E6=97=A0?= =?UTF-8?q?=E9=99=90=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/app/WxAppinfoController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index 283375223..bb43ac8b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -119,11 +119,11 @@ public class WxAppinfoController extends BaseController { String name = (String) params.get("name"); String pageUrl = (String) params.get("pageUrl"); String sceneParam = (String) params.get("sceneParam"); - int type = 0; + int type = 1; try { type = (int) params.get("type"); } catch (Exception e) { - type = 0; + type = 1; } int withText = 0; From 9bd5b335abc0e0406e565a88f9de34cbdd524af3 Mon Sep 17 00:00:00 2001 From: luozukai Date: Fri, 31 May 2019 00:10:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?[bug][=E4=BF=AE=E6=94=B9][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=BA=BF=E7=A8=8B=E6=B1=A0?= =?UTF-8?q?]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/app/WxAppinfoController.java | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index bb43ac8b0..dfe32400b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -77,12 +77,17 @@ public class WxAppinfoController extends BaseController { asyncTaskExecutor.execute(new Runnable() { @Override public void run() { - String param = merchant.getWeappScene(); - ResultData resultData = exportQrcode(null,null,merchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); - Map map = (Map)resultData.data; - String url = map.get("url"); - merchant.setQrCode(url); - wxMerchantMapper.updateByPrimaryKeySelective(merchant); + try{ + String param = merchant.getWeappScene(); + ResultData resultData = exportQrcode(null,null,merchant.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); + Map map = (Map)resultData.data; + String url = map.get("url"); + merchant.setQrCode(url); + wxMerchantMapper.updateByPrimaryKeySelective(merchant); + }catch (Exception e){ + e.printStackTrace(); + logger.error("updateQrCode error:"+e.getMessage(),e); + } } }); } @@ -100,12 +105,17 @@ public class WxAppinfoController extends BaseController { asyncTaskExecutor.execute(new Runnable() { @Override public void run() { - String param = couponChannel.getWeappScene(); - ResultData resultData = exportQrcode(null,null,couponChannel.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); - Map map = (Map)resultData.data; - String url = map.get("url"); - couponChannel.setQrCode(url); - wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + try { + String param = couponChannel.getWeappScene(); + ResultData resultData = exportQrcode(null,null,couponChannel.getTenantId(),1,pageUrl,param,0,"","","店铺详情",true); + Map map = (Map)resultData.data; + String url = map.get("url"); + couponChannel.setQrCode(url); + wxCouponChannelMapper.updateByPrimaryKeySelective(couponChannel); + }catch (Exception e){ + e.printStackTrace(); + logger.error("updateCouponQrCode error:"+e.getMessage(),e); + } } }); }