|
@@ -7,17 +7,25 @@ import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
|
|
|
import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
|
|
|
import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
|
|
|
import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
+import com.fs.course.config.CourseMaConfig;
|
|
|
+import com.fs.system.domain.SysConfig;
|
|
|
+import com.fs.system.mapper.SysConfigMapper;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Maps;
|
|
|
+import jodd.util.StringUtil;
|
|
|
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
|
|
|
import me.chanjar.weixin.common.error.WxErrorException;
|
|
|
import me.chanjar.weixin.common.error.WxRuntimeException;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.boot.context.properties.EnableConfigurationProperties;
|
|
|
+import org.springframework.context.annotation.ComponentScan;
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
|
import javax.annotation.PostConstruct;
|
|
|
import java.io.File;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -25,15 +33,36 @@ import java.util.stream.Collectors;
|
|
|
|
|
|
@Configuration
|
|
|
@EnableConfigurationProperties(WxMaProperties.class)
|
|
|
+@ComponentScan("com.fs.system.mapper")
|
|
|
public class WxMaConfiguration {
|
|
|
private final WxMaProperties properties;
|
|
|
|
|
|
private static final Map<String, WxMaMessageRouter> routers = Maps.newHashMap();
|
|
|
private static Map<String, WxMaService> maServices;
|
|
|
|
|
|
- @Autowired
|
|
|
+/* @Autowired
|
|
|
public WxMaConfiguration(WxMaProperties properties) {
|
|
|
this.properties = properties;
|
|
|
+ }*/
|
|
|
+ @Autowired
|
|
|
+ public WxMaConfiguration(SysConfigMapper sysConfigMapper) {
|
|
|
+
|
|
|
+ WxMaProperties wx = new WxMaProperties();
|
|
|
+ List<WxMaProperties.Config> c = new ArrayList<>();
|
|
|
+ //看课小程序加载
|
|
|
+ SysConfig sysConfig3 = sysConfigMapper.selectConfigByConfigKey("courseMa.config");
|
|
|
+ List<CourseMaConfig> courseMaConfigs = JSON.parseArray(sysConfig3.getConfigValue(), CourseMaConfig.class);
|
|
|
+ if (courseMaConfigs!=null&& !courseMaConfigs.isEmpty()){
|
|
|
+ for (CourseMaConfig courseMaConfig : courseMaConfigs) {
|
|
|
+ if (courseMaConfig.getType() != null && courseMaConfig.getType().equals("1")){
|
|
|
+ WxMaProperties.Config wxMaConfig = new WxMaProperties.Config();
|
|
|
+ BeanUtils.copyProperties(courseMaConfig, wxMaConfig);
|
|
|
+ c.add(wxMaConfig);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ wx.setConfigs(c);
|
|
|
+ this.properties = wx;
|
|
|
}
|
|
|
|
|
|
public static WxMaService getMaService(String appid) {
|