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