fix:fix code style eslint

ecitlm · Jun 30, 2018 · ee0eeb1 · ee0eeb1
1 parent 8dbae63
commit ee0eeb1
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 104 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -0,0 +1 @@
+/utils/
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,7 @@
+module.exports = {
+   // "extends": "standard"
+    parserOptions: {
+      sourceType: 'module',
+      "ecmaVersion": 6
+    }
+};
diff --git a/app.js b/app.js
@@ -2,87 +2,52 @@
  * @Author: ecitlm
  * @Date: 2017-12-06 16:20:03
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-26 22:44:50
+ * @Last Modified time: 2018-06-29 22:10:37
  */
 const express = require('express')
 const app = express()
 const router = express.Router()
-const path = require('path')
 app.use('/public', express.static('public')) // 设置静态资源地址
 app.use('/docs', express.static('docs')) // 设置静态资源地址
-app.all('*', function(req, res, next) {
+app.all('*', function (req, res, next) {
   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
   res.header('Access-Control-Allow-Methods', 'PUT,POST,GET,DELETE,OPTIONS')
   res.header('X-Powered-By', ' 3.2.1')
   next()
 })
-
-const index = require('./routes/web/index')
-const photo_type = require('./routes/api/photo/photo_type')
-const photo_list = require('./routes/api/photo/photo_list')
-const photo_view = require('./routes/api/photo/photo_view')
-const huaban = require('./routes/api/photo/huaban')
-const jandan = require('./routes/api/photo/jandan')
-// 音樂
-const plist = require('./routes/api/music/plist')
-const plist_songs = require('./routes/api/music/plist_songs')
-const rank_list = require('./routes/api/music/rank_list')
-const rank_list_info = require('./routes/api/music/rank_list_info')
-const song_info = require('./routes/api/music/song_info')
-const song_lrc = require('./routes/api/music/song_lrc')
-const new_songs = require('./routes/api/music/new_songs')
-const singer_classify = require('./routes/api/music/singer_classify')
-const singer_list = require('./routes/api/music/singer_list')
-const singer_info = require('./routes/api/music/singer_info')
-const music_search = require('./routes/api/music/search')
-const web_frame = require('./routes/api/it/web_frame')
-const daily_list = require('./routes/api/it/daily_list')
-const daily_info = require('./routes/api/it/daily_info')
-const joke_list = require('./routes/api/joke/joke_list')
-const joke_img = require('./routes/api/joke/joke_img')
-const joke_photo = require('./routes/api/joke/joke_photo')
-const news_list = require('./routes/api/news/news_list')
-const video_list = require('./routes/api/news/video_list')
-const news_detail = require('./routes/api/news/news_detail')
-const job_list = require('./routes/api/job/job_list')
-const job_info = require('./routes/api/job/job_info')
-app.use('/', index)
-app.use('/api/photo_type', photo_type)
-app.use('/api/huaban', huaban)
-app.use('/api/photo_list', photo_list)
-app.use('/api/photo_view', photo_view)
-app.use('/api/rank_list', rank_list)
-app.use('/api/rank_list_info', rank_list_info)
-app.use('/api/song_info', song_info)
-app.use('/api/song_lrc', song_lrc)
-app.use('/api/plist', plist)
-app.use('/api/plist_songs', plist_songs)
-app.use('/api/new_songs', new_songs)
-app.use('/api/singer_classify', singer_classify)
-app.use('/api/singer_list', singer_list)
-app.use('/api/singer_info', singer_info)
-app.use('/api/music_search', music_search)
-app.use('/api/web_frame', web_frame)
-app.use('/api/daily_list', daily_list)
-app.use('/api/daily_info', daily_info)
-app.use('/api/joke_list', joke_list)
-app.use('/api/joke_img', joke_img)
-app.use('/api/joke_photo', joke_photo)
-app.use('/api/jandan', jandan)
-app.use('/api/news_list', news_list)
-app.use('/api/video_list', video_list)
-app.use('/api/news_detail', news_detail)
-app.use('/api/job_list', job_list)
-app.use('/api/job_info', job_info)
+app.use('/', require('./routes/web/index'))
+app.use('/api/photo_type', require('./routes/api/photo/photo_type'))
+app.use('/api/huaban', require('./routes/api/photo/huaban'))
+app.use('/api/photo_list', require('./routes/api/photo/photo_list'))
+app.use('/api/photo_view', require('./routes/api/photo/photo_view'))
+app.use('/api/rank_list', require('./routes/api/music/rank_list'))
+app.use('/api/rank_list_info', require('./routes/api/music/rank_list_info'))
+app.use('/api/song_info', require('./routes/api/music/song_info'))
+app.use('/api/song_lrc', require('./routes/api/music/song_lrc'))
+app.use('/api/plist', require('./routes/api/music/plist'))
+app.use('/api/plist_songs', require('./routes/api/music/plist_songs'))
+app.use('/api/new_songs', require('./routes/api/music/new_songs'))
+app.use('/api/singer_classify', require('./routes/api/music/singer_classify'))
+app.use('/api/singer_list', require('./routes/api/music/singer_list'))
+app.use('/api/singer_info', require('./routes/api/music/singer_info'))
+app.use('/api/music_search', require('./routes/api/music/search'))
+app.use('/api/web_frame', require('./routes/api/it/web_frame'))
+app.use('/api/daily_list', require('./routes/api/it/daily_list'))
+app.use('/api/daily_info', require('./routes/api/it/daily_info'))
+app.use('/api/joke_list', require('./routes/api/joke/joke_list'))
+app.use('/api/joke_img', require('./routes/api/joke/joke_img'))
+app.use('/api/joke_photo', require('./routes/api/joke/joke_photo'))
+app.use('/api/jandan', require('./routes/api/photo/jandan'))
+app.use('/api/news_list', require('./routes/api/news/news_list'))
+app.use('/api/video_list', require('./routes/api/news/video_list'))
+app.use('/api/news_detail', require('./routes/api/news/news_detail'))
+app.use('/api/job_list', require('./routes/api/job/job_list'))
+app.use('/api/job_info', require('./routes/api/job/job_info'))
 // web
-const web_daily = require('./routes/web/daily_list')
-const web_daily_info = require('./routes/web/daily_info')
-const web_photo = require('./routes/web/photo')
-const web_jandan = require('./routes/web/jandan')
-app.use('/web/daily_list', web_daily)
-app.use('/web/daily_info', web_daily_info)
-app.use('/web/photo', web_photo)
-app.use('/web/jandan', web_jandan)
+app.use('/web/daily_list', require('./routes/web/daily_list'))
+app.use('/web/daily_info', require('./routes/web/daily_info'))
+app.use('/web/photo', require('./routes/web/photo'))
+app.use('/web/jandan', require('./routes/web/jandan'))
 app.use(router)
 app.listen(3001)
 console.log('app start success port:3001')

diff --git a/package.json b/package.json
@@ -27,10 +27,19 @@
     "atob": "^2.0.3",
     "btoa": "^1.1.2",
     "debug": "~0.7.4",
+    "eslint": "^5.0.1",
     "fs": "^0.0.1-security",
     "html-entities": "^1.2.1",
     "mkdirp": "^0.5.1",
-    "nodemon": "^1.17.3"
+    "nodemon": "^1.17.3",
+    "eslint-config-standard": "^10.2.1",
+    "eslint-friendly-formatter": "^3.0.0",
+    "eslint-loader": "^1.7.1",
+    "eslint-plugin-html": "^3.0.0",
+    "eslint-plugin-import": "^2.7.0",
+    "eslint-plugin-node": "^5.2.0",
+    "eslint-plugin-promise": "^3.4.0",
+    "eslint-plugin-standard": "^3.0.1"
   },
   "standard": {
     "ignore": [
@@ -44,4 +53,4 @@
       "$"
     ]
   }
-}
+}
diff --git a/public/index.html b/public/index.html
@@ -10,9 +10,6 @@
  </head>
  <body>
   <h3>2017/12/2</h3>
-
   <script src="https://unpkg.com/axios/dist/axios.min.js"></script>
-
-  </script>
  </body>
 </html>
diff --git a/routes/api/it/daily_info.js b/routes/api/it/daily_info.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date:   2017-12-01 21:06:42
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 16:53:56
+ * @Last Modified time: 2018-06-29 22:13:07
  */
 const express = require('express')
 const cheerio = require('cheerio')
@@ -24,7 +24,7 @@ function list (req, res) {
       encoding: null,
       headers: headers
     },
-    function(error, response, body) {
+    function (error, response, body) {
       if (response && response.statusCode === 200) {
         body = Iconv.decode(body, 'utf-8')
         let $ = cheerio.load(body)
@@ -57,6 +57,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有，点问题'

diff --git a/routes/api/it/daily_list.js b/routes/api/it/daily_list.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date:   2017-12-01 21:02:46
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 22:13:24
+ * @Last Modified time: 2018-06-29 22:12:54
  */
 
 const express = require('express')
@@ -52,6 +52,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有，点问题'

diff --git a/routes/api/it/web_frame.js b/routes/api/it/web_frame.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date:   2017-12-01 20:29:08
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 22:13:45
+ * @Last Modified time: 2018-06-29 22:13:07
  */
 const express = require('express')
 const cheerio = require('cheerio')
@@ -67,6 +67,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有点问题'

diff --git a/routes/api/job/job_info.js b/routes/api/job/job_info.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date: 2017-12-19 09:49:04
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 22:14:05
+ * @Last Modified time: 2018-06-29 22:13:25
  */
 const express = require('express')
 const cheerio = require('cheerio')
@@ -67,6 +67,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有，点问题'

diff --git a/routes/api/joke/joke_photo.js b/routes/api/joke/joke_photo.js
@@ -2,15 +2,13 @@
  * @Author: ecitlm
  * @Date:   2017-12-06 14:45:33
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 22:15:06
+ * @Last Modified time: 2018-06-29 22:19:30
  */
 
 const express = require('express')
-const http = require('http')
 const cheerio = require('cheerio')
 const app = express()
 const request = require('request')
-const fs = require('fs')
 const Iconv = require('iconv-lite')
 
 function list (req, res) {
@@ -46,6 +44,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有，点问题'

diff --git a/routes/api/photo/huaban.js b/routes/api/photo/huaban.js
@@ -2,15 +2,15 @@
  * @Author: ecitlm
  * @Date:   2017-12-01 22:00:20
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-14 23:33:59
+ * @Last Modified time: 2018-06-29 22:22:51
  */
 
 const express = require('express')
 const app = express()
 const Server = require('../../../utils/httpServer')
-const async = require('async')
-const fs = require('fs')
-const request = require('request')
+// const async = require('async')
+// const fs = require('fs')
+// const request = require('request')
 
 function MathRand () {
   let Num = ''

diff --git a/routes/api/photo/jandan.js b/routes/api/photo/jandan.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date: 2017-12-07 19:56:26
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 16:57:48
+ * @Last Modified time: 2018-06-29 22:19:53
  */
 const express = require('express')
 // const http = require('http')
@@ -37,7 +37,7 @@ function list (req, res) {
       let links = []
       if (response) {
         body = Iconv.decode(body, 'utf-8')
-        $ = cheerio.load(body)
+        let $ = cheerio.load(body)
         $('.img-hash').each(function (index, item) {
           links.push('http:' + decrypt.getSrc($(this).text()))
         })
@@ -49,6 +49,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有，点问题'

diff --git a/routes/api/photo/photo_list.js b/routes/api/photo/photo_list.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date:   2017-11-30 22:20:05
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 16:57:30
+ * @Last Modified time: 2018-06-29 22:20:08
  */
 const express = require('express')
 const cheerio = require('cheerio')
@@ -21,7 +21,7 @@ function list (req, res) {
     },
     function (error, response, body) {
       let links = []
-      if (response && response.statusCode == 200) {
+      if (response && response.statusCode === 200) {
         body = Iconv.decode(body, 'gb2312')
         let $ = cheerio.load(body)
         $('.pic a img').each(function () {
@@ -53,6 +53,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有，点问题'

diff --git a/routes/api/photo/photo_type.js b/routes/api/photo/photo_type.js
@@ -2,7 +2,7 @@
  * @Author: ecitlm
  * @Date:   2017-11-30 22:40:46
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 22:15:24
+ * @Last Modified time: 2018-06-29 22:20:14
  */
 const express = require('express')
 const cheerio = require('cheerio')
@@ -11,7 +11,7 @@ const request = require('request')
 const Iconv = require('iconv-lite')
 
 function regx (str) {
-  const reg = /\/([^\/]+)\.html/
+  const reg = /\/([^/]+)\.html/
   if (reg.test(str)) {
     return RegExp.$1
   }
@@ -44,6 +44,7 @@ function list (req, res) {
           msg: ''
         })
       } else {
+        console.log(error)
         res.send({
           code: 404,
           msg: '网络好像有点问题'

diff --git a/routes/api/photo/photo_view.js b/routes/api/photo/photo_view.js
@@ -2,14 +2,14 @@
  * @Author: ecitlm
  * @Date:   2017-11-30 21:33:20
  * @Last Modified by: ecitlm
- * @Last Modified time: 2018-04-15 16:55:29
+ * @Last Modified time: 2018-06-29 22:20:25
  */
 const express = require('express')
 const cheerio = require('cheerio')
 const app = express()
 const request = require('request')
 const Iconv = require('iconv-lite')
-const colors = require('../../../utils/log_color') // 控制台彩色输出
+// const colors = require('../../../utils/log_color') // 控制台彩色输出
 const connection = require('../../../config/dbs') // 导入mysq配置文件
 
 // 创建一个connection
@@ -123,6 +123,7 @@ function requestApi (res, id) {
         )
         insert(links, id, title, tag)
       } else {
+        console.log(error)
         res.send({
           code: 404,
           data: '',