初版

public/react/src/common/Component.js

@@ -1,5 +1,5 @@
 import md5 from 'md5';
-export function setmiyah(logins){
+export default function setmiyah(logins) {
   const opens = "79e33abd4b6588941ab7622aed1e67e8";
   return md5(opens + logins);
 }

public/react/src/common/UrlTool.js

@@ -7,9 +7,6 @@ const $ = window.$;
 const isDev = window.location.port == 3007;
 export const TEST_HOST = "https://test-newweb.educoder.net"
 export function getImageUrl(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-  // const local = 'http://localhost:3000'
 	const local = 'https://test-newweb.educoder.net'
 	if (isDev) {
 		return `${local}/${path}`
@@ -20,7 +17,6 @@ export function getImageUrl(path) {
 export function setImagesUrl(path) {
 	const local = 'https://test-newweb.educoder.net'
 	let firstStr = path.substr(0, 1);
-	// console.log(firstStr);
 	if (firstStr == "/") {
 		return isDev ? `${local}${path}` : `${path}`;
 	} else {
@@ -28,15 +24,7 @@ export function setImagesUrl(path){
 	}
 }
 
-export function getUrl(path, goTest) {
+export function getUrl(path) {
-	// https://www.educoder.net
-	// https://testbdweb.trustie.net
-
-	// 如果想所有url定位到测试版，可以反注释掉下面这行
-	//goTest = true
-	// testbdweb.educoder.net testbdweb.trustie.net
-  // const local = goTest ? 'https://testeduplus2.educoder.net' : 'http://localhost:3000'
-  // const local = 'https://testeduplus2.educoder.net'
 	const local = 'https://test-newweb.educoder.net'
 	if (isDev) {
 		return `${local}${path ? path : ''}`
@@ -79,13 +67,15 @@ let newtimestamp;
 let checkSubmitFlgs = false;
 function railsgettimess(proxy) {
 	if (checkSubmitFlgs === false) {
-		$.ajax({url:proxy,
+		$.ajax({
+			url: proxy,
 			async: false, success: function (data) {
 				if (data.status === 0) {
 					newtimestamp = data.message;
 					checkSubmitFlgs = true;
 				}
-			}})
+			}
+		})
 
 		window.setTimeout(function () {
 			checkSubmitFlgs = false;

public/react/src/common/components/SetAppModel.js

@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import { Modal } from 'antd';
-export function SetAppModel(options={}) {
+export default function SetAppModel(options = {}) {
 	return function wrap(WrappedComponent) {
 		return class Wrapper extends Component {
 			constructor(props) {

public/react/src/common/educoder.js

@@ -4,7 +4,7 @@ export {
 	, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode
 } from './UrlTool';
 
-export { setmiyah as setmiyah } from './Component';
+export { default as setmiyah } from './Component';
 export { default as queryString } from './UrlTool2';
 
 export { default as SnackbarHOC } from './SnackbarHOC';
@@ -44,7 +44,7 @@ export { themes, ThemeContext } from './context/ThemeContext'
 
 export { default as ModalHOC } from './components/ModalHOC'
 
-export { SetAppModel } from './components/SetAppModel'
+export { default as SetAppModel } from './components/SetAppModel'
 
 export { default as LinkAfterLogin } from './components/LinkAfterLogin'
 export { default as Cropper } from './components/Cropper'
@@ -58,19 +58,12 @@ export { default as City } from './components/form/City'
 
 // course
 export { default as WordsBtn } from './course/WordsBtn'
-
 export { default as ActionBtn } from './course/ActionBtn'
-
 export { default as MarkdownToHtml } from './components/markdown/MarkdownToHtml'
-
 export { default as DMDEditor } from './components/markdown/DMDEditor'
-
 export { default as Clappr } from './components/media/Clappr'
 export { default as AliyunUploader } from './components/media/AliyunUploader'
-
-
 export { default as ImageLayer2 } from './hooks/ImageLayer2'
-
 // 外部
 export { default as CBreadcrumb } from '../modules/courses/common/CBreadcrumb'
 export { default as CNotificationHOC } from '../modules/courses/common/CNotificationHOC'

public/react/src/components/test-panel.jsx

@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { getUploadActionUrl, getUrl } from 'educoder';
+import { getUploadActionUrl, getUrl, setmiyah } from 'educoder';
 import TPMMDEditor from '../modules/tpm/challengesnew/TPMMDEditor';
 import moment from 'moment'
 
@@ -118,6 +118,7 @@ export default () => {
   return (
     <Fragment >
       <p>{getUrl()}</p>
+      <p>{setmiyah()}</p>
       <p>{getUploadActionUrl()}</p>
       <TPMMDEditor />
     </Fragment>

public/react/src/modules/projectPackages/PackageIndexNewandEdit/PackageIndexNEIBannerConcent.js

@@ -1,11 +1,9 @@
 import React, { Component } from 'react';
-import {Link} from "react-router-dom";
 import axios from 'axios';
 import { Input, Spin, Icon, Button, Pagination, DatePicker } from 'antd';
 import { handleDateString, getUrl, setmiyah } from 'educoder';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
 import MDEditors from '../MDEditors';
-import PhoneModel from './PhoneModel';
 import moment from 'moment';
 import '../packageconcnet.css';
 const { Search } = Input;

public/react/src/modules/tpm/TPMUpdatepropaede/TPMUpdatepropaede.js

@@ -1,17 +1,11 @@
 import React, { Component } from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
+import { Link } from "react-router-dom";
-
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
 
 import axios from 'axios';
 
 import TPMMDEditor from '../../tpm/challengesnew/TPMMDEditor';
 
-import {getUrl} from 'educoder';
-
-
-
 export default class TPMUpdatepropaede extends Component {
     constructor(props) {
         super(props)

public/react/src/modules/tpm/TPMsettings/oldTPMsettings.js

@@ -3,7 +3,7 @@ import React, { Component } from 'react';
 import MonacoEditor from 'react-monaco-editor';
 
 //MonacoDiffEditor  对比模式
-import { Input, Select, Radio, Checkbox, Popconfirm, message, Modal, Icon, DatePicker, Breadcrumb, Upload, Button, notification, Tooltip } from 'antd';
+import { Input, Select, Radio, Checkbox, Modal, Icon, DatePicker, Breadcrumb, Upload, Button, notification, Tooltip } from 'antd';
 
 // import "antd/dist/antd.css";
 
@@ -15,9 +15,8 @@ import axios from 'axios';
 
 import './css/TPMsettings.css';
 
-import { getImageUrl, toPath, getUrl, getUploadActionUrl } from 'educoder';
+import { getImageUrl, getUrl, getUploadActionUrl } from 'educoder';
 
-let origin = getUrl();
 
 let path = getUrl("/editormd/lib/")
 

public/react/src/modules/tpm/challengesnew/TPMMDEditor.js

@@ -4,11 +4,8 @@ import '../../courses/css/Courses.css'
 
 import './css/TPMchallengesnew.css';
 
-let path = '/editormd/lib/'
-path = getUrl("/editormd/lib/")
 const $ = window.$;
 
-
 // 保存数据
 function md_add_data(k, mdu, d) {
     window.sessionStorage.setItem(k + mdu, d);
@@ -86,7 +83,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
     var editorName = window.editormd(id, {
         width: width,
         height: high === undefined ? 400 : high,
-        path: path,   // "/editormd/lib/"
+        path: getUrl("/editormd/lib/"),   // "/editormd/lib/"
         markdown: initValue,
 
         dialogLockScreen: false,

public/react/src/modules/tpm/challengesnew/TPMquestion.js

@@ -1,34 +1,24 @@
 import React, { Component } from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal,Tooltip,notification} from 'antd';
+import { Select, Popconfirm, message, Tooltip, notification } from 'antd';
 
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
+import { Link } from "react-router-dom";
-
-// import "antd/dist/antd.css";
 
 import axios from 'axios';
 
-import { getImageUrl, toPath } from 'educoder';
+import { getImageUrl } from 'educoder';
 
 import './css/TPMchallengesnew.css';
 
-import {getUrl} from 'educoder';
-
 import TpmQuestionMain from './TpmQuestionMain';
 
 import TpmQuestionNew from './TpmQuestionNew';
 
 import TpmQuestionEdit from './TpmQuestionEdit';
 
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
-
 const $ = window.$;
-
 const Option = Select.Option;
 
-const RadioGroup = Radio.Group;
 
 var letterArr = [];
 for (var i = 65, j = 0; i < 91; i++ , j++) {
@@ -537,7 +527,7 @@ export default class TPMquestion extends Component {
             return
         }
 
-        if(shixunssanswerkillvalue == "" || shixunssanswerkillvalue == undefined || shixunssanswerkillvalue == null || (shixunssanswerkillvalue.length>0 && shixunssanswerkillvalue.trim().length == 0)){
+        if (shixunssanswerkillvalue == "" || shixunssanswerkillvalue == undefined || shixunssanswerkillvalue == null || (shixunssanswerkillvalue.length > 0 && shixunssanswerkillvalue.trim().length == 0)) {
             message.error("输入为空，不能保存！");
             return
         }

public/react/src/modules/tpm/challengesnew/old/TPMchallengesnew.js

@@ -1,10 +1,8 @@
 import React, { Component } from 'react';
 
-import {Input, Select, Radio, Checkbox, Popconfirm, message, Modal} from 'antd';
+import { Input, Select, Radio, message } from 'antd';
 
-import {BrowserRouter as Router, Route, Link, Switch} from "react-router-dom";
+import { Link } from "react-router-dom";
-
-// import "antd/dist/antd.css";
 
 import TPMMDEditor from '../TPMMDEditor';
 
@@ -12,19 +10,13 @@ import axios from 'axios';
 
 import '../css/TPMchallengesnew.css';
 
-import { getImageUrl, toPath } from 'educoder';
+import { getImageUrl } from 'educoder';
 
 import { getUrl } from 'educoder';
 
-let origin = getUrl();
-
-let path = getUrl("/editormd/lib/")
 
 const $ = window.$;
 
-let timeout;
-
-let currentValue;
 
 const Option = Select.Option;
 
@@ -280,7 +272,7 @@ export default class TPMchallengesnew extends Component {
             return
         }
 
-        if(shixunsskillvalue == "" || shixunsskillvalue == undefined || shixunsskillvalue == null || (shixunsskillvalue.length>0 && shixunsskillvalue.trim().length == 0)){
+        if (shixunsskillvalue == "" || shixunsskillvalue == undefined || shixunsskillvalue == null || (shixunsskillvalue.length > 0 && shixunsskillvalue.trim().length == 0)) {
             message.error("输入为空，不能保存！");
             return
         }

public/react/src/modules/user/account/ChangeHeaderPicModal.js

@@ -1,13 +1,10 @@
 import React, { Component } from "react";
-import { Spin } from "antd";
 import axios from 'axios'
 import ModalWrapper from "../../courses/common/ModalWrapper"
 import { Cropper, getUrl } from 'educoder'
 
 const imageId = 'changeHeaderPic'
 const previewId = 'changeHeader_imagePreview'
-let uploadedImageType;
-let uploadedImageName;
 let uploadedImageURL;
 class ChangeHeaderPicModal extends Component {
   constructor(props) {
@@ -144,8 +141,7 @@ class ChangeHeaderPicModal extends Component{
   }
 
   render() {
-    const { course_lists } = this.state
+    const { current_user } = this.props
-    const { moduleName, current_user } = this.props
     const userHeaderImgUrl = current_user ? `${getUrl()}/images/${current_user.image_url}` : ''
     return (
       <ModalWrapper

public/react/src/modules/user/usersInfo/banks/NewGtaskForm.js

@@ -1,7 +1,7 @@
 import React, { Component } from "react";
 import { Input, InputNumber, Form, Button, Checkbox, Upload, Icon, message, Modal } from "antd";
 import axios from 'axios'
-import { getUploadActionUrl, getUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'
+import { getUploadActionUrl, ConditionToolTip, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll } from 'educoder'
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
 const $ = window.$;
 const MAX_TITLE_LENGTH = 60;