Merge branch 'api' into develop

src/server/code.js

@@ -1,11 +1,7 @@
 import {
   useCodeServer
 } from '@/config/server-info'
-import httpCode from '@/server/enums/http-code'
 import axios from '@/plugins/axios'
-import showMessage from '@/server/utils/show-message'
-import catchHandler from '@/server/utils/catch-handler'
-import showErrorMessage from '@/server/utils/show-error-message'
 
 export function sendEmailCode ({ email }) {
   return axios
@@ -14,19 +10,7 @@ export function sendEmailCode ({ email }) {
         email
       }
     })
-    .then(res => {
-      const emptyResponse = res.data
-      if (emptyResponse.code === httpCode.success) {
-        showMessage({
-          message: '邮箱验证码发送成功',
-          type: 'success'
-        })
-      } else {
-        showErrorMessage(emptyResponse.msg)
-      }
-    }).catch(() => {
-      catchHandler()
-    })
+    .then(res => {})
 }
 
 export function sendPhoneCode ({ phone }) {
@@ -36,17 +20,5 @@ export function sendPhoneCode ({ phone }) {
         phone
       }
     })
-    .then(res => {
-      const emptyResponse = res.data
-      if (emptyResponse.code === httpCode.success) {
-        showMessage({
-          message: '手机验证码发送成功',
-          type: 'success'
-        })
-      } else {
-        showErrorMessage(emptyResponse.msg)
-      }
-    }).catch(() => {
-      catchHandler()
-    })
+    .then(res => {})
 }

src/server/comment.js

@@ -2,7 +2,6 @@ import {
   useCommentServer
 } from '@/config/server-info'
 import axios from '@/plugins/axios'
-import httpCode from '@/server/enums/http-code'
 
 export function createComment ({ slideId, pageNumber, title, content }) {
   const data = {
@@ -13,56 +12,28 @@ export function createComment ({ slideId, pageNumber, title, content }) {
   }
   return axios
     .post(useCommentServer(), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
 export function removeComment ({ commentId }) {
   return axios
     .delete(useCommentServer('/' + commentId))
-    .then(res => {
-      const emptyResponse = res.data
-      if (emptyResponse.code === httpCode.success) {
-
-      } else {
-        // TODO
-      }
-    })
+    .then(res => {})
 }
 
 export function topComment ({ commentId }) {
   return axios
     .post(useCommentServer('/' + commentId + '/top'))
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => {})
 }
 
 export function unTopComment ({ commentId }) {
   return axios
     .post(useCommentServer('/' + commentId + '/unTop'))
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => {})
 }
 
-export function getComments (slideId, pageNumber, { key = '', page = 0, size = 2000, sort = '' }) {
+export function getComments ({ slideId, pageNumber, key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useCommentServer('/slide/' + slideId), {
       params: {
@@ -73,12 +44,5 @@ export function getComments (slideId, pageNumber, { key = '', page = 0, size = 2
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }

src/server/course.js

@@ -2,47 +2,36 @@ import {
   useCourseServer
 } from '@/config/server-info'
 import axios from '@/plugins/axios'
-import httpCode from '@/server/enums/http-code'
 
-export function createCourse({ name, bio, code, cover }) {
+export function createCourse({ name, bio, code }) {
   const data = {
     name,
     bio,
-    code,
-    cover
+    code
   }
 
   return axios
     .post(useCourseServer(), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
-export function modifyCourse({ id, name, bio, code, cover }) {
+export function removeCourse({ courseId }) {
+  return axios
+    .delete(useCourseServer('/' + courseId))
+    .then(res => {})
+}
+
+export function modifyCourse({ id, name, bio, code }) {
   const data = {
     id,
     name,
     bio,
-    code,
-    cover
+    code
   }
 
   return axios
     .put(useCourseServer(), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
 export function chooseCourse({ courseId, code }) {
@@ -53,17 +42,10 @@ export function chooseCourse({ courseId, code }) {
 
   return axios
     .post(useCourseServer('/choose'), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => {})
 }
 
-export function getCourses({ key = '', page = 0, size = 2000, sort = '' }) {
+export function getCourses({ key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useCourseServer(), {
       params: {
@@ -73,17 +55,10 @@ export function getCourses({ key = '', page = 0, size = 2000, sort = '' }) {
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
-export function teacherGetCourses({ key = '', page = 0, size = 2000, sort = '' }) {
+export function teacherGetCourses({ key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useCourseServer('/teacher'), {
       params: {
@@ -93,17 +68,10 @@ export function teacherGetCourses({ key = '', page = 0, size = 2000, sort = '' }
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
-export function studentGetCourses({ key = '', page = 0, size = 2000, sort = '' }) {
+export function studentGetCourses({ key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useCourseServer('/student'), {
       params: {
@@ -113,12 +81,5 @@ export function studentGetCourses({ key = '', page = 0, size = 2000, sort = '' }
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }

src/server/enums/http-code.js

@@ -1,8 +0,0 @@
-export default {
-  success: 200,
-  paramError: 400,
-  notLogin: 401,
-  forbidden: 403,
-  notFound: 404,
-  sysError: 500
-}

src/server/reply.js

@@ -2,7 +2,6 @@ import {
   useReplyServer
 } from '@/config/server-info'
 import axios from '@/plugins/axios'
-import httpCode from '@/server/enums/http-code'
 
 export function createReply({ commentId, content }) {
   const data = {
@@ -11,25 +10,11 @@ export function createReply({ commentId, content }) {
   }
   axios
     .post(useReplyServer(), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
 export function removeReply({ replyId }) {
   axios
     .delete('/' + replyId)
-    .then(res => {
-      const emptyResponse = res.data
-      if (emptyResponse.code === httpCode.success) {
-
-      } else {
-        // TODO
-      }
-    })
+    .then(res => {})
 }

src/server/slide.js

@@ -2,7 +2,6 @@ import {
   useSlideServer
 } from '@/config/server-info'
 import axios from '@/plugins/axios'
-import httpCode from '@/server/enums/http-code'
 
 export function createSlide({ courseId, name, file }) {
   let data = new FormData()
@@ -16,35 +15,36 @@ export function createSlide({ courseId, name, file }) {
         'Content-Type': 'multipart/form-data'
       }
     })
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // todo
-      }
-    })
+    .then(res => res.data)
+}
+
+export function removeSlide({ id }) {
+  return axios
+    .delete(useSlideServer('/' + id))
+    .then(res => {})
 }
 
-export function modifySlide({ id, name, state }) {
+export function modifySlide({ id, name }) {
   const data = {
     id,
-    name,
-    state
+    name
   }
   return axios
     .put(useSlideServer(), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      } else {
-        // todo
-      }
-    })
+    .then(res => res.data)
 }
 
-export function teacherGetSlides({ key = '', page = 0, size = 2000, sort = '' }) {
+export function modifySlideState({ id, state }) {
+  const data = {
+    id,
+    state
+  }
+  return axios
+    .put(useSlideServer('/state'), data)
+    .then(res => res.data)
+}
+
+export function teacherGetSlides({ key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useSlideServer('/teacher'), {
       params: {
@@ -54,17 +54,10 @@ export function teacherGetSlides({ key = '', page = 0, size = 2000, sort = '' })
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
-export function teacherGetSlidesByCourse({ courseId, key = '', page = 0, size = 2000, sort = '' }) {
+export function teacherGetSlidesByCourse({ courseId, key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useSlideServer('/teacher/course/' + courseId), {
       params: {
@@ -74,17 +67,10 @@ export function teacherGetSlidesByCourse({ courseId, key = '', page = 0, size =
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
-export function studentGetSlidesByCourse({ courseId, key = '', page = 0, size = 2000, sort = '' }) {
+export function studentGetSlidesByCourse({ courseId, key = '', page = 0, size = 10, sort = '' }) {
   return axios
     .get(useSlideServer('/student/course/' + courseId), {
       params: {
@@ -94,25 +80,11 @@ export function studentGetSlidesByCourse({ courseId, key = '', page = 0, size =
         sort
       }
     })
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }
 
 export function getSlideUrl({ slideId }) {
   return axios
     .get(useSlideServer('/' + slideId + '/url'))
-    .then(res => {
-      const pageResourceResponse = res.data
-      if (pageResourceResponse.code === httpCode.success) {
-        return pageResourceResponse.data
-      } else {
-        // TODO
-      }
-    })
+    .then(res => res.data)
 }

src/server/user.js

@@ -1,11 +1,7 @@
 import {
   useUserServer
 } from '@/config/server-info'
-import httpCode from '@/server/enums/http-code'
 import axios from '@/plugins/axios'
-import showMessage from '@/server/utils/show-message'
-import showErrorMessage from '@/server/utils/show-error-message'
-import catchHandler from '@/server/utils/catch-handler'
 
 export function register ({ name, email, emailCode, phone, phoneCode, password }) {
   const data = {
@@ -18,23 +14,10 @@ export function register ({ name, email, emailCode, phone, phoneCode, password }
   }
   return axios
     .post(useUserServer('/register'), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        showMessage({
-          message: '注册成功',
-          type: 'success'
-        })
-        return resourceResponse.data
-      } else {
-        showErrorMessage(resourceResponse.msg)
-      }
-    }).catch(() => {
-      catchHandler()
-    })
+    .then(res => res.data)
 }
 
-export function emailLogin ({ email, password }) {
+export function loginByEmail ({ email, password }) {
   const data = {
     username: email,
     password
@@ -42,30 +25,13 @@ export function emailLogin ({ email, password }) {
 
   return axios
     .post(useUserServer('/login/email'), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        showMessage({ message: '欢迎回来，' + resourceResponse.data.name })
-        return resourceResponse.data
-      } else {
-        showErrorMessage(resourceResponse.msg)
-      }
-    }).catch(() => {
-      catchHandler()
-    })
+    .then(res => res.data)
 }
 
 export function logout () {
   return axios
     .post(useUserServer('/logout'))
-    .then(res => {
-      const emptyResponse = res.data
-      if (emptyResponse.code === httpCode.success) {
-
-      } else {
-        // TODO
-      }
-    })
+    .then(res => {})
 }
 
 export function modifyUser ({ name, password }) {
@@ -75,21 +41,23 @@ export function modifyUser ({ name, password }) {
   }
   return axios
     .put(useUserServer(), data)
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      }
-    })
+    .then(res => res.data)
+}
+
+export function resetPasswordByEmail({ email, code, password }) {
+  const data = {
+    username: email,
+    code,
+    password
+  }
+
+  return axios
+    .put('/resetPassword/email', data)
+    .then(res => {})
 }
 
 export function getUserInfo () {
   return axios
     .get(useUserServer())
-    .then(res => {
-      const resourceResponse = res.data
-      if (resourceResponse.code === httpCode.success) {
-        return resourceResponse.data
-      }
-    })
+    .then(res => res.data)
 }