Merge branch 'master' into 1027-master

liusheng

10 天以前 0f22f66ae9d2156b983f533beb17a0062a949524

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java

@@ -86,8 +86,10 @@
        log.info("------serviceQueryInfo的入参为：{}", serviceQueryInfo);
        Map map = null;
        try {
            String url = configService.selectConfigByKey("token.360");
            String url = configService.selectConfigByKey("token.360",serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
            serviceQueryInfo.setUrl(url);
            String url360 = configService.selectConfigByKey("url.360",serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
            serviceQueryInfo.setUrl360(url360);
            map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
        } catch (Exception e) {
            e.printStackTrace();