debug

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

@@ -53,11 +53,11 @@ public class MessageSdkTest extends BaseTest {
 
     @Test
     public void sendProcessMessage() throws Exception {
-        String paramsStr = "{\"master\":\"N_USOFTSYS\",\"nodeId\":53840586,\"baseUrl\":\"" + URLEncoder.encode("http://erp.yitoa.com:8888/ERP/", "utf-8") + "\"}";
+        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"));
         sdk.send("Uas", new SendMessageReq()
                 .textCard("应鹏的工作日报流程", "单据编号:2020020258", msgUrl, "查看详情")
-                .toUser("U0308"));
+                .toUser("U0301"));
     }
 }

uas-office-core/src/main/java/com/usoftchina/uas/office/entity/Master.java

@@ -126,4 +126,18 @@ public class Master implements DataSourceBean {
     public String driverClassName() {
         return StringUtils.nvl(ma_driver, "oracle.jdbc.OracleDriver");
     }
+
+    @Override
+    public String toString() {
+        return "Master{" +
+                "ma_id=" + ma_id +
+                ", ma_user='" + ma_user + '\'' +
+                ", ms_pwd='" + ms_pwd + '\'' +
+                ", ma_name='" + ma_name + '\'' +
+                ", ma_function='" + ma_function + '\'' +
+                ", ma_enable=" + ma_enable +
+                ", ma_url='" + ma_url + '\'' +
+                ", ma_driver='" + ma_driver + '\'' +
+                '}';
+    }
 }

uas-office-core/src/main/java/com/usoftchina/uas/office/listener/UasEventListenerAdapter.java

@@ -6,12 +6,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
 
 /**
  * @author yingp
  * @date 2020/2/16
  */
+@Async
 @Component
 public class UasEventListenerAdapter implements MessageListener {
     @Autowired

uas-office-core/src/main/java/com/usoftchina/uas/office/listener/UasEventListenerFactory.java

@@ -5,7 +5,6 @@ import com.usoftchina.uas.office.dto.UasEvent;
 import com.usoftchina.uas.office.entity.DataCenter;
 import com.usoftchina.uas.office.entity.Master;
 import com.usoftchina.uas.office.jdbc.DataSourceHolder;
-import com.usoftchina.uas.office.service.DataCenterService;
 import com.usoftchina.uas.office.service.MasterService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

uas-office-core/src/main/java/com/usoftchina/uas/office/service/AbstractService.java

@@ -1,6 +1,8 @@
 package com.usoftchina.uas.office.service;
 
 import com.alibaba.fastjson.JSON;
+import com.usoftchina.uas.office.context.MasterHolder;
+import com.usoftchina.uas.office.jdbc.DynamicDataSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.EmptyResultDataAccessException;
@@ -46,6 +48,11 @@ public abstract class AbstractService {
 
     protected <T> T queryForBean(String statement, Class<T> targetCls, Object... arguments) {
         try {
+            try {
+                System.out.println(((DynamicDataSource)jdbcTemplate.getDataSource()).lookupSchema());
+                System.out.println(MasterHolder.get());
+            } catch (Exception e) {
+            }
             return jdbcTemplate.queryForObject(statement, new BeanPropertyRowMapper<>(targetCls), arguments);
         } catch (EmptyResultDataAccessException e) {
             return null;

uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/manage/service/QywxAgentService.java

@@ -15,6 +15,7 @@ import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -38,7 +39,7 @@ public class QywxAgentService extends AbstractService {
 
     @CacheEvict(value = "QywxAgent", key = "#agent.code")
     public void save(QywxAgent agent) {
-        if (null != agent.getOuterUrl()) {
+        if (!StringUtils.isEmpty(agent.getOuterUrl())) {
             if (!agent.getOuterUrl().endsWith("/")) {
                 agent.setOuterUrl(agent.getOuterUrl() + "/");
             }