diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 2e68984..f002c15 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -62,6 +62,7 @@ import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.File; import java.io.IOException; +import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.net.URLEncoder; import java.util.*; @@ -3334,8 +3335,16 @@ public class TestController extends BaseController { @ResponseBody public String getVcCardNoPwd(@RequestParam(required = true) String kid) { + System.out.println("kid=" + kid); String pwd = QhdvcCardNoUtils.getKey(kid); - return pwd; + try { + String result = new String(pwd.getBytes("utf-8"),"iso8859-1"); + System.out.println("pwd=" + result); + return result; + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + return ""; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/QhdvcCardNoUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/QhdvcCardNoUtils.java index 5cdcb29..dc60070 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/QhdvcCardNoUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/QhdvcCardNoUtils.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.platform.common.utils.ExceptionUtils; import com.sun.jna.Library; import com.sun.jna.Native; @@ -21,8 +22,6 @@ public class QhdvcCardNoUtils { ReaderDll instanceDll = (ReaderDll) Native.loadLibrary("QHD_Card", ReaderDll.class); //读取卡中基本信息 public int getKeyA(String data, int iReaderHandle, byte[] dataInfo); - //public int getKeyStr_ext(byte[] oErrMsg); - //public int getKeyStr(IntByReference iReaderPort, int iReaderHandle, byte[] oErrMsg); } @@ -37,13 +36,15 @@ public class QhdvcCardNoUtils { kid = covertKey(kid); byte[] dataInfo = new byte[50]; int areaCode = 100; - int status = ReaderDll.instanceDll.getKeyA(kid,areaCode,dataInfo); + try { + int status = ReaderDll.instanceDll.getKeyA(kid,areaCode,dataInfo); if (status == 0) { return new String(dataInfo,"utf-8"); } - } catch (UnsupportedEncodingException e) { + } catch (Exception e) { + ExceptionUtils.catchException(e,"getKey error"); } return null; }