Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

public/react/public/index.html

@@ -148,14 +148,18 @@
     <!-- 在tpi js里加载这3个脚本 -->
     <script>
       (function() { // Scoping function to avoid globals
+        var _url_origins='';
+        if(window.location.port === "3007"){
+            _url_origins="https://newweb.educoder.net";
+        }
         var href = location.href;
           if (href.indexOf('/tasks/') != -1) {
-            document.write('<script type="text/javascript" src="http://47.96.87.25:48080/assets/kindeditor/kindeditor.js"><\/script>');
+            document.write('<script type="text/javascript" src=_url_origins+"/assets/kindeditor/kindeditor.js"><\/script>');
             // build.js中会将这个url附加一个前缀 react/build
             document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
-            document.write('<script type="text/javascript" src="http://47.96.87.25:48080/javascripts/educoder/edu_application.js"><\/script>');
+            document.write('<script type="text/javascript" src=_url_origins+"/javascripts/educoder/edu_application.js"><\/script>');
           } else if (href.indexOf('/paths/') != -1) {
-            document.write('<script type="text/javascript" src="http://47.96.87.25:48080/javascripts/educoder/edu_application.js"><\/script>');
+            document.write('<script type="text/javascript" src=_url_origins+"/javascripts/educoder/edu_application.js"><\/script>');
 
           }
       })();