From 84bffef2539547d1006131dcb9a0634f0522a33c Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Tue, 17 Mar 2020 21:58:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?FIX=20=E6=9B=B4=E6=94=B9build=20profuction?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/env.js                 | 2 +-
 config/webpack.config.prod.js | 2 +-
 scripts/build.js              | 6 +++---
 src/App.js                    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/env.js b/config/env.js
index 905ee7d2b..ae1edea65 100644
--- a/config/env.js
+++ b/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
diff --git a/config/webpack.config.prod.js b/config/webpack.config.prod.js
index 8e38b62f9..838ce28a8 100644
--- a/config/webpack.config.prod.js
+++ b/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 =>
diff --git a/scripts/build.js b/scripts/build.js
index f5c692a7a..91b76133a 100644
--- a/scripts/build.js
+++ b/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/'
diff --git a/src/App.js b/src/App.js
index ec306f8ae..c1f17c5be 100644
--- a/src/App.js
+++ b/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);
 		}

From 53d50a22f80254acabf414e666ef632b6d118cde Mon Sep 17 00:00:00 2001
From: Jasder <2053003901@@qq.com>
Date: Wed, 18 Mar 2020 16:11:04 +0800
Subject: [PATCH 2/2] FIX test push

---
 add.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/add.txt b/add.txt
index 8bd5bb1d3..14b6fefef 100644
--- a/add.txt
+++ b/add.txt
@@ -26,9 +26,11 @@ MainContentContainer
 
 
 
-TODO 
-    待同步 
+TODO
+    待同步
     1、timer图标样式更换
     index.html
     WebSSHTimer.css
-    WebSSHTimer.js
\ No newline at end of file
+    WebSSHTimer.js
+
+