将邮件需要的常量提到配置文件中，修改邮件发送列表的获取参数

liwei2917
1 parent 877f22a0
Showing 3 changed files with 26 additions and 12 deletions
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/EmailServiceImpl.java
src/main/resources/application.properties
@@ -23,6 +23,7 @@ import com.cnlive.shenhe.utils.InfoUtil;
 import com.cnlive.shenhe.utils.OpenUtil;
 import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +41,12 @@ public class LiveApplyJob {
     private static Logger logger = LoggerFactory.getLogger(LiveApplyJob.class);
     @Value("${spring.localhost.url}")
 	private String localhost_url;//本机地址
+    @Value("${email_app_id}")
+    private String email_app_id;//开发者对应的id，与app_key相对应
+    @Value("${email_app_key}")
+    private String email_app_key;//开发者帐号对应的key. 请开发者谨慎保管此值。
+    @Value("${email_send_URL}")
+    private String email_send_URL;//调用邮件发送服务器的地址
     @Autowired
     SitesServiceImpl sitesService;
@@ -78,16 +85,16 @@ public class LiveApplyJob {
     @Scheduled(fixedRate = 60 * 1000)
     public void liveApplyNotice() {
     	Example example = new Example(ShyLiveapply.class);
-        Example.Criteria criteria = example.createCriteria();
+        Criteria criteria = example.createCriteria();
         criteria.andEqualTo("shenhe_state", CommonConst.AUDIT_SUCCESS);
-        criteria.andNotEqualTo("notice_jishu", CommonConst.NOTICE_SUCCESS);//状态不等于已通知
+        criteria.andNotEqualTo("email_notice_state", CommonConst.NOTICE_SUCCESS);//状态不等于已通知
         List<ShyLiveapply> shyLiveApplyList = shyLiveApplyMapper.selectByExample(example);
          if (shyLiveApplyList.size() > 0) {
-        	logger.info("直播申请邮件通知开始，共"+shyLiveApplyList.size()+"个");
-        	String app_id = "769_jetja50p18"; //开发者对应的id，与app_key相对应
-        	String app_key = "ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba"; //开发者帐号对应的key. 请开发者谨慎保管此值。
-        	String URL = "http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action";//调用邮件发送服务器的地址
+        	String app_id = email_app_id; //开发者对应的id，与app_key相对应
+        	String app_key = email_app_key; //开发者帐号对应的key. 请开发者谨慎保管此值。
+        	String URL = email_send_URL;//调用邮件发送服务器的地址
         	List<String> shyEmailList=emailServiceImpl.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
+        	logger.info("直播申请邮件通知开始，共"+shyLiveApplyList.size()+"个申请，每个申请通知"+shyEmailList.size()+"个邮箱");
         	for(ShyLiveapply liveApply : shyLiveApplyList){
         		Integer notice_state = liveApply.getEmail_notice_state();//初始化通知状态
         		String notice_msg = liveApply.getEmail_notice_msg();//初始化通知消息
@@ -120,15 +120,17 @@ public class EmailServiceImpl {
 	 * @return
 	 */
 	public List<String> getEmailSendList(Integer emailSendType) {
-		
-		List<ShyEmail> shyEmailList = shyEmailMapper.selectAll();
+		ShyEmail shyEmail= new ShyEmail();
+		shyEmail.setIs_delete(false);
+		shyEmail.setIs_enable(true);
+		List<ShyEmail> shyEmailList = shyEmailMapper.select(shyEmail);
         List<String> emailList = new ArrayList<String>();
-        for (ShyEmail shyEmail : shyEmailList) {
-            if (CommonUtils.isNotEmpty(shyEmail.getNotice_type())) {
-                String[] business = shyEmail.getNotice_type().split(",");
+        for (ShyEmail shyEmail2 : shyEmailList) {
+            if (CommonUtils.isNotEmpty(shyEmail2.getNotice_type())) {
+                String[] business = shyEmail2.getNotice_type().split(",");
                 List<String> asList = Arrays.asList(business);
                 if (asList.contains(emailSendType + "")) {
-                	emailList.add(shyEmail.getEmail());
+                	emailList.add(shyEmail2.getEmail());
                 }
             }
         }
@@ -64,6 +64,11 @@ avsmple_callback=http://test.shen.cnlive.com/api/avsample/callback
 #\u540c\u6b65\u76f4\u64ad\u4e91\u4fe1\u606f
 live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
+#\u90ae\u4ef6\u4f7f\u7528\u5e38\u91cf
+email_app_id=769_jetja50p18
+email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
+email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
+
 #\u62bd\u5e27\u5b58\u653ebucket\u548c\u57df\u540d
 qn_bucket=cnlivetest
 qn_domain=http://test.qnvod.cnlive.com