From ad462921b5f9ad0b5cb2dcc83221eae101526ad1 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Sun, 26 Jun 2016 23:29:43 +0800 Subject: [PATCH 01/26] helloword --- liscott327/test/test.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 liscott327/test/test.js diff --git a/liscott327/test/test.js b/liscott327/test/test.js new file mode 100644 index 0000000..accefce --- /dev/null +++ b/liscott327/test/test.js @@ -0,0 +1 @@ +console.log("Hello World"); From d57f16b27a668643cff4b043d79e27ee1d808374 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Mon, 27 Jun 2016 15:37:29 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E6=B8=AC=E8=A9=A6=EF=BC=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/test1.js | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 liscott327/test1.js diff --git a/liscott327/test1.js b/liscott327/test1.js new file mode 100644 index 0000000..62ac47f --- /dev/null +++ b/liscott327/test1.js @@ -0,0 +1,2 @@ +console.log("hello world"); + From 6acf3a3f560d244d4161324ca65ef8ec870210c2 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 28 Jun 2016 22:27:46 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E9=80=99=E6=98=AFhelloword=E9=80=99?= =?UTF-8?q?=E6=98=AFhelloword=E9=80=99=E6=98=AFhelloword=E9=80=99=E6=98=AF?= =?UTF-8?q?helloword?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/Helloword.js | 1 + 1 file changed, 1 insertion(+) create mode 100644 liscott327/Helloword.js diff --git a/liscott327/Helloword.js b/liscott327/Helloword.js new file mode 100644 index 0000000..9ee8cf8 --- /dev/null +++ b/liscott327/Helloword.js @@ -0,0 +1 @@ +console.log("Helloword!"); From fe4ccd2df21620bf10450ce4fc1f2e00a2cba906 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 28 Jun 2016 22:40:33 +0800 Subject: [PATCH 04/26] helloword --- liscott327/Helloword.js | 1 + 1 file changed, 1 insertion(+) diff --git a/liscott327/Helloword.js b/liscott327/Helloword.js index 9ee8cf8..97e4877 100644 --- a/liscott327/Helloword.js +++ b/liscott327/Helloword.js @@ -1 +1,2 @@ console.log("Helloword!"); + From 2c628b096978bfa95ce49d594c10de5a13d6b80b Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 28 Jun 2016 15:26:14 +0800 Subject: [PATCH 05/26] server --- liscott327/sever.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 liscott327/sever.js diff --git a/liscott327/sever.js b/liscott327/sever.js new file mode 100644 index 0000000..cb9f24e --- /dev/null +++ b/liscott327/sever.js @@ -0,0 +1,6 @@ +var http = require("http"); +http.createServer(function(request, response) { + response.writeHead(200, {"Content-Type": "text/plain"}); + response.write("How are you?"); + response.end(); +}).listen(8888); From 9d8538f2b0ed7d7d4b425b90ff5613a7b28ee60d Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 28 Jun 2016 15:42:32 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E7=9B=A3=E8=81=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/server2.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 liscott327/server2.js diff --git a/liscott327/server2.js b/liscott327/server2.js new file mode 100644 index 0000000..c2b7268 --- /dev/null +++ b/liscott327/server2.js @@ -0,0 +1,3 @@ +var http = require("http"); +var server = http.createServer(); +server.listen(8888); From c944541139fd83b38edd425cc419224bbfe7646c Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 28 Jun 2016 15:57:06 +0800 Subject: [PATCH 07/26] =?UTF-8?q?=E5=87=BD=E6=95=B8=E5=82=B3=E9=81=9E1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/function.js | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 liscott327/function.js diff --git a/liscott327/function.js b/liscott327/function.js new file mode 100644 index 0000000..b68426a --- /dev/null +++ b/liscott327/function.js @@ -0,0 +1,10 @@ +function say(word) { + console.log(word); +} + +function execute(someFunction, value) { + someFunction(value); +} + +execute(say, "Hello"); + From fb9e81d5ac4fbdb805199748626be8e8b2155aca Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 28 Jun 2016 15:59:46 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E5=87=BD=E6=95=B8=E5=82=B3=E5=80=BC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/function1.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 liscott327/function1.js diff --git a/liscott327/function1.js b/liscott327/function1.js new file mode 100644 index 0000000..4975c29 --- /dev/null +++ b/liscott327/function1.js @@ -0,0 +1,6 @@ +function execute(someFunction, value) { + someFunction(value); +} + +execute(function(word){ console.log(word) }, "Hello"); + From d4637b69fa1c20c8a78048be6a402634f628847f Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 11:28:07 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E6=96=B0=E5=A2=9Ereadme.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/test/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 liscott327/test/README.md diff --git a/liscott327/test/README.md b/liscott327/test/README.md new file mode 100644 index 0000000..6c7492a --- /dev/null +++ b/liscott327/test/README.md @@ -0,0 +1,2 @@ +＃這是一個測試資料夾 +所有測試檔案會放在這裡 From 43bc127111b68adb4312a3926abf62d39522692f Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 11:37:47 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9Readme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/test/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liscott327/test/README.md b/liscott327/test/README.md index 6c7492a..1367ef9 100644 --- a/liscott327/test/README.md +++ b/liscott327/test/README.md @@ -1,2 +1,2 @@ -＃這是一個測試資料夾 +＃ 這是一個測試資料夾 所有測試檔案會放在這裡 From 9dde107d98e54740a198b0fd82de76953298f4c5 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 11:49:50 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/test/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/liscott327/test/README.md b/liscott327/test/README.md index 1367ef9..ce364e0 100644 --- a/liscott327/test/README.md +++ b/liscott327/test/README.md @@ -1,2 +1,2 @@ -＃ 這是一個測試資料夾 -所有測試檔案會放在這裡 +# Intern tutorial +## 這是一個測試資料夾 From 52a6266b4995c1700091402456ebc7f7266c7bc0 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 11:51:45 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/test/README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/liscott327/test/README.md b/liscott327/test/README.md index ce364e0..0294e30 100644 --- a/liscott327/test/README.md +++ b/liscott327/test/README.md @@ -1,2 +1,4 @@ # Intern tutorial -## 這是一個測試資料夾 + + +### 這是一個測試資料夾 From 971a2794cdd781abd28aeacb294ccd8b8eadc543 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 11:54:03 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E6=95=B4=E7=90=86=E8=B3=87=E6=96=99?= =?UTF-8?q?=E5=A4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/test1.js | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 liscott327/test1.js diff --git a/liscott327/test1.js b/liscott327/test1.js deleted file mode 100644 index 62ac47f..0000000 --- a/liscott327/test1.js +++ /dev/null @@ -1,2 +0,0 @@ -console.log("hello world"); - From 241704fd7099eab6d5de1e02dde22be989adef3d Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 12:00:36 +0800 Subject: [PATCH 14/26] delete --- liscott327/Helloword.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/liscott327/Helloword.js b/liscott327/Helloword.js index 97e4877..a460b59 100644 --- a/liscott327/Helloword.js +++ b/liscott327/Helloword.js @@ -1,2 +1 @@ -console.log("Helloword!"); - +console.log("Helloworld!"); From b4ad3996e41543a146374402848940c4f1d6838c Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 12:07:23 +0800 Subject: [PATCH 15/26] README --- liscott327/git/README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 liscott327/git/README.md diff --git a/liscott327/git/README.md b/liscott327/git/README.md new file mode 100644 index 0000000..342e82f --- /dev/null +++ b/liscott327/git/README.md @@ -0,0 +1 @@ +### GIT練習用資料夾 From e80e66b879d771d601ab61e249de464610ec6c93 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 12:45:58 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E8=B3=87=E6=96=99=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/README.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 liscott327/README.md diff --git a/liscott327/README.md b/liscott327/README.md new file mode 100644 index 0000000..242c4e5 --- /dev/null +++ b/liscott327/README.md @@ -0,0 +1,9 @@ +# 練習種整理 + ## 練習測試檔案 + * helloworld.js + + ## node.js練習 + * server.js + * server2.js + * function.js + * function1.js From 73d94310e14880c17361e2897de2446a2d4695a1 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 12:49:16 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E8=B3=87=E6=96=99=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/liscott327/README.md b/liscott327/README.md index 242c4e5..56413e0 100644 --- a/liscott327/README.md +++ b/liscott327/README.md @@ -1,9 +1,11 @@ # 練習種整理 - ## 練習測試檔案 - * helloworld.js - ## node.js練習 - * server.js - * server2.js - * function.js - * function1.js +### 練習測試檔案 +* helloworld.js + +### node.js練習 +* server.js +* server2.js +* function.js +* function1.js +* From d57c7fc3142319b56776077134e0480d02d44f9d Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 12:52:27 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liscott327/README.md b/liscott327/README.md index 56413e0..ece4360 100644 --- a/liscott327/README.md +++ b/liscott327/README.md @@ -1,4 +1,4 @@ -# 練習種整理 +# 練習總整理 ### 練習測試檔案 * helloworld.js From ca2d123b50266934fea7145884e1391fa20017be Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:16:29 +0800 Subject: [PATCH 19/26] first commit --- liscott327/git/document.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 liscott327/git/document.txt diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt new file mode 100644 index 0000000..1c2fe06 --- /dev/null +++ b/liscott327/git/document.txt @@ -0,0 +1,3 @@ +first line +second line + From cdc6a444e3bbfdfba67948b9377cfd4b2b3b17fa Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:19:11 +0800 Subject: [PATCH 20/26] second commit --- liscott327/git/document.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index 1c2fe06..c0228b5 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -1,3 +1,5 @@ first line second line +【星島日報報道】香港天文台表示，今年首個熱帶氣旋「尼伯特」已增強為颱風，預測在周五會進一步增強為超級颱風，屆時將在香港800公里附近略過，吹向呂宋以東至台灣一帶。 + From 495fe755e611f1ce131456f231ce2eb39fc358b0 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:20:11 +0800 Subject: [PATCH 21/26] third commit --- liscott327/git/document.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index c0228b5..9d6f823 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -2,4 +2,6 @@ first line second line 【星島日報報道】香港天文台表示，今年首個熱帶氣旋「尼伯特」已增強為颱風，預測在周五會進一步增強為超級颱風，屆時將在香港800公里附近略過，吹向呂宋以東至台灣一帶。 +香港天文台表示，現時驟雨正影響廣東沿岸及南海東北部。在正午12時，颱風「尼伯特」集結在雅蒲島之西北偏北約760公里，預料向西北移動，時速約28公里，移向呂宋以東至台灣一帶。預料「尼伯特」會在未來數天逐漸增強，並移向呂宋以東至台灣一帶。周五氣溫將最高達35度，天晴酷熱。 + From 9db611aaae41140440636f8d651acd6310a9ba6d Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:21:09 +0800 Subject: [PATCH 22/26] fourth commit --- liscott327/git/document.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index 9d6f823..4d8cdb7 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -4,4 +4,4 @@ second line 香港天文台表示，現時驟雨正影響廣東沿岸及南海東北部。在正午12時，颱風「尼伯特」集結在雅蒲島之西北偏北約760公里，預料向西北移動，時速約28公里，移向呂宋以東至台灣一帶。預料「尼伯特」會在未來數天逐漸增強，並移向呂宋以東至台灣一帶。周五氣溫將最高達35度，天晴酷熱。 - +台灣中央氣象局表示，「尼伯特」颱風強度持續增強，週四、五最接近台灣，暴風圈恐掃過東北角，發布海上颱風警報機率高，不排除有發展成強烈颱風的可能性。又指即使「尼伯特」颱風沒有登陸台灣，暴風圈和外圍環流也會掃過台灣，周四、五將是最接近台灣的時候，東北角首當其衝，提醒民眾做好防颱措施。 From 80dc483a1a7848bf2ee48e5c375e9c7253aa9261 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:37:27 +0800 Subject: [PATCH 23/26] fifth commit --- liscott327/git/document.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index 4d8cdb7..9d6f823 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -4,4 +4,4 @@ second line 香港天文台表示，現時驟雨正影響廣東沿岸及南海東北部。在正午12時，颱風「尼伯特」集結在雅蒲島之西北偏北約760公里，預料向西北移動，時速約28公里，移向呂宋以東至台灣一帶。預料「尼伯特」會在未來數天逐漸增強，並移向呂宋以東至台灣一帶。周五氣溫將最高達35度，天晴酷熱。 -台灣中央氣象局表示，「尼伯特」颱風強度持續增強，週四、五最接近台灣，暴風圈恐掃過東北角，發布海上颱風警報機率高，不排除有發展成強烈颱風的可能性。又指即使「尼伯特」颱風沒有登陸台灣，暴風圈和外圍環流也會掃過台灣，周四、五將是最接近台灣的時候，東北角首當其衝，提醒民眾做好防颱措施。 + From 459c95f4423f11e0fe325f12278b898d0c8df242 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:39:59 +0800 Subject: [PATCH 24/26] sixth commit --- liscott327/git/document.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index 9d6f823..b4d7372 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -4,4 +4,4 @@ second line 香港天文台表示，現時驟雨正影響廣東沿岸及南海東北部。在正午12時，颱風「尼伯特」集結在雅蒲島之西北偏北約760公里，預料向西北移動，時速約28公里，移向呂宋以東至台灣一帶。預料「尼伯特」會在未來數天逐漸增強，並移向呂宋以東至台灣一帶。周五氣溫將最高達35度，天晴酷熱。 - +sixth commit From 766fe1986af017104a07ebcc93664088c0b515d5 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 16:46:59 +0800 Subject: [PATCH 25/26] seventh commit --- liscott327/git/document.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index 4d8cdb7..19a9ed9 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -5,3 +5,4 @@ second line 香港天文台表示，現時驟雨正影響廣東沿岸及南海東北部。在正午12時，颱風「尼伯特」集結在雅蒲島之西北偏北約760公里，預料向西北移動，時速約28公里，移向呂宋以東至台灣一帶。預料「尼伯特」會在未來數天逐漸增強，並移向呂宋以東至台灣一帶。周五氣溫將最高達35度，天晴酷熱。 台灣中央氣象局表示，「尼伯特」颱風強度持續增強，週四、五最接近台灣，暴風圈恐掃過東北角，發布海上颱風警報機率高，不排除有發展成強烈颱風的可能性。又指即使「尼伯特」颱風沒有登陸台灣，暴風圈和外圍環流也會掃過台灣，周四、五將是最接近台灣的時候，東北角首當其衝，提醒民眾做好防颱措施。 +seventh commit From 6b3c64c333b6e033979d106b5fb6d510bedaa864 Mon Sep 17 00:00:00 2001 From: liscott327 Date: Tue, 5 Jul 2016 18:52:56 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E5=90=88=E4=BD=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- liscott327/git/document.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/liscott327/git/document.txt b/liscott327/git/document.txt index 1e43815..9d6f823 100644 --- a/liscott327/git/document.txt +++ b/liscott327/git/document.txt @@ -4,9 +4,4 @@ second line 香港天文台表示，現時驟雨正影響廣東沿岸及南海東北部。在正午12時，颱風「尼伯特」集結在雅蒲島之西北偏北約760公里，預料向西北移動，時速約28公里，移向呂宋以東至台灣一帶。預料「尼伯特」會在未來數天逐漸增強，並移向呂宋以東至台灣一帶。周五氣溫將最高達35度，天晴酷熱。 -<<<<<<< HEAD -台灣中央氣象局表示，「尼伯特」颱風強度持續增強，週四、五最接近台灣，暴風圈恐掃過東北角，發布海上颱風警報機率高，不排除有發展成強烈颱風的可能性。又指即使「尼伯特」颱風沒有登陸台灣，暴風圈和外圍環流也會掃過台灣，周四、五將是最接近台灣的時候，東北角首當其衝，提醒民眾做好防颱措施。 -seventh commit -======= -sixth commit ->>>>>>> testing +