Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8e94c90

Browse files
author
xuxinhua
committed
Merge branch 'master' into develop
2 parents 0a9efac + 585ff63 commit 8e94c90

File tree

12 files changed

+609
-34
lines changed

12 files changed

+609
-34
lines changed

‎websites/code/studygolang/src/controller/error.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,9 @@ func NoAuthorizeHandler(rw http.ResponseWriter, req *http.Request) {
1616
}
1717

1818
func NotFoundHandler(rw http.ResponseWriter, req *http.Request) {
19+
req.Form.Set(filter.CONTENT_TPL_KEY, "/template/notfound.html")
20+
}
21+
22+
func LossChildrenHandler(rw http.ResponseWriter, req *http.Request) {
1923
req.Form.Set(filter.CONTENT_TPL_KEY, "/template/404.html")
2024
}

‎websites/code/studygolang/src/model/article.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ type Article struct {
3535
Content string `json:"content"`
3636
Txt string `json:"txt"`
3737
Tags string `json:"tags"`
38+
Css string `json:"css"`
3839
Viewnum int `json:"viewnum"`
3940
Cmtnum int `json:"cmtnum"`
4041
Likenum int `json:"likenum"`
@@ -116,8 +117,8 @@ func (this *Article) Order(order string) *Article {
116117
}
117118

118119
func (this *Article) prepareInsertData() {
119-
this.columns = []string{"domain", "name", "title", "author", "author_txt", "lang", "pub_date", "url", "content", "txt", "tags", "ctime"}
120-
this.colValues = []interface{}{this.Domain, this.Name, this.Title, this.Author, this.AuthorTxt, this.Lang, this.PubDate, this.Url, this.Content, this.Txt, this.Tags, this.Ctime}
120+
this.columns = []string{"domain", "name", "title", "author", "author_txt", "lang", "pub_date", "url", "content", "txt", "tags", "css", "ctime"}
121+
this.colValues = []interface{}{this.Domain, this.Name, this.Title, this.Author, this.AuthorTxt, this.Lang, this.PubDate, this.Url, this.Content, this.Txt, this.Tags, this.Css, this.Ctime}
121122
}
122123

123124
func (this *Article) colFieldMap() map[string]interface{} {
@@ -135,6 +136,7 @@ func (this *Article) colFieldMap() map[string]interface{} {
135136
"content": &this.Content,
136137
"txt": &this.Txt,
137138
"tags": &this.Tags,
139+
"css": &this.Css,
138140
"viewnum": &this.Viewnum,
139141
"cmtnum": &this.Cmtnum,
140142
"likenum": &this.Likenum,

‎websites/code/studygolang/src/server/studygolang/router.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,10 @@ func initRouter() *mux.Router {
224224

225225
// 错误处理handler
226226
router.FilterChain(fontFilterChan).HandleFunc("/noauthorize", NoAuthorizeHandler) // 无权限handler
227-
// 404页面
227+
// 404（寻找遗失儿童页面）
228+
router.FilterChain(fontFilterChan).HandleFunc("/404", LossChildrenHandler)
229+
230+
// 找不到页面
228231
router.FilterChain(fontFilterChan).HandleFunc("/{*}", NotFoundHandler)
229232

230233
return router

‎websites/code/studygolang/start.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ goto end
88

99
:ok
1010

11-
start /b bin\studygolang >> log\panic.log 2>&1 &
11+
start /b bin\studygolang.exe >> log\panic.log 2>&1 &
1212

1313
echo start successfully
1414

‎websites/code/studygolang/static/css/syntax_highlight/shCore.css

Lines changed: 226 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,226 @@
1+
/**
2+
* SyntaxHighlighter
3+
* http://alexgorbatchev.com/SyntaxHighlighter
4+
*
5+
* SyntaxHighlighter is donationware. If you are using it, please donate.
6+
* http://alexgorbatchev.com/SyntaxHighlighter/donate.html
7+
*
8+
* @version
9+
* 3.0.83 (July 02 2010)
10+
*
11+
* @copyright
12+
* Copyright (C) 2004-2010 Alex Gorbatchev.
13+
*
14+
* @license
15+
* Dual licensed under the MIT and GPL licenses.
16+
*/
17+
.syntaxhighlighter a,
18+
.syntaxhighlighter div,
19+
.syntaxhighlighter code,
20+
.syntaxhighlighter table,
21+
.syntaxhighlighter table td,
22+
.syntaxhighlighter table tr,
23+
.syntaxhighlighter table tbody,
24+
.syntaxhighlighter table thead,
25+
.syntaxhighlighter table caption,
26+
.syntaxhighlighter textarea {
27+
-moz-border-radius: 0 0 0 0 !important;
28+
-webkit-border-radius: 0 0 0 0 !important;
29+
background: none !important;
30+
border: 0 !important;
31+
bottom: auto !important;
32+
float: none !important;
33+
height: auto !important;
34+
left: auto !important;
35+
line-height: 1.1em !important;
36+
margin: 0 !important;
37+
outline: 0 !important;
38+
overflow: visible !important;
39+
padding: 0 !important;
40+
position: static !important;
41+
right: auto !important;
42+
text-align: left !important;
43+
top: auto !important;
44+
vertical-align: baseline !important;
45+
width: auto !important;
46+
box-sizing: content-box !important;
47+
font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
48+
font-weight: normal !important;
49+
font-style: normal !important;
50+
font-size: 1em !important;
51+
min-height: inherit !important;
52+
min-height: auto !important;
53+
}
54+
55+
.syntaxhighlighter {
56+
width: 100% !important;
57+
margin: 1em 0 1em 0 !important;
58+
position: relative !important;
59+
overflow: auto !important;
60+
font-size: 1em !important;
61+
}
62+
.syntaxhighlighter.source {
63+
overflow: hidden !important;
64+
}
65+
.syntaxhighlighter .bold {
66+
font-weight: bold !important;
67+
}
68+
.syntaxhighlighter .italic {
69+
font-style: italic !important;
70+
}
71+
.syntaxhighlighter .line {
72+
white-space: pre !important;
73+
}
74+
.syntaxhighlighter table {
75+
width: 100% !important;
76+
}
77+
.syntaxhighlighter table caption {
78+
text-align: left !important;
79+
padding: .5em 0 0.5em 1em !important;
80+
}
81+
.syntaxhighlighter table td.code {
82+
width: 100% !important;
83+
}
84+
.syntaxhighlighter table td.code .container {
85+
position: relative !important;
86+
}
87+
.syntaxhighlighter table td.code .container textarea {
88+
box-sizing: border-box !important;
89+
position: absolute !important;
90+
left: 0 !important;
91+
top: 0 !important;
92+
width: 100% !important;
93+
height: 100% !important;
94+
border: none !important;
95+
background: white !important;
96+
padding-left: 1em !important;
97+
overflow: hidden !important;
98+
white-space: pre !important;
99+
}
100+
.syntaxhighlighter table td.gutter .line {
101+
text-align: right !important;
102+
padding: 0 0.5em 0 1em !important;
103+
}
104+
.syntaxhighlighter table td.code .line {
105+
padding: 0 1em !important;
106+
}
107+
.syntaxhighlighter.nogutter td.code .container textarea, .syntaxhighlighter.nogutter td.code .line {
108+
padding-left: 0em !important;
109+
}
110+
.syntaxhighlighter.show {
111+
display: block !important;
112+
}
113+
.syntaxhighlighter.collapsed table {
114+
display: none !important;
115+
}
116+
.syntaxhighlighter.collapsed .toolbar {
117+
padding: 0.1em 0.8em 0em 0.8em !important;
118+
font-size: 1em !important;
119+
position: static !important;
120+
width: auto !important;
121+
height: auto !important;
122+
}
123+
.syntaxhighlighter.collapsed .toolbar span {
124+
display: inline !important;
125+
margin-right: 1em !important;
126+
}
127+
.syntaxhighlighter.collapsed .toolbar span a {
128+
padding: 0 !important;
129+
display: none !important;
130+
}
131+
.syntaxhighlighter.collapsed .toolbar span a.expandSource {
132+
display: inline !important;
133+
}
134+
.syntaxhighlighter .toolbar {
135+
position: absolute !important;
136+
right: 1px !important;
137+
top: 1px !important;
138+
width: 11px !important;
139+
height: 11px !important;
140+
font-size: 10px !important;
141+
z-index: 10 !important;
142+
}
143+
.syntaxhighlighter .toolbar span.title {
144+
display: inline !important;
145+
}
146+
.syntaxhighlighter .toolbar a {
147+
display: block !important;
148+
text-align: center !important;
149+
text-decoration: none !important;
150+
padding-top: 1px !important;
151+
}
152+
.syntaxhighlighter .toolbar a.expandSource {
153+
display: none !important;
154+
}
155+
.syntaxhighlighter.ie {
156+
font-size: .9em !important;
157+
padding: 1px 0 1px 0 !important;
158+
}
159+
.syntaxhighlighter.ie .toolbar {
160+
line-height: 8px !important;
161+
}
162+
.syntaxhighlighter.ie .toolbar a {
163+
padding-top: 0px !important;
164+
}
165+
.syntaxhighlighter.printing .line.alt1 .content,
166+
.syntaxhighlighter.printing .line.alt2 .content,
167+
.syntaxhighlighter.printing .line.highlighted .number,
168+
.syntaxhighlighter.printing .line.highlighted.alt1 .content,
169+
.syntaxhighlighter.printing .line.highlighted.alt2 .content {
170+
background: none !important;
171+
}
172+
.syntaxhighlighter.printing .line .number {
173+
color: #bbbbbb !important;
174+
}
175+
.syntaxhighlighter.printing .line .content {
176+
color: black !important;
177+
}
178+
.syntaxhighlighter.printing .toolbar {
179+
display: none !important;
180+
}
181+
.syntaxhighlighter.printing a {
182+
text-decoration: none !important;
183+
}
184+
.syntaxhighlighter.printing .plain, .syntaxhighlighter.printing .plain a {
185+
color: black !important;
186+
}
187+
.syntaxhighlighter.printing .comments, .syntaxhighlighter.printing .comments a {
188+
color: #008200 !important;
189+
}
190+
.syntaxhighlighter.printing .string, .syntaxhighlighter.printing .string a {
191+
color: blue !important;
192+
}
193+
.syntaxhighlighter.printing .keyword {
194+
color: #006699 !important;
195+
font-weight: bold !important;
196+
}
197+
.syntaxhighlighter.printing .preprocessor {
198+
color: gray !important;
199+
}
200+
.syntaxhighlighter.printing .variable {
201+
color: #aa7700 !important;
202+
}
203+
.syntaxhighlighter.printing .value {
204+
color: #009900 !important;
205+
}
206+
.syntaxhighlighter.printing .functions {
207+
color: #ff1493 !important;
208+
}
209+
.syntaxhighlighter.printing .constants {
210+
color: #0066cc !important;
211+
}
212+
.syntaxhighlighter.printing .script {
213+
font-weight: bold !important;
214+
}
215+
.syntaxhighlighter.printing .color1, .syntaxhighlighter.printing .color1 a {
216+
color: gray !important;
217+
}
218+
.syntaxhighlighter.printing .color2, .syntaxhighlighter.printing .color2 a {
219+
color: #ff1493 !important;
220+
}
221+
.syntaxhighlighter.printing .color3, .syntaxhighlighter.printing .color3 a {
222+
color: red !important;
223+
}
224+
.syntaxhighlighter.printing .break, .syntaxhighlighter.printing .break a {
225+
color: black !important;
226+
}

0 commit comments

Comments
 (0)