Merge remote-tracking branch 'origin/master'

Pu Zhibing

8 天以前 e998c057be6d077dcec169ab4cb34f4755932601

 DriverQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/zhenglian/TokenUtil.java

@@ -41,7 +41,6 @@
      
      
      tokenRequest.setAppId(zhengLianConfig.getAppid());
      tokenRequest.setType("04");
      String reqBO = JSON.toJSONString(tokenRequest);
      // 生成对称加密秘钥
      String key = ZhengLianUtil.generateKey(16);
@@ -83,7 +82,8 @@
         log.error("获取token失败！{}", bizData.getString("resMsg"));
         throw new Exception(jsonObject.getString("resMsg"));
      }
      return bizData.getString("token");
      JSONObject resData = bizData.getJSONObject("resData");
      return resData.getString("token");
   }
   
}