Browse Source

修改推送地址

zhouy 1 year ago
parent
commit
fef74d3880

+ 1 - 1
uas-office-dingtalk/src/main/java/com/usoftchina/uas/office/dingtalk/listener/UasProcessListener.java

@@ -80,7 +80,7 @@ public class UasProcessListener {
             String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
             String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
             String msgUrl = UrlUtils.generateAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
             String msgUrl = UrlUtils.generateAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
                     dataCenter.getOuterUrl() + "authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
                     dataCenter.getOuterUrl() + "authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
-            messageSdk.send("Uas", new SendMessageReq()
+            messageSdk.send("UasMobile", new SendMessageReq()
                     .actionCard(title, description, msgUrl)
                     .actionCard(title, description, msgUrl)
                     .toUser(employee.getEm_ding()));
                     .toUser(employee.getEm_ding()));
         } catch (Exception e) {
         } catch (Exception e) {

+ 1 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/listener/UasMsgListener.java

@@ -50,7 +50,7 @@ public class UasMsgListener {
             String msgConten = msg.get("msgConten") == null ? "":String.valueOf(msg.get("msgConten"));
             String msgConten = msg.get("msgConten") == null ? "":String.valueOf(msg.get("msgConten"));
             String em = msg.get("em") == null ? "":String.valueOf(msg.get("em"));
             String em = msg.get("em") == null ? "":String.valueOf(msg.get("em"));
             if(em.length()>0){
             if(em.length()>0){
-                messageSdk.send("Uas", new SendMessageReq().markdown(msgConten).toUser(em.split(",")));
+                messageSdk.send("UasMobile", new SendMessageReq().markdown(msgConten).toUser(em.split(",")));
                 logger.info("send uas message sucess {}", msg);
                 logger.info("send uas message sucess {}", msg);
             }
             }
         }catch (Exception e){
         }catch (Exception e){

+ 2 - 2
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/listener/UasProcessListener.java

@@ -104,7 +104,7 @@ public class UasProcessListener {
             String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
             String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
             String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
             String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
                     dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
                     dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
-            messageSdk.send((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit", new SendMessageReq()
+            messageSdk.send((!messageSdk.isAgentEnabled("UasMobile")) ? "UasAudit":"UasMobile", new SendMessageReq()
                     .textCard(title, description, msgUrl, "查看详情")
                     .textCard(title, description, msgUrl, "查看详情")
                     .toUser(employee.getEm_qywx()));
                     .toUser(employee.getEm_qywx()));
         } catch (Exception e) {
         } catch (Exception e) {
@@ -130,7 +130,7 @@ public class UasProcessListener {
                 String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
                 String paramsStr = "{\"master\":\"" + event.getMaster() + "\",\"nodeId\":" + process.getJp_nodeid() + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
                 String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
                 String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
                         dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
                         dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
-                messageSdk.send((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit", new SendMessageReq()
+                messageSdk.send((!messageSdk.isAgentEnabled("UasMobile")) ? "UasAudit":"UasMobile", new SendMessageReq()
                         .textCard(title, description, msgUrl, "查看详情")
                         .textCard(title, description, msgUrl, "查看详情")
                         .toUser(emList));
                         .toUser(emList));
         }catch (Exception e){
         }catch (Exception e){

+ 1 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/listener/UasUrlMsgListener.java

@@ -70,7 +70,7 @@ public class UasUrlMsgListener {
             QywxAgent agent = getUasAgent();
             QywxAgent agent = getUasAgent();
             String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
             String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), event.getMaster(), "Uas", agent.getOuterUrl(),
                     dataCenter.getOuterUrl() + "api/authorize", url);
                     dataCenter.getOuterUrl() + "api/authorize", url);
-            messageSdk.send("Uas", new SendMessageReq()
+            messageSdk.send("UasMobile", new SendMessageReq()
                     .textCard(title, description, msgUrl, "查看详情")
                     .textCard(title, description, msgUrl, "查看详情")
                         .toUser(userCode));
                         .toUser(userCode));
         }catch (Exception e){
         }catch (Exception e){

+ 1 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxProcessTask.java

@@ -76,7 +76,7 @@ public class QywxProcessTask {
                                         dataCenter.getOuterUrl() + "api/authorize", "uas/uasApproval/"+dataCenter.getUsername()+"/receive");
                                         dataCenter.getOuterUrl() + "api/authorize", "uas/uasApproval/"+dataCenter.getUsername()+"/receive");
                                 content.append("[更多...](").append(moreUrl).append(")");
                                 content.append("[更多...](").append(moreUrl).append(")");
                             }
                             }
-                            messageSdk.send("UasAudit", new SendMessageReq().markdown(content.toString()).toUser(em.getEm_qywx()));
+                            messageSdk.send("UasMobile", new SendMessageReq().markdown(content.toString()).toUser(em.getEm_qywx()));
                         }
                         }
                     } catch (Exception e) {
                     } catch (Exception e) {
                         logger.error("send process remind error", e);
                         logger.error("send process remind error", e);

+ 2 - 2
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxPushAnalysisTask.java

@@ -58,7 +58,7 @@ public class QywxPushAnalysisTask {
                         String description = String.valueOf(leaderMap.get("RANGETIME"));
                         String description = String.valueOf(leaderMap.get("RANGETIME"));
                         String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
                         String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
                                 dataCenter.getOuterUrl() + "api/authorize", "uas/usestatus/" + leaderMap.get("INSTANCEID_"));
                                 dataCenter.getOuterUrl() + "api/authorize", "uas/usestatus/" + leaderMap.get("INSTANCEID_"));
-                            messageSdk.send("Uas", new SendMessageReq()
+                            messageSdk.send("UasMobile", new SendMessageReq()
                                     .textCard(leaderMap.get("DEPART_")+title, description, msgUrl, "查看详情")
                                     .textCard(leaderMap.get("DEPART_")+title, description, msgUrl, "查看详情")
                                     .toUser(String.valueOf(leaderMap.get("EM_QYWX"))));
                                     .toUser(String.valueOf(leaderMap.get("EM_QYWX"))));
                         updatePushstatus(leaderMap.get("INSTANCEID_"),leaderMap.get("EM_NAME"),"leader");
                         updatePushstatus(leaderMap.get("INSTANCEID_"),leaderMap.get("EM_NAME"),"leader");
@@ -74,7 +74,7 @@ public class QywxPushAnalysisTask {
                         String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
                         String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
                                 dataCenter.getOuterUrl() + "api/authorize", "uas/worksummary/" +
                                 dataCenter.getOuterUrl() + "api/authorize", "uas/worksummary/" +
                                         URLEncoder.encode("?emcode="+normalMap.get("EMCODE_")+"&instanceId="+normalMap.get("INSTANCEID_"), "utf-8"));
                                         URLEncoder.encode("?emcode="+normalMap.get("EMCODE_")+"&instanceId="+normalMap.get("INSTANCEID_"), "utf-8"));
-                            messageSdk.send("Uas", new SendMessageReq()
+                            messageSdk.send("UasMobile", new SendMessageReq()
                                     .textCard(normalMap.get("EM_NAME") + title, description, msgUrl, "查看详情")
                                     .textCard(normalMap.get("EM_NAME") + title, description, msgUrl, "查看详情")
                                     .toUser(String.valueOf(normalMap.get("EM_QYWX"))));
                                     .toUser(String.valueOf(normalMap.get("EM_QYWX"))));
                         updatePushstatus(normalMap.get("INSTANCEID_"),normalMap.get("EM_NAME"),"normal");
                         updatePushstatus(normalMap.get("INSTANCEID_"),normalMap.get("EM_NAME"),"normal");

+ 2 - 2
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxPushMsgTask.java

@@ -57,8 +57,8 @@ public class QywxPushMsgTask {
                         }
                         }
                         sendMsg.toUser(uMsg.getEms_().split(","));
                         sendMsg.toUser(uMsg.getEms_().split(","));
                         try {
                         try {
-                            messageSdk.send("Uas", sendMsg);
-                            uasUApprovalMsgService.recodMsg(uMsg.getId_(),"SUCESS","");
+                            messageSdk.send("UasMobile", sendMsg);
+                            uasUApprovalMsgService.recodMsg(uMsg.getId_(),"SUCCESS","");
                             logger.info("send uas custom message sucess {}", uMsg);
                             logger.info("send uas custom message sucess {}", uMsg);
                         }catch (Exception e){
                         }catch (Exception e){
                             uasUApprovalMsgService.recodMsg(uMsg.getId_(),"FAIL",(e.getMessage().length() >= 1000 ? e.getMessage().substring(0,1000) : e.getMessage()));
                             uasUApprovalMsgService.recodMsg(uMsg.getId_(),"FAIL",(e.getMessage().length() >= 1000 ? e.getMessage().substring(0,1000) : e.getMessage()));