Merge remote-tracking branch 'origin/dev-shangqing' into dev-shangqing
This commit is contained in:
@@ -1261,7 +1261,7 @@ public class SydApi4j implements SydApi {
|
||||
|
||||
PacketSN sn = PacketSN.gen();
|
||||
packet.put("header", sn.getSn().array());
|
||||
data.put("dataFlag$option", dataFlag);
|
||||
data.put("dataFlag",Util.slenBytes(dataFlag,4));
|
||||
|
||||
String sqlite3 = "1 = 1 ";
|
||||
data.put("sqlite3", sqlite3);
|
||||
@@ -1293,13 +1293,17 @@ public class SydApi4j implements SydApi {
|
||||
RetWrap r = new RetWrap();
|
||||
|
||||
PacketSection resDataFlag = (PacketSection) ret.get("dataFlag");
|
||||
r.put("dataFlag", (int) resDataFlag.getBytes()[0]);
|
||||
PacketSection certAllNum = (PacketSection) ret.get("certAllNum");
|
||||
r.put("certAllNum", (int) certAllNum.getBytes()[0]);
|
||||
PacketSection realCertNum = (PacketSection) ret.get("realCertNum");
|
||||
r.put("realCertNum", (int) realCertNum.getBytes()[0]);
|
||||
PacketSection dataAttrFlag = (PacketSection) ret.get("dataAttrFlag");
|
||||
r.put("dataAttrFlag", (int) dataAttrFlag.getBytes()[0]);
|
||||
PacketSection realCertNum = (PacketSection) ret.get("realCertNum");
|
||||
try {
|
||||
r.put("dataFlag",Util.smallLen(resDataFlag.getBytes()) );
|
||||
r.put("certAllNum", Util.smallLen(certAllNum.getBytes()));
|
||||
r.put("dataAttrFlag", Util.smallLen(dataAttrFlag.getBytes()));
|
||||
r.put("realCertNum", Util.smallLen(realCertNum.getBytes()));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
r.put("certLenMax", Integer.parseInt(Util.bytes2HexString(Util.toArray(bb)).substring(60, 62), 16));
|
||||
|
||||
List<String> certs = new ArrayList<String>();
|
||||
@@ -1309,11 +1313,13 @@ public class SydApi4j implements SydApi {
|
||||
certs.add(new String(cert, "GBK"));
|
||||
}
|
||||
|
||||
r.put("certDNs", certs.toArray(new String[0]));
|
||||
r.put("certDNlist", certs);
|
||||
// r.put("certDNs",certs.toArray(new String[0]) );
|
||||
|
||||
r.put("certDNs",certs);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
// 测试通过
|
||||
@Override
|
||||
public RetWrap getAllCert(int dataFlag,String sqlite) throws UnsupportedEncodingException {
|
||||
|
||||
Reference in New Issue
Block a user