wuxw7
2018-04-23 641e6e7e3c92d91c528d39d8b1f65141ddfd0528
增加 sign签名,和请求返回报文加密处理,以及文档补充
24个文件已删除
4个文件已修改
1个文件已添加
1595 ■■■■■ 已修改文件
CenterService/doc/centerService.docx 补丁 | 查看 | 原始文档 | blame | 历史
CenterService/doc/~$nterService.docx 补丁 | 查看 | 原始文档 | blame | 历史
CenterService/src/main/java/com/java110/center/rest/CacheApi.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CenterService/src/main/java/com/java110/center/rest/HttpApi.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-common/src/main/java/com/java110/common/factory/AuthenticationFactory.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/META-INF/spring-configuration-metadata.json 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/META-INF/spring.factories 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/cache/ehcache.xml 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/cache/redis.conf 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/common/common.properties 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/config/center_event.properties 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/config/event.properties 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/config/order.properties 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/db/db.properties 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/logback.xml 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/center/CenterServiceDAOImplMapper.xml 116 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/common/CommonServiceDaoImplMapper.xml 125 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/common/PrimaryKeyServiceDaoImplMapper.xml 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/listener/ListenerServiceDaoImplMapper.xml 334 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/merchant/MerchantMemberServiceDaoImplMapper.xml 77 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/merchant/MerchantServiceDaoImplMapper.xml 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/order/OrderServiceDaoImplMapper.xml 109 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/product/ProductServiceDaoImplMapper.xml 123 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/rule/RuleDaoImplMapper.xml 79 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/service/QueryServiceDAOImplMapper.xml 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mapper/user/UserServiceDaoImplMapper.xml 151 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/mq/mq.properties 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/spring/application-dev.properties 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
java110-config/target/classes/spring/application.properties 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
CenterService/doc/centerService.docx
Binary files differ
CenterService/doc/~$nterService.docx
Binary files differ
CenterService/src/main/java/com/java110/center/rest/CacheApi.java
@@ -24,7 +24,7 @@
    public String flushGet(HttpServletRequest request) {
        return ResponseTemplateUtil.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                ResponseConstant.NO_NEED_SIGN,ResponseConstant.RESULT_CODE_ERROR,"不支持Get方法请求").toJSONString();
                ResponseConstant.RESULT_CODE_ERROR,"不支持Get方法请求").toJSONString();
    }
    @RequestMapping(path = "/cacheApi/flush",method= RequestMethod.POST)
@@ -34,10 +34,10 @@
        }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();
                    ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e).toJSONString();
        }
        return ResponseTemplateUtil.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                ResponseConstant.NO_NEED_SIGN,ResponseConstant.RESULT_CODE_SUCCESS,"成功").toJSONString();
                ResponseConstant.RESULT_CODE_SUCCESS,"成功").toJSONString();
    }
    public ICenterServiceCacheSMO getCenterServiceCacheSMOImpl() {
CenterService/src/main/java/com/java110/center/rest/HttpApi.java
@@ -27,7 +27,7 @@
    @RequestMapping(path = "/httpApi/service",method= RequestMethod.GET)
    public String serviceGet(HttpServletRequest request) {
        return ResponseTemplateUtil.createOrderResponseJson(ResponseConstant.NO_TRANSACTION_ID,
                ResponseConstant.NO_NEED_SIGN,ResponseConstant.RESULT_CODE_ERROR,"不支持Get方法请求").toJSONString();
                ResponseConstant.RESULT_CODE_ERROR,"不支持Get方法请求").toJSONString();
    }
    @RequestMapping(path = "/httpApi/service",method= RequestMethod.POST)
@@ -41,7 +41,7 @@
        }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();
                    ResponseConstant.RESULT_CODE_ERROR,e.getMessage()+e).toJSONString();
        }
    }
java110-common/src/main/java/com/java110/common/factory/AuthenticationFactory.java
@@ -71,8 +71,9 @@
        JSONObject orders = responseJson.getJSONObject("orders");
        JSONArray business = responseJson.getJSONArray("business");
        if(dataFlow == null || dataFlow.getAppRoutes() == null || dataFlow.getAppRoutes().size() == 0) {
            orders.put("sign", AuthenticationFactory.md5(orders.getString("transactionId"), orders.getString("responseTime"),
                    business.toJSONString(), MappingCache.getValue(MappingConstant.KEY_DEFAULT_SECURITY_CODE)));
            /*orders.put("sign", AuthenticationFactory.md5(orders.getString("transactionId"), orders.getString("responseTime"),
                    business.toJSONString(), MappingCache.getValue(MappingConstant.KEY_DEFAULT_SECURITY_CODE)));*/
            orders.put("sign","");
        }else {
            orders.put("sign", AuthenticationFactory.md5(orders.getString("transactionId"), orders.getString("responseTime"),
                    business.toJSONString(), dataFlow.getAppRoutes().get(0).getSecurityCode()));
@@ -167,7 +168,7 @@
    }
    /**
     * 加载公钥
     * 加载私钥
     * @param privateKeyPem
     * @param algorithm
     * @return
@@ -190,7 +191,7 @@
    }
    /**
     * 加载私钥
     * 加载公钥
     * @param publicPemData
     * @param algorithm
     * @return
java110-config/target/classes/META-INF/spring-configuration-metadata.json
File was deleted
java110-config/target/classes/META-INF/spring.factories
File was deleted
java110-config/target/classes/cache/ehcache.xml
File was deleted
java110-config/target/classes/cache/redis.conf
File was deleted
java110-config/target/classes/common/common.properties
File was deleted
java110-config/target/classes/config/center_event.properties
File was deleted
java110-config/target/classes/config/event.properties
File was deleted
java110-config/target/classes/config/order.properties
File was deleted
java110-config/target/classes/db/db.properties
File was deleted
java110-config/target/classes/logback.xml
File was deleted
java110-config/target/classes/mapper/center/CenterServiceDAOImplMapper.xml
File was deleted
java110-config/target/classes/mapper/common/CommonServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/common/PrimaryKeyServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/listener/ListenerServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/merchant/MerchantMemberServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/merchant/MerchantServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/order/OrderServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/product/ProductServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/rule/RuleDaoImplMapper.xml
File was deleted
java110-config/target/classes/mapper/service/QueryServiceDAOImplMapper.xml
File was deleted
java110-config/target/classes/mapper/user/UserServiceDaoImplMapper.xml
File was deleted
java110-config/target/classes/mq/mq.properties
File was deleted
java110-config/target/classes/spring/application-dev.properties
File was deleted
java110-config/target/classes/spring/application.properties
File was deleted