Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/support/RemindTask.java

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

@@ -40,7 +40,8 @@ public class WxMeetingServiceImpl implements WxMeetingService {
 	@Autowired
 	private WxTemplateMapper wxTemplateMapper;
 
-	private final static String wechatUrl = SpringContextHolder.getDomain();
+	@Value("${smartschool.domain.wechat}")
+	private String wechatUrl;
 
 	private final static Logger LOGGER = LoggerFactory.getLogger(WxMeetingServiceImpl.class);
 	/**

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/wxschool/support/RemindTask.java

@@ -14,8 +14,8 @@ import com.usoftchina.smartschool.wechat.api.WxPushApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 
+import javax.swing.*;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,6 @@ public class RemindTask extends TimerTask {
 
     private final static String wechatUrl = SpringContextHolder.getDomain();
 
-    private final static Logger LOGGER = LoggerFactory.getLogger(RemindTask.class);
 
     private MeetingDO meetingDO;
 
@@ -79,7 +78,6 @@ public class RemindTask extends TimerTask {
                     String openid = teacherMapper.get(teacherId).getOpenid();
                     if (ObjectUtils.isNotEmpty(schoolDO)){
                         try {
-                            LOGGER.error("URL:{}" , wechatUrl);
                             wxPushApi.wxPush(schoolDO.getSchoolAppid(), schoolDO.getSchoolSecret(),openid , meeting, "您好，您有一条新的会议通知",meetingName , simpleDateFormat.format(meetingDO.getStartDate()), meetingDO.getMeetingAddress(), "-", "点击查看详情", wechatUrl + "/meet-detail/" + meetingDO.getMeetingId()+"?teacherId="+teacherId);
                         } catch (Exception e) {
                             e.printStackTrace();

frontend/wechat-web/src/modules/hiPages/meet-detail/MeetDetail.js

@@ -22,7 +22,7 @@ function SignItem(props) {
             || props.itemdata.teacherPhoto == undefined || props.itemdata.teacherPhoto == 'undefined' ? hi0_img : props.itemdata.teacherPhoto} alt="" style={{width:40,height:40,borderRadius:25}}/></div>
             {
                 props.itemdata.isRead == 3 ?
-                    <div  style={{fontSize:12,color:'#333333',marginTop:10}}> <span>{props.itemdata.teacherName}</span></div> :
+                    <div  style={{fontSize:12,color:'#999999',marginTop:10}}> <span>{props.itemdata.teacherName}</span></div> :
                     <div  style={{fontSize:12,color:'#000',marginTop:10}}> <span>{props.itemdata.teacherName}</span></div>
             }
         </div>