Merge remote-tracking branch 'origin/dev'

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/basic/service/impl/WxMeetingServiceImpl.java

@@ -2,6 +2,7 @@ package com.usoftchina.smartschool.school.wxschool.basic.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.usoftchina.smartschool.context.SpringContextHolder;
 import com.usoftchina.smartschool.school.po.*;
 import com.usoftchina.smartschool.school.wxschool.basic.service.WxMeetingService;
 import com.usoftchina.smartschool.school.wxschool.mapper.*;
@@ -39,8 +40,7 @@ public class WxMeetingServiceImpl implements WxMeetingService {
 	@Autowired
 	private WxTemplateMapper wxTemplateMapper;
 
-	@Value("${smartschool.domain.wechat}")
-	private String wechatUrl;
+	private final static String wechatUrl = SpringContextHolder.getDomain();
 
 	private final static Logger LOGGER = LoggerFactory.getLogger(WxMeetingServiceImpl.class);
 	/**