调整

public/react/package.json

@@ -42,6 +42,7 @@
     "immutability-helper": "^2.6.6",
     "install": "^0.12.2",
     "jest": "20.0.4",
+    "js-base64": "^2.5.1",
     "js-file-download": "^0.4.7",
     "lodash": "^4.17.5",
     "loglevel": "^1.6.1",
@@ -164,6 +165,7 @@
     "babel-plugin-import": "^1.11.0",
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
+    "js-base64": "^2.5.1",
     "videojs-for-react": "^0.0.3",
     "webpack-bundle-analyzer": "^3.0.3",
     "webpack-parallel-uglify-plugin": "^1.1.0"

public/react/public/js/jsFromMiddleLayer/base64.js

@@ -1,103 +0,0 @@
-function Base64() {
- 
-    // private property
-    _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
- 
-    // public method for encoding
-    this.encode = function (input) {
-        var output = "";
-        var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-        var i = 0;
-        input = _utf8_encode(input);
-        while (i < input.length) {
-            chr1 = input.charCodeAt(i++);
-            chr2 = input.charCodeAt(i++);
-            chr3 = input.charCodeAt(i++);
-            enc1 = chr1 >> 2;
-            enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-            enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-            enc4 = chr3 & 63;
-            if (isNaN(chr2)) {
-                enc3 = enc4 = 64;
-            } else if (isNaN(chr3)) {
-                enc4 = 64;
-            }
-            output = output +
-            _keyStr.charAt(enc1) + _keyStr.charAt(enc2) +
-            _keyStr.charAt(enc3) + _keyStr.charAt(enc4);
-        }
-        return output;
-    }
- 
-    // public method for decoding
-    this.decode = function (input) {
-        var output = "";
-        var chr1, chr2, chr3;
-        var enc1, enc2, enc3, enc4;
-        var i = 0;
-        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-        while (i < input.length) {
-            enc1 = _keyStr.indexOf(input.charAt(i++));
-            enc2 = _keyStr.indexOf(input.charAt(i++));
-            enc3 = _keyStr.indexOf(input.charAt(i++));
-            enc4 = _keyStr.indexOf(input.charAt(i++));
-            chr1 = (enc1 << 2) | (enc2 >> 4);
-            chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-            chr3 = ((enc3 & 3) << 6) | enc4;
-            output = output + String.fromCharCode(chr1);
-            if (enc3 != 64) {
-                output = output + String.fromCharCode(chr2);
-            }
-            if (enc4 != 64) {
-                output = output + String.fromCharCode(chr3);
-            }
-        }
-        output = _utf8_decode(output);
-        return output;
-    }
- 
-    // private method for UTF-8 encoding
-    _utf8_encode = function (string) {
-        string = string.replace(/\r\n/g,"\n");
-        var utftext = "";
-        for (var n = 0; n < string.length; n++) {
-            var c = string.charCodeAt(n);
-            if (c < 128) {
-                utftext += String.fromCharCode(c);
-            } else if((c > 127) && (c < 2048)) {
-                utftext += String.fromCharCode((c >> 6) | 192);
-                utftext += String.fromCharCode((c & 63) | 128);
-            } else {
-                utftext += String.fromCharCode((c >> 12) | 224);
-                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-                utftext += String.fromCharCode((c & 63) | 128);
-            }
- 
-        }
-        return utftext;
-    }
- 
-    // private method for UTF-8 decoding
-    _utf8_decode = function (utftext) {
-        var string = "";
-        var i = 0;
-        var c = c1 = c2 = 0;
-        while ( i < utftext.length ) {
-            c = utftext.charCodeAt(i);
-            if (c < 128) {
-                string += String.fromCharCode(c);
-                i++;
-            } else if((c > 191) && (c < 224)) {
-                c2 = utftext.charCodeAt(i+1);
-                string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
-                i += 2;
-            } else {
-                c2 = utftext.charCodeAt(i+1);
-                c3 = utftext.charCodeAt(i+2);
-                string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
-                i += 3;
-            }
-        }
-        return string;
-    }
-}

public/react/src/modules/courses/shixunHomework/Listofworks.js

@@ -4,6 +4,7 @@ import {WordsBtn, ActionBtn} from 'educoder';
 import TraineetraininginformationModal from './TraineetraininginformationModal';
 import ModulationModal from "../coursesPublic/ModulationModal";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
+import Base64 from 'js-base64';
 import {
 	Form,
 	Select,
@@ -32,7 +33,6 @@ import moment from 'moment';
 import 'moment/locale/zh-cn';
 import {getImageUrl, toPath} from 'educoder';
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
-import Base64 from './base64'
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
 const CheckboxGroup = Checkbox.Group;
@@ -1405,8 +1405,11 @@ class Listofworks extends Component {
 				console.log(response.headers['content-disposition'].split('=')[1]);
 				console.log(name);
 				console.log(decodeURIComponent(response.headers['content-disposition'].split('=')[1]));
+				console.log("1409");
+				console.log(Base64.decode(response.headers['content-disposition'].split('=')[1]));
 				downloadElement.href = href
 				// downloadElement.download = name
+
 				document.body.appendChild(downloadElement)
 				downloadElement.click()
 				document.body.removeChild(downloadElement) // 下载完成移除元素