Merge remote-tracking branch 'origin/test' into test

# Conflicts: # src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java # src/main/java/com/cnlive/shenhe/job/VideosJob.java

Merge remote-tracking branch 'origin/test' into test
# Conflicts: # src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java # src/main/java/com/cnlive/shenhe/job/VideosJob.java
王言钊
2 parents 49b0fd31 5d0a5ca1
Showing 7 changed files with 45 additions and 10 deletions
src/main/java/com/cnlive/shenhe/ShenheApplication.java
src/main/java/com/cnlive/shenhe/job/LiveApplyJob.java
src/main/java/com/cnlive/shenhe/job/VideosJob.java
src/main/resources/application-dev.properties
src/main/resources/application-prod.properties
src/main/resources/application-test.properties
src/main/resources/application.properties
@@ -19,6 +19,7 @@ import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerF
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Controller;
 import tk.mybatis.spring.annotation.MapperScan;
@@ -29,6 +30,7 @@ import java.util.Map;
 @SpringBootApplication
 @MapperScan(basePackages = {"com.cnlive.shenhe.mapper"})
+@EnableAsync
 public class ShenheApplication extends SpringBootServletInitializer {
     /**
      * url的前缀
@@ -16,6 +16,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import tk.mybatis.mapper.entity.Example;
@@ -29,6 +30,7 @@ import java.util.Map;
  * @author Administrator
  */
 @Component
+@Async
 public class LiveApplyJob {
     private static Logger logger = LoggerFactory.getLogger(LiveApplyJob.class);
@@ -49,6 +51,9 @@ public class LiveApplyJob {
     @Value("${email_send_URL}")
     private String email_send_URL;
+    @Value("${mobile_send_URL}")
+    private String mobile_send_URL;
+
     @Autowired
     SitesService sitesService;
     @Autowired
@@ -95,6 +100,7 @@ public class LiveApplyJob {
             String url = email_send_URL;
             List<ShyEmail> shyEmailList = emailService.getEmailSendList(CommonConst.EMAIL_LIVEAPPLY);
             logger.info("直播申请邮件通知开始，共" + shyLiveApplyList.size() + "个申请，每个申请通知" + shyEmailList.size() + "个邮箱");
+            int i = 0;
             for (ShyLiveapply liveApply : shyLiveApplyList) {
                 logger.info("当前发送邮件的直播申请id为：" + liveApply.getId());
                 //初始化通知状态
@@ -117,15 +123,15 @@ public class LiveApplyJob {
                     String emailAddr = shyEmail.getEmail();
                     String title = liveApply.getSpid_desc() + "新直播开播申请";
                     String templateId = "4017";
-                    Map<String, String> params = new HashMap<>();
-                    params.put("appId", appId);
-                    params.put("emailAddr", emailAddr);
-                    params.put("title", title);
-                    params.put("content", content);
-                    params.put("templateId", templateId);
-                    params.put("sign", OpenUtil.sign(params, appKey));
+                    Map<String, String> emailparams = new HashMap<>();
+                    emailparams.put("appId", appId);
+                    emailparams.put("emailAddr", emailAddr);
+                    emailparams.put("title", title);
+                    emailparams.put("content", content);
+                    emailparams.put("templateId", templateId);
+                    emailparams.put("sign", OpenUtil.sign(emailparams, appKey));
                     HttpUtil httpUtil = HttpUtil.init();
-                    httpUtil.setParamMap(params);
+                    httpUtil.setParamMap(emailparams);
                     try {
                         Map<String, String> post = httpUtil.post(url);
                         logger.info("当前发送邮件用户为：" + emailAddr + ",发送邮件的直播申请审核云id为：" + liveApply.getId() + "结果为：" + post.get("result"));
@@ -133,12 +139,14 @@ public class LiveApplyJob {
                         if (result == null) {
                             noticeState = CommonConst.NOTICE_FAIL;
                             noticeMsg.append("\n").append(dateTime).append(" 邮件服务器调用失败,result为空");
+                            i += 1;
                             break;
                         }
                         Integer code = result.getInteger("errorCode");
                         if (code != 0) {
                             noticeState = CommonConst.NOTICE_FAIL;
                             noticeMsg.append("\n").append(dateTime).append(" 邮件服务器调用失败,result返回消息为：").append(result.getString("errorMessage"));
+                            i += 1;
                             break;
                         } else {
                             noticeState = CommonConst.NOTICE_SUCCESS;
@@ -148,8 +156,26 @@ public class LiveApplyJob {
                         logger.info("异常结果为：{}", e.getMessage());
                         noticeState = CommonConst.NOTICE_FAIL;
                         noticeMsg.append("\n").append(dateTime).append(" 邮件服务器调用失败,服务器报错了");
+                        i += 1;
                         break;
                     }
+                    //String taskId = "003_01";
+                    //String signatureId = "0";
+                    //Map<String, String> mobileparams = new HashMap<>(16);
+                    //mobileparams.put("appId", appId);
+                    //mobileparams.put("mobile", liveApply.getMobile());
+                    //mobileparams.put("content", content);
+                    //mobileparams.put("taskId", taskId);
+                    //mobileparams.put("signatureId", signatureId);
+                    //httpUtil.setParamMap(mobileparams);
+                    //if (i > 4) {
+                    //    Map<String, String> post = httpUtil.post(mobile_send_URL);
+                    //    logger.info("当前发送短信用户为：" + liveApply.getMobile() + ",发送短信的直播申请审核云id为：" + liveApply.getId() + "结果为：" + post.get("result"));
+                    //    noticeState = CommonConst.NOTICE_SUCCESS;
+                    //    noticeMsg = noticeMsg + "\n" + dateTime + "短信手机号" + liveApply.getMobile() + "(" + liveApply.getSender() + ")发送成功";
+                    //    i = 0;
+                    //    break;
+                    //}
                 }
                 liveApply.setEmail_notice_state(noticeState);
                 liveApply.setEmail_notice_msg(noticeMsg.toString());
@@ -7,6 +7,7 @@ import com.cnlive.shenhe.utils.CommonConstStates;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -16,6 +17,7 @@ import java.util.List;
  * @author Administrator
  */
 @Component
+@Async
 public class VideosJob {
     private static Logger logger = LoggerFactory.getLogger(VideosJob.class);
@@ -49,8 +51,8 @@ public class VideosJob {
      * 机审 、未审核 、抽帧完成 进行送审
      * 每天8点到23点执行，每分钟一次
      */
-    @Scheduled(cron = "0 0/1 8-23 * * ? ")
-    public void videoFilter() {
+    @Scheduled(cron = "0 0/3 8-23 * * ? ")
+    public void videoFilter(){
         ShyVideos shyVideos = new ShyVideos();
         //审核类型为机审
         shyVideos.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);
@@ -97,6 +97,7 @@ live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
 email_app_id=769_jetja50p18
 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
+mobile_send_URL=http://sms.cnlive.com/CnliveM3/msg/sendSms.action
 #\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
 qn_bucket=cnlivetest
@@ -91,6 +91,7 @@ live_url=http://bc.cnlive.com/bokong/activity/activityShenHe
 email_app_id=769_jetja50p18
 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
+mobile_send_URL=http://sms.cnlive.com/CnliveM3/msg/sendSms.action
 qn_bucket=mam-sxzg-82
@@ -97,6 +97,7 @@ live_url=http://test.bc.cnlive.com/bokong/activity/activityShenHe
 email_app_id=769_jetja50p18
 email_app_key=ad101b9152817a79b5c33c3617b96ff91385096ff3b4ba
 email_send_URL=http://sms.cnlive.com/CnliveM3/email/sendMoreVarEmail.action
+mobile_send_URL=http://sms.cnlive.com/CnliveM3/msg/sendSms.action
 #\u62BD\u5E27\u5B58\u653Ebucket\u548C\u57DF\u540D
 qn_bucket=cnlivetest
@@ -22,6 +22,8 @@ server.tomcat.uri-encoding=UTF-8
 spring.http.encoding.charset=UTF-8
 spring.http.encoding.enabled=true
 spring.http.encoding.force=true
+#\u914D\u7F6EScheduled\u5B9A\u65F6\u4EFB\u52A1\u4E3A\u591A\u7EBF\u7A0B
+spring.task.scheduling.pool.size=8
 mybatis.mapper-locations=classpath:mapper/*.xml
 mybatis.type-aliases-package=com.cnlive.shenhe.entity
 \ No newline at end of file