Merge branch 'master' of ssh://ops.weface.com.cn:8022/martin/push-message into lyg_dev

src/main/java/com/weface/component/GeTuiService.java

@@ -237,7 +237,9 @@ public class GeTuiService {
         map.put("userIdList", gidList);
         map.put("token", token);
         //发送post请求拿到当前用户的所有图像
-        return HttpUtil.postGeneralUrl(getUsersCidUrl, CONTENT_TYPE, JSONObject.toJSONString(map), ENCODING);
+        //20230612，个推标签接口停运
+        //return HttpUtil.postGeneralUrl(getUsersCidUrl, CONTENT_TYPE, JSONObject.toJSONString(map), ENCODING);
+        return null;
     }
 
 

src/main/java/com/weface/task/UserTagsTask.java

@@ -127,7 +127,7 @@ public class UserTagsTask {
     /**
      * 查询未推送消息成功记录,发送短信通知
      */
-    @Scheduled(cron = "0 0 0/1 * * ?")
+    //@Scheduled(cron = "0 0 0/1 * * ?")
     public void sendMessage() {
         try {
             log.error("开始执行短信推送任务");
@@ -212,7 +212,7 @@ public class UserTagsTask {
     /**
      * 更新用户标签
      */
-    @Scheduled(cron = "0 0 23 * * ?")
+    //@Scheduled(cron = "0 0 23 * * ?")
     public void updateUserTags() {
         try {
             //获取每次处理的id起始值