测试通过，刷新缓存，订单受理

CenterService/doc/centerService.docx

@@ -756,8 +756,8 @@ invoke_model
 varchar
 1
 是否同步
- 1-同步方式
- 2-异步方式
+ S-同步方式
+ A-异步方式
 business_type_cd
 否
 varchar

CenterService/src/main/java/com/java110/center/dao/impl/CenterServiceDAOImpl.java

@@ -175,7 +175,7 @@ public class CenterServiceDAOImpl extends BaseServiceDao implements ICenterServi
 
     @Override
     public List<Map> getAppRouteAndServiceInfoAll() {
-        return sqlSessionTemplate.selectList("centerServiceDAOImpl.getAppInfoAll");
+        return sqlSessionTemplate.selectList("centerServiceDAOImpl.getAppRouteAndServiceInfoAll");
     }
 
 

CenterService/src/main/java/com/java110/center/rest/CacheApi.java

@@ -22,6 +22,7 @@ public class CacheApi extends BaseController{
 
     @RequestMapping(path = "/cacheApi/flush",method= RequestMethod.GET)
     public String flushGet(HttpServletRequest request) {
+
         return ResponseTemplateUtil.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                 ResponseConstant.NO_NEED_SIGN,ResponseConstant.RESULT_CODE_ERROR,"不支持Get方法请求").toJSONString();
     }
@@ -31,6 +32,7 @@ public class CacheApi extends BaseController{
         try {
             centerServiceCacheSMOImpl.flush();
         }catch (Exception e){
+            logger.error("刷新缓存异常",e);
             return ResponseTemplateUtil.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                     ResponseConstant.NO_NEED_SIGN,ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e).toJSONString();
         }

CenterService/src/main/java/com/java110/center/rest/HttpApi.java

@@ -39,6 +39,7 @@ public class HttpApi extends BaseController {
             preValiateOrderInfo(orderInfo);
             return centerServiceSMOImpl.service(orderInfo, headers);
         }catch (Exception e){
+            logger.error("请求订单异常",e);
             return ResponseTemplateUtil.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                     ResponseConstant.NO_NEED_SIGN,ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e).toJSONString();
         }

CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java

@@ -170,7 +170,7 @@ public class CenterServiceSMOImpl extends LoggerEngine implements ICenterService
             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "userId 不能为空");
         }
 
-        if (StringUtil.isNullOrNone(dataFlow.getRequestTime()) || DateUtil.judgeDate(dataFlow.getRequestTime(), DateUtil.DATE_FORMATE_STRING_DEFAULT)) {
+        if (StringUtil.isNullOrNone(dataFlow.getRequestTime()) || !DateUtil.judgeDate(dataFlow.getRequestTime(), DateUtil.DATE_FORMATE_STRING_DEFAULT)) {
             //添加耗时
             DataFlowFactory.addCostTime(dataFlow, "judgeAuthority", "鉴权耗时", startDate);
             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "requestTime 格式不对，遵循yyyyMMddHHmmss格式");
@@ -199,7 +199,7 @@ public class CenterServiceSMOImpl extends LoggerEngine implements ICenterService
 
         //检验白名单
         List<String> whileListIp = dataFlow.getAppRoutes().get(0).getWhileListIp();
-        if (whileListIp != null && !whileListIp.contains(dataFlow.getIp())) {
+        if (whileListIp != null && whileListIp.size() > 0 && !whileListIp.contains(dataFlow.getIp())) {
             //添加耗时
             DataFlowFactory.addCostTime(dataFlow, "judgeAuthority", "鉴权耗时", startDate);
             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "当前IP被限制不能访问服务");
@@ -207,7 +207,7 @@ public class CenterServiceSMOImpl extends LoggerEngine implements ICenterService
 
         //检查黑名单
         List<String> backListIp = dataFlow.getAppRoutes().get(0).getBackListIp();
-        if (backListIp != null && backListIp.contains(dataFlow.getIp())) {
+        if (backListIp != null && backListIp.size() > 0&& backListIp.contains(dataFlow.getIp())) {
             //添加耗时
             DataFlowFactory.addCostTime(dataFlow, "judgeAuthority", "鉴权耗时", startDate);
             throw new NoAuthorityException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR, "当前IP被限制不能访问服务");

CenterService/src/main/resources/application.yml

@@ -26,6 +26,26 @@ spring:
       max-idle: 8
       min-idle: 0
       timeout: 0
+  datasource:
+    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+    minIdle: 5
+    validationQuery: SELECT 1 FROM DUAL
+    initialSize: 5
+    maxWait: 60000
+    filters: stat,wall,log4j
+    poolPreparedStatements: true
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:mysql://192.168.31.199:3306/TT
+    maxPoolPreparedStatementPerConnectionSize: 20
+    password: TT@12345678
+    testOnBorrow: false
+    testWhileIdle: true
+    minEvictableIdleTimeMillis: 300000
+    timeBetweenEvictionRunsMillis: 60000
+    testOnReturn: false
+    driverClassName: com.mysql.jdbc.Driver
+    maxActive: 20
+    username: TT
 
 #============== kafka ===================
 kafka:

eureka/src/main/resources/application.yml

@@ -12,7 +12,7 @@ eureka:
 
 
 logging:
-  file: ./logs/eureka.log
+  file: logs/eureka.log
   level:
     org:
       springframework:

java110-bean/src/main/java/com/java110/entity/center/AppRoute.java

@@ -150,6 +150,7 @@ public class AppRoute implements Serializable{
             for(String backIp : listIps )
                 this.addBackListIp(backIp);
         }
+        this.setStatusCd("0");
         this.setAppService(AppService.newInstance().builder(appInfo));
         return this;
     }

java110-bean/src/main/java/com/java110/entity/center/AppService.java

@@ -144,6 +144,7 @@ public class AppService implements Serializable{
         this.setTimeOut(Integer.parseInt(serviceInfo.get("timeout").toString()));
         this.setUrl(serviceInfo.get("url") == null ? null : serviceInfo.get("url").toString());
         this.setServiceId(Integer.parseInt(serviceInfo.get("service_id").toString()));
+        this.setStatusCd("0");
         return this;
     }
 

java110-bean/src/main/java/com/java110/entity/center/DataFlow.java

@@ -339,7 +339,7 @@ public class DataFlow {
             this.setReqJson(reqInfoObj);
             this.setDataFlowId(orderObj.containsKey("dataFlowId")?orderObj.getString("dataFlowId"):"-1");
             this.setAppId(orderObj.getString("appId"));
-            this.setAppId(orderObj.getString("transactionId"));
+            this.setTransactionId(orderObj.getString("transactionId"));
             this.setUserId(orderObj.getString("userId"));
             this.setOrderTypeCd(orderObj.getString("orderTypeCd"));
             this.setRemark(orderObj.getString("remark"));

java110-common/src/main/java/com/java110/common/cache/MappingCache.java

@@ -35,7 +35,17 @@ public class MappingCache extends BaseCache {
      * @return
      */
     public static String getValue(String key){
-        return getJedis().get(DomainContant.COMMON_DOMAIN+key);
+        Mapping mapping = getMapping(key);
+        return mapping == null ? "":mapping.getValue();
+    }
+
+    public static Mapping getMapping(String key){
+        Object obj = SerializeUtil.unserialize(getJedis().get((DomainContant.COMMON_DOMAIN+key).getBytes()));
+        if(obj instanceof Mapping){
+            return (Mapping) obj;
+        }
+
+        return null;
     }
 
     /**

java110-common/src/main/java/com/java110/common/constant/CommonConstant.java

@@ -24,7 +24,7 @@ public class CommonConstant {
     public final static String PROCESS_ORDER_ASYNCHRONOUS = "A";
 
     public final static String ORDER_INVOKE_METHOD_SYNCHRONOUS = "S"; //同步
-    public final static String ORDER_INVOKE_METHOD_ASYNCHRONOUS = "A"; //同步
+    public final static String ORDER_INVOKE_METHOD_ASYNCHRONOUS = "A"; //异步
 
 
     public final static String INVOKE_BUSINESS_MODEL_LOCAL = "LOCAL_SERVICE"; //调用本地

java110-common/src/main/java/com/java110/common/factory/DataFlowFactory.java

@@ -143,7 +143,8 @@ public class DataFlowFactory {
             busiMap.put("oId",dataFlow.getoId());
             busiMap.put("businessTypeCd",getService(dataFlow,business.getString("serviceCode")).getBusinessTypeCd());
             busiMap.put("remark",business.getString("remark"));
-            busiMap.put("status_cd",StatusConstant.STATUS_CD_SAVE);
+            busiMap.put("statusCd",StatusConstant.STATUS_CD_SAVE);
+            busiMap.put("bId",business.getString("bId"));
             businesss.add(busiMap);
         }
         return businesss;

java110-config/src/main/resources/mapper/center/CenterServiceDAOImplMapper.xml

@@ -97,9 +97,9 @@
              SELECT ca.app_id,ca.name,ca.security_code,ca.while_list_ip,ca.black_list_ip,cr.invoke_limit_times,
             cr.order_type_cd,cs.service_id,cs.business_type_cd,cs.invoke_model,
             cs.messageQueueName,cs.method,cs.name,cs.provide_app_id,cs.retry_count,cs.seq,cs.service_code,
-            cs.timeout,cs.url FROM c_app ac,c_route cr,c_service cs
-            WHERE ac.status_cd = '0'
-            AND ac.app_id = cr.app_id
+            cs.timeout,cs.url FROM c_app ca,c_route cr,c_service cs
+            WHERE ca.status_cd = '0'
+            AND ca.app_id = cr.app_id
             AND cr.status_cd = '0'
             AND cr.service_id = cs.service_id
             AND cs.status_cd = '0'