sinake
6 小时以前 4d46005b4a4d127a1bd884efe7dfbb907338b1a0
丽水获取token 输出日志
已修改8个文件
53 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -392,7 +392,7 @@
                                req.put("content", sendMagParam.getContent());
                                s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
                            } else if (visitHosp == 2) {
                                String url = configService.selectConfigByKey("token.360");
                                String url = configService.selectConfigByKey("token.360",serviceSubtask.getOrgid());
                                //丽水的短信发送方式
                                Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
                                String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -86,7 +86,7 @@
        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);
            map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
        } catch (Exception e) {
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -538,7 +538,7 @@
                                    req.put("content", sendMagParam.getContent());
                                    isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
                                } else if (visitHosp == 2) {
                                    String url = configService.selectConfigByKey("token.360");
                                    String url = configService.selectConfigByKey("token.360",serviceSubtask.getOrgid());
                                    //丽水的短信发送方式
                                    Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
                                    String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -27,6 +27,14 @@
    public String selectConfigByKey(String configKey);
    /**
     * 根据键名查询参数配置信息
     *
     * @param configKey 参数键名
     * @return 参数键值
     */
    public String selectConfigByKey(String configKey,String orgid);
    /**
     * 获取验证码开关
     * 
     * @return true开启,false关闭
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
@@ -125,7 +125,7 @@
        //丽水的短信发送方式
        Boolean isSuccess = false;
        try {
            String url = configService.selectConfigByKey("token.360");
            String url = configService.selectConfigByKey("token.360",orgid);
            Map<String, String> map = MsgLSEnum.getAddressByCode(orgid);
            String token = LSHospTokenUtil.getToken(orgid,url);
            log.info("【sfHandlle】丽水短信发送,地址:{},参数:{},机构ID:{}", map.get("address"), orgid);
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -81,6 +81,27 @@
    }
    /**
     * 根据键名查询参数配置信息
     *
     * @param configKey 参数key
     * @return 参数键值
     */
    @Override
    public String selectConfigByKey(String configKey,String orgid)
    {
        SysConfig config = new SysConfig();
        config.setConfigKey(configKey);
        config.setOrgid(orgid);
        SysConfig retConfig = configMapper.selectConfig(config);
        if (StringUtils.isNotNull(retConfig))
        {
            return retConfig.getConfigValue();
        }
        return StringUtils.EMPTY;
    }
    /**
     * 获取验证码开关
     * 
     * @return true开启,false关闭
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -43,6 +43,9 @@
            <if test="configKey !=null and configKey != ''">
                and config_key = #{configKey}
            </if>
            <if test="orgid !=null and orgid != ''">
                and orgid = #{orgid}
            </if>
        </where>
    </sql>
smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
@@ -10,15 +10,14 @@
     public static String getToken(String orgid,String url) {
        String token = null;
        LyraTokenUtil lyraTokenUtil = null;
        if(ObjectUtils.isNotEmpty(url)){
            lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil(url, "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
            log.info("token.360调用结果"+url+";机构代码:"+orgid+"");
        }else {
            if (orgid.equals("47255004333112711A1001"))  //景宁
            if (orgid.equals("47255004333112711A1001")) { //景宁
                lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
            if (orgid.equals("47231022633110211A2101"))  //中医院
            }else  if (orgid.equals("47231022633110211A2101")) {  //中医院
                lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13011/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
        }
            }else if(ObjectUtils.isNotEmpty(url)) {
                lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil(url, "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
                log.info("token.360调用结果" + url + ";机构代码:" + orgid + "");
            }
        try {
            token = lyraTokenUtil.getToken();
        } catch (IOException e) {