Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop

add.txt

@@ -26,9 +26,11 @@ MainContentContainer
 
 
 
-TODO 
-    待同步 
+TODO
+    待同步
     1、timer图标样式更换
     index.html
     WebSSHTimer.css
-    WebSSHTimer.js
+    WebSSHTimer.js
+
+		

config/env.js

@@ -76,7 +76,7 @@ function getClientEnvironment(publicUrl) {
 				// For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
 				// This should only be used as an escape hatch. Normally you would put
 				// images into the `src` and `import` them in code to get their paths.
-				PUBLIC_URL: '/forgeplus-react/build/.',
+				PUBLIC_URL: '/react/build/.',
 			}
 		);
 	// Stringify all values so we can feed into Webpack DefinePlugin

config/webpack.config.prod.js

@@ -83,7 +83,7 @@ module.exports = {
 		// cdn
 		// publicPath: 'https://shixun.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
 		// publicPath: 'https://cdn-testeduplus2.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
-		publicPath: '/forgeplus-react/build/', //publicPath,   https://cdn.educoder.net
+		publicPath: '/react/build/', //publicPath,   https://cdn.educoder.net
 
 		// Point sourcemap entries to original disk location (format as URL on Windows)
 		devtoolModuleFilenameTemplate: info =>

scripts/build.js

@@ -186,7 +186,7 @@ function generateNewIndexJsp() {
   // combinedStream.append(htmlContent);
   // combinedStream.pipe(fs2.createWriteStream( filePath ));
 
-  var outputPath = paths.appBuild  + '/../../../index.html'
+  var outputPath = paths.appBuild  + '/index.html'
   fs2.readFile(filePath, 'utf8', function (err,data) {
     if (err) {
       return console.log(err);
@@ -197,12 +197,12 @@ function generateNewIndexJsp() {
     cdnHost = ''
 
 
-    var mainRegex = /<script type="text\/javascript" src="\/forgeplus-react\/build\/.\/static\/js\/main.([a-zA-Z0-9]{8,}).js"><\/script>/
+    var mainRegex = /<script type="text\/javascript" src="\/react\/build\/.\/static\/js\/main.([a-zA-Z0-9]{8,}).js"><\/script>/
     var matchResult = data.match(mainRegex)
     var code = `
       <script>
          (function() {
-            var _host = '/forgeplus-react/build/'
+            var _host = '/react/build/'
             /**/
             if (window.location.host == 'pre-newweb.educoder.net') {
                 _host = 'https://testali-cdn.educoder.net/react/build/'

src/App.js

@@ -486,7 +486,7 @@ class App extends Component {
 			oldLink = document.getElementById('dynamic-favicon');
 		link.id = 'dynamic-favicon';
 		link.rel = 'shortcut icon';
-		link.href = "/forgeplus-react/build/./favicon.ico";
+		link.href = "/react/build/./favicon.ico";
 		if (oldLink) {
 			document.head.removeChild(oldLink);
 		}