Browse Source

Merge remote-tracking branch 'origin/master'

yumeng 4 năm trước cách đây
mục cha
commit
c53cfba0b3

+ 2 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/BytedanceMonitoringLinksCheckJob.java

@@ -74,7 +74,8 @@ public class BytedanceMonitoringLinksCheckJob {
 
         if(null!=downloadUrl){
             if(null!=appType&&appType.equals("APP_IOS")){
-                if(!downloadUrl.equals("https://apps.apple.com/cn/app/id1468454200")){
+//                if(!downloadUrl.equals("https://apps.apple.com/cn/app/id1468454200")){
+                if(!downloadUrl.contains("https://apps.apple.com/cn/app")){
                     errorMsg+= "应用下载链接填写异常;";
                     errorflag = true;
                 }

+ 1 - 1
module-job-bytedance/src/main/java/cn/com/ctop/job/bytedance/handler/WechatApproveAttendanceJob.java

@@ -32,7 +32,7 @@ public class WechatApproveAttendanceJob {
      * @author ZHAOXA
      */
     @XxlJob("wechatApproveAttendanceJob")
-    public ReturnT<String> execute() throws Exception {
+    public ReturnT<String> execute(String param) throws Exception {
         XxlJobLogger.log("--------异常考勤审批数据入库 start ");
         String initMonth = DateUtils.initDateByMonth();
         long starttime = DateUtils.timeToStamp(DateUtils.getMonthBefore(DateUtils.NEW_FORMAT, initMonth, -1));