| @@ -11,6 +11,7 @@ import com.iformall.enums.EnumAppType; | |||||
| import com.iformall.service.WxAppinfoService; | import com.iformall.service.WxAppinfoService; | ||||
| import com.iformall.service.wechat.FmOpenService; | import com.iformall.service.wechat.FmOpenService; | ||||
| import com.iformall.utils.Constant; | import com.iformall.utils.Constant; | ||||
| import com.iformall.utils.MaUtil; | |||||
| import com.iformall.utils.QRCodeUtils; | import com.iformall.utils.QRCodeUtils; | ||||
| import io.swagger.annotations.ApiImplicitParam; | import io.swagger.annotations.ApiImplicitParam; | ||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| @@ -36,6 +37,9 @@ import java.util.Map; | |||||
| public class WxAppinfoController extends BaseController { | public class WxAppinfoController extends BaseController { | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | private final Logger logger = LoggerFactory.getLogger(this.getClass()); | ||||
| @Autowired | |||||
| private boolean isFmOpen; | |||||
| @Autowired | @Autowired | ||||
| private WxAppinfoService wxAppinfoService; | private WxAppinfoService wxAppinfoService; | ||||
| @@ -134,7 +138,12 @@ public class WxAppinfoController extends BaseController { | |||||
| boolean isHyaline = true; | boolean isHyaline = true; | ||||
| WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); | WxMaCodeLineColor color = new WxMaCodeLineColor("0", "0", "0"); | ||||
| WxMaService wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId()); | |||||
| WxMaService wxMaService; | |||||
| if(isFmOpen) { | |||||
| wxMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appinfo.getAppId()); | |||||
| } else { | |||||
| wxMaService = MaUtil.getWeappService(appinfo); | |||||
| } | |||||
| String pathStr = ""; | String pathStr = ""; | ||||
| if (StringUtils.isNotBlank(sceneParam)) { | if (StringUtils.isNotBlank(sceneParam)) { | ||||