URL跳转逻辑更改

uas-office-dingtalk/src/main/java/com/usoftchina/uas/office/dingtalk/service/UasOaService.java

@@ -218,10 +218,10 @@ public class UasOaService extends AbstractService {
                     "TRUNC(SYSDATE-JP_LAUNCHTIME) PASSTIME,JP_LAUNCHERNAME,Jp_nodeid,TYPECODE,JP_NODEDEALMAN,JP_LAUNCHTIME,JP_NAME,CURRENTMASTER " +
                     "FROM JPROCESSVIEW WHERE JP_NODEDEALMAN ='" + rs.getString("em_code") + "'  AND JP_STATUS = '待审批'");
             if (rowSet.next()){
-                String appUrl = UrlUtils.generateAuthUrl(properties.getCorpId(),master, agentCode,agent.getOuterUrl(),url+"office/authorize", "uas/uasApproval/MOYING");
-                System.err.println(appUrl);
-                String pcUrl="";
-                //String pcUrl=url+"office/authorize?corpId="+properties.getCorpId()+"&agent="+agentCode+"&url=aHR0cDovLzExMy4xMDYuNzIuMjQ1OjgwOTkvRVJQL3Vhcy91YXNBcHByb3ZhbC9NT1lJTkcv&master="+master;
+                String appUrl = UrlUtils.generateAuthUrl(properties.getCorpId(),master, "UasAudit",agent.getOuterUrl(),url+"authorize", "uas/uasApproval/MOYING");
+               logger.info("appUrl:"+appUrl);
+               logger.info("agent.getOuterUrl()："+agent.getOuterUrl());
+                String pcUrl=url+"authorize?corpId="+properties.getCorpId()+"&agent="+agentCode+"&url="+appUrl+"&master="+master;
                 oaSdk.createTodo(agentCode,unionid,creatorId,appUrl,pcUrl,title,description,40,"1",false);
 
             }

uas-office-dingtalk/src/main/java/com/usoftchina/uas/office/dingtalk/task/DingOaTask.java

@@ -25,7 +25,7 @@ public class DingOaTask {
     /**
      * 推送流程审批
      */
-    @Scheduled(cron = "* * 0/1 * * ? ")
+    @Scheduled(cron = "* * 0/1 * * ? * ")
     public void clearInvalid() {
         DataCenter dataCenter = DataCenter.INSTANCE;
         if (null != dataCenter.getUsername() && null != dataCenter.getPassword() && null != dataCenter.getUrl()) {