增开睿德MES

dingtalk-sdk/src/test/java/com/usoftchina/dingtalk/sdk/test/MessageTest.java

@@ -25,8 +25,8 @@ public class MessageTest extends BaseTest {
     @Test
     public void sendProcessMessage() throws Exception {
         String paramsStr = "{\"master\":\"UAS\",\"nodeId\":53840602,\"baseUrl\":\"" + URLEncoder.encode("http://yrkj.usoftchina.com:9443/uas", "utf-8") + "\"}";
-        String msgUrl = UrlUtils.generateAuthUrl("ding0fb1b0cd2510faf7ffe93478753d9884", "UAS", "Uas", "http://yrkj.usoftchina.com:9443/uas/",
-                "http://yrkj.usoftchina.com:9443/office/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+        String msgUrl = UrlUtils.generateAuthUrl("ding0fb1b0cd2510faf7ffe93478753d9884", "UAS", "Uas", "http://yrkj.usoftchina.com:9443/mesuu/",
+                "http://yrkj.usoftchina.com:9443/office/authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
         sdk.send("Uas", new SendMessageReq()
                 .actionCard("应鹏的工作日报流程", "单据编号:2020020258", msgUrl)
                 .toUser("manager8449"));

qywx-sdk/src/test/java/com/usoftchina/qywx/sdk/test/MessageSdkTest.java

@@ -55,7 +55,7 @@ public class MessageSdkTest extends BaseTest {
     public void sendProcessMessage() throws Exception {
         String paramsStr = "{\"master\":\"N_USOFTSYS\",\"nodeId\":53840602,\"baseUrl\":\"" + URLEncoder.encode("http://erp.yitoa.com:8888/ERP/", "utf-8") + "\"}";
         String msgUrl = UrlUtils.generateOAuthUrl("wwd42c39382ee6298e", "N_USOFTSYS", "Uas", "http://erp.yitoa.com:8888/ERP/",
-                "http://erp.yitoa.com:8888/office/api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                "http://erp.yitoa.com:8888/office/api/authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
         sdk.send("Uas", new SendMessageReq()
                 .textCard("应鹏的工作日报流程", "单据编号:2020020258", msgUrl, "查看详情")
                 .toUser("U0301"));

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

@@ -79,7 +79,7 @@ public class UasProcessListener {
             DingTalkAgent agent = getUasAgent();
             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(),
-                    dataCenter.getOuterUrl() + "authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                    dataCenter.getOuterUrl() + "authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
             messageSdk.send("Uas", new SendMessageReq()
                     .actionCard(title, description, msgUrl)
                     .toUser(employee.getEm_ding()));

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

@@ -103,7 +103,7 @@ public class UasProcessListener {
             QywxAgent agent = getUasAgent();
             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(),
-                    dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                    dataCenter.getOuterUrl() + "api/authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
             messageSdk.send((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit", new SendMessageReq()
                     .textCard(title, description, msgUrl, "查看详情")
                     .toUser(employee.getEm_qywx()));
@@ -129,7 +129,7 @@ public class UasProcessListener {
                 QywxAgent agent = getUasAgent();
                 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(),
-                        dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                        dataCenter.getOuterUrl() + "api/authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
                 String sendAgentCode = (messageSdk.isAgentEnabled("UasMobile")?"UasMobile":((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit"));
                 messageSdk.send(sendAgentCode, new SendMessageReq()
                         .textCard(title, description, msgUrl, "查看详情")

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

@@ -71,13 +71,13 @@ public class QywxProcessTask {
 //                            for (Map<String,Object> remind: remindList) {
                             String paramsStr = "{\"master\":\"" + remind.get("CURRENTMASTER") + "\",\"nodeId\":" + remind.get("JP_NODEID") + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
                             String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                    dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                                    dataCenter.getOuterUrl() + "api/authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
                             content.append("> 【停留").append(remind.get("PASSTIME")).append("天】\n ")
                                     .append(remind.get("JP_LAUNCHERNAME")).append("的[").append(remind.get("JP_NAME")).append("]("+msgUrl+")\n");
 //                            }
                             if(Integer.valueOf(String.valueOf(remindList.get(0).get("COUNTS")))>1){
                                 String moreUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                        dataCenter.getOuterUrl() + "api/authorize", "uas/uasApproval/"+dataCenter.getUsername()+"/receive");
+                                        dataCenter.getOuterUrl() + "api/authorize", "mesuu/uasApproval/"+dataCenter.getUsername()+"/receive");
                                 content.append("[更多...](").append(moreUrl).append(")");
                             }
                             String sendAgentCode = (messageSdk.isAgentEnabled("UasMobile")?"UasMobile":((!messageSdk.isAgentEnabled("UasAudit")) ? "Uas":"UasAudit"));

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

@@ -49,7 +49,7 @@ public class QywxPushAnalysisTask {
             try {
                 DataSourceHolder.set(dataCenter);
                 //获取要推送人员列表
-                //领导 ERP/uas/usestatus/-1
+                //领导 ERP/mesuu/usestatus/-1
                 List<Map<String,Object>> leaderList = uasAnalysisService.getPushMan("leader");
                 String title = "的一周小结";
                 QywxAgent agent = agentService.findByCode("Uas");
@@ -57,7 +57,7 @@ public class QywxPushAnalysisTask {
                     try {// 往uas应用发送
                         String description = String.valueOf(leaderMap.get("RANGETIME"));
                         String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                dataCenter.getOuterUrl() + "api/authorize", "uas/usestatus/" + leaderMap.get("INSTANCEID_"));
+                                dataCenter.getOuterUrl() + "api/authorize", "mesuu/usestatus/" + leaderMap.get("INSTANCEID_"));
                             messageSdk.send("Uas", new SendMessageReq()
                                     .textCard(leaderMap.get("DEPART_")+title, description, msgUrl, "查看详情")
                                     .toUser(String.valueOf(leaderMap.get("EM_QYWX"))));
@@ -66,13 +66,13 @@ public class QywxPushAnalysisTask {
                         logger.error("send process message error", e);
                     }
                 }
-                //个人 ERP/uas/worksummary/?emcode=U0815&instanceId=-1
+                //个人 ERP/mesuu/worksummary/?emcode=U0815&instanceId=-1
                 List<Map<String,Object>> normalList = uasAnalysisService.getPushMan("normal");
                 for(Map<String,Object> normalMap : normalList){
                     try {// 往uas应用发送
                         String description = String.valueOf(normalMap.get("RANGETIME"));
                         String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                dataCenter.getOuterUrl() + "api/authorize", "uas/worksummary/" +
+                                dataCenter.getOuterUrl() + "api/authorize", "mesuu/worksummary/" +
                                         URLEncoder.encode("?emcode="+normalMap.get("EMCODE_")+"&instanceId="+normalMap.get("INSTANCEID_"), "utf-8"));
                             messageSdk.send("Uas", new SendMessageReq()
                                     .textCard(normalMap.get("EM_NAME") + title, description, msgUrl, "查看详情")

uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/task/QywxSubsTask.java

@@ -70,7 +70,7 @@ public class QywxSubsTask {
                             for (Map<String,Object> remind: remindList) {
                                /* String paramsStr = "{\"numId\":\"" + remind.get("NUM_ID_") + "\",\"mainId\":" + remind.get("INSTANCE_ID_") +"\",\"insId\":" + remind.get("ID_") +"\",\"title\":" + remind.get("TITLE_") + ",\"baseUrl\":\"" + URLEncoder.encode(agent.getOuterUrl(), "utf-8") + "\"}";
                                 String msgUrl = UrlUtils.generateOAuthUrl(messageSdk.getCorpId(), dataCenter.getUsername(), "Uas", agent.getOuterUrl(),
-                                        dataCenter.getOuterUrl() + "api/authorize", "uas/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
+                                        dataCenter.getOuterUrl() + "api/authorize", "mesuu/approval/" + URLEncoder.encode(paramsStr, "utf-8"));
                                 content.append("> 【停留").append(remind.get("PASSTIME")).append("天】\n ")
                                         .append(remind.get("JP_LAUNCHERNAME")).append("的[").append(remind.get("JP_NAME")).append("]("+msgUrl+")\n");*/
                                //root地址 /ID_/NUM_ID_/INSTANCE_ID_

uas-office-web/wxuasapproval/src/configs/router.config.js

@@ -59,7 +59,7 @@ export class Routes extends React.Component {
 
   render () {
     return <Router
-      basename={(process.env.REACT_APP_ROUTER_BASE_NAME || '') + '/uas'}
+      basename={(process.env.REACT_APP_ROUTER_BASE_NAME || '') + '/mesuu'}
       getUserConfirmation={getConfirmation}>
       <div style={{ width: '100%', height: '100%' }}>
         <Switch>
@@ -67,7 +67,7 @@ export class Routes extends React.Component {
           {/*U审批过渡页面（入口页面）*/}
           <Route path='/uasApproval/:master/:type?'
                  component={UasApprovalPage}/>
-          {/* http://erp.yitoa.com:8888/ERP/uas/approvalHome/YITOA_DATACENTER */}
+          {/* http://erp.yitoa.com:8888/ERP/mesuu/approvalHome/YITOA_DATACENTER */}
           {/*U审批首页*/}
           <Route path='/approvalHome/:master/:type?'
                  component={ApprovalHomePage}/>