Merge remote-tracking branch 'origin/master'

k94314517

2024-10-31 b6d54f1aafc8e0184c8c236514849e1a4c568655

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java

@@ -68,12 +68,10 @@
    @ApiOperation("token解析")
    @GetMapping("/water/decodeToken")
    public Map<String,Object> decodeToken(@RequestParam String token) {
        String token1 =token;
        log.info("【安防平台单点登录token解析】================="+token1);
        log.info("【安防平台单点登录token解析】================="+token);
        int success = Constants.ZERO;
        Map<String,Object>  result = new HashMap<>() ;
        try {
             token = URLEncoder.encode(token1);
            HkBaseTokenRequest hkBaseTokenRequest = new HkBaseTokenRequest();
            hkBaseTokenRequest.setToken(token);
            result = this.decodeTokenForHk(hkBaseTokenRequest);
@@ -85,7 +83,7 @@
            e.printStackTrace();
            success = Constants.ONE;
        }finally {
            interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "【安防平台】单点登录token解析",token1,
            interfaceLogService.saveInterfaceLog("/hk/api/water/decodeToken", "【安防平台】单点登录token解析",token,
                    success, JSONObject.toJSONString(result),Constants.ZERO);
        }
        return result;
@@ -106,11 +104,7 @@
            result.put("msg","token无效!");
            return result;
        }
        String userName = null;
        try {
             userName = DESUtil.verifyHkToken(URLDecoder.decode(hkBaseTokenRequest.getToken(),"UTF-8"));
        }catch (Exception e){
        }
        String userName = DESUtil.verifyHkToken( redisToken);;
        if(StringUtils.isBlank(userName)){
            result.put("code","-1");
            result.put("msg","token参数为空");