Ver. 2.3 with backend ver. 2.1

src/components/InstallCsApp.vue → _deprecated/InstallCsApp.vue

@@ -28,9 +28,9 @@
 </template>
 <script setup>
 import { ref, onMounted } from 'vue'
-import { sendErrorMessage } from '@/utils/message'
-import api from '@/api'
-import logger from '@/utils/logger'
+import { sendErrorMessage } from '@/utils/message.js'
+import api from '@/api/index.js'
+import logger from '@/utils/logger.js'
 
 const show = ref(true)
 const file_name = ref('')

_deprecated/LanLobby.vue

@@ -340,7 +340,7 @@ function getPrivateLobby() {
 
 function getProxyList() {
   const rs = get(
-    'https://api-v2.locyanfrp.cn/api/v2/proxies/getlist?username=' +
+    'https://api-v2.locyanfrp.cn/api/v2/proxies/list?username=' +
       localStorage.getItem('username')
   )
   rs.then((res) => {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "locyanfrp",
   "private": true,
-  "version": "2.2",
+  "version": "2.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/App.vue

@@ -68,7 +68,7 @@ setInterval(async () => {
   if (userData.getters.get_token) {
     let rs
     try {
-      rs = await api.v2.users.info(userData.getters.get_username)
+      rs = await api.v2.user.info.root.get(userData.getters.get_username)
     } catch (e) {
       sendWarningMessage('查询用户信息失败: ' + e + '，请重新登录后台！')
       logout()

src/api/base.ts

@@ -1,12 +1,13 @@
 const base = {
   api_v1_url: 'https://api.locyanfrp.cn',
-  api_v2_url: 'https://api-v2.locyanfrp.cn/api/v2',
+  api_v2_url: 'https://api-v2-next.locyanfrp.cn/api/v2',
+  // api_v2_url: 'http://localhost:18080/api/v2',
   buildResponse: (res: any, useDataPath: boolean = true) => {
     const message =
-      res.data?.data?.message ??
-      res.data?.data?.msg ??
       res.data?.message ??
+      res.response?.data?.message ??
       res.data?.msg ??
+      res.response?.data?.msg ??
       '未指定或请求失败'
     const data = (useDataPath ? res.data?.data : res.data) ?? {}
     const statusApi = useDataPath ? res.data?.status : res.status

src/api/v2/auth/index.ts

@@ -0,0 +1,9 @@
+import login from './login.api'
+import oauth from './oauth'
+import register from './register.api'
+
+export default {
+  login: login,
+  register: register,
+  oauth: oauth
+}

src/api/v2/users/login.ts → src/api/v2/auth/login.api.ts

@@ -3,7 +3,7 @@ import { post } from '@/utils/request'
 import base from '@/api/base'
 
 const login = async (username: string, password: string) => {
-  const rs = post(`${base.api_v2_url}/users/login`, {
+  const rs = post(`${base.api_v2_url}/auth/login`, {
     username: username,
     password: password
   })

src/api/v2/auth/oauth/index.ts

@@ -0,0 +1,5 @@
+import qq from './qq'
+
+export default {
+  qq: qq
+}

src/api/v2/auth/oauth/qq/bind.api.ts

@@ -0,0 +1,33 @@
+import base from '@/api/base'
+//@ts-ignore
+import { get, post, deleteReq } from '@/utils/request'
+
+const getBind = async (username: string) => {
+  const rs = await get(`${base.api_v2_url}/auth/oauth/qq/bind`, {
+    username: username
+  })
+  return base.buildResponse(rs)
+}
+
+const postBind = async (username: string, code: string) => {
+  const rs = await post(`${base.api_v2_url}/auth/oauth/qq/bind`, {
+    username: username,
+    code: code
+  })
+  return base.buildResponse(rs)
+}
+
+const deleteBind = async (username: string) => {
+  const rs = await deleteReq(`${base.api_v2_url}/auth/oauth/qq/bind`, {
+    username: username
+  })
+  return base.buildResponse(rs)
+}
+
+const bind = {
+  get: getBind,
+  post: postBind,
+  delete: deleteBind
+}
+
+export default bind

src/api/v2/auth/oauth/qq/index.ts

@@ -0,0 +1,7 @@
+import bind from './bind.api'
+import login from './login.api'
+
+export default {
+  login: login,
+  bind: bind
+}

src/api/v2/auth/oauth/qq/login.api.ts

@@ -0,0 +1,22 @@
+import base from '@/api/base'
+//@ts-ignore
+import { get, post } from '@/utils/request'
+
+const getLogin = async () => {
+  const rs = await get(`${base.api_v2_url}/auth/oauth/qq/login`)
+  return base.buildResponse(rs)
+}
+
+const postLogin = async (code: string) => {
+  const rs = await post(`${base.api_v2_url}/auth/oauth/qq/login`, {
+    code: code
+  })
+  return base.buildResponse(rs)
+}
+
+const login = {
+  get: getLogin,
+  post: postLogin
+}
+
+export default login

src/api/v2/users/register.ts → src/api/v2/auth/register.api.ts

@@ -5,18 +5,16 @@ import base from '@/api/base'
 const register = async (
   username: string,
   password: string,
-  confirm_password: string,
   email: string,
-  verify: number,
-  qq: number
+  verify_code: number,
+  qq_code: number
 ) => {
-  const rs = post(`${base.api_v2_url}/users/register`, {
+  const rs = post(`${base.api_v2_url}/auth/register`, {
     username: username,
     password: password,
-    confirm_password: confirm_password,
     email: email,
-    verify: verify,
-    qq: qq
+    verify_code: verify_code,
+    qq_code: qq_code
   })
   return base.buildResponse(await rs)
 }

src/api/v2/donate/index.ts

@@ -1,7 +1,7 @@
-import create from './create'
-import list from './list'
+import root from './root.api'
+import list from './list.api'
 
 export default {
-  list: list,
-  create: create
+  root: root,
+  list: list
 }

src/api/v2/donate/root.api.ts

@@ -0,0 +1,20 @@
+import base from '@/api/base'
+//@ts-ignore
+import { post } from '@/utils/request'
+
+/**
+ * 创建赞助订单
+ */
+const postDonate = async (username: string, money: string) => {
+  const rs = post(`${base.api_v2_url}/donate`, {
+    username: username,
+    money: money
+  })
+  return base.buildResponse(await rs)
+}
+
+const root = {
+  post: postDonate
+}
+
+export default root

src/api/v2/email/index.ts

@@ -0,0 +1,5 @@
+import register from './register.api'
+
+export default {
+  register: register
+}

src/api/v2/users/send.ts → src/api/v2/email/register.api.ts

@@ -2,11 +2,11 @@
 import { get } from '@/utils/request'
 import base from '@/api/base'
 
-const send = async (email: string) => {
-  const rs = get(`${base.api_v2_url}/users/send`, {
+const register = async (email: string) => {
+  const rs = get(`${base.api_v2_url}/email/register`, {
     email: email
   })
   return base.buildResponse(await rs)
 }
 
-export default send
+export default register

src/api/v2/icp.api.ts

@@ -0,0 +1,40 @@
+import base from '@/api/base'
+//@ts-ignore
+import { get, post, deleteReq } from '@/utils/request'
+
+/**
+ * 审核 ICP 备案域名
+ */
+const postIcp = async (username: string, domain: string) => {
+  const rs = post(`${base.api_v2_url}/icp`, {
+    username: username,
+    domain: domain
+  })
+  return base.buildResponse(await rs)
+}
+
+const deleteIcp = async (username: string, domain_id: number) => {
+  const rs = deleteReq(`${base.api_v2_url}/icp`, {
+    username: username,
+    id: domain_id
+  })
+  return base.buildResponse(await rs)
+}
+
+/**
+ * 列出已审核 ICP 备案域名
+ */
+const getIcp = async (username: string) => {
+  const rs = get(`${base.api_v2_url}/icp`, {
+    username: username
+  })
+  return base.buildResponse(await rs)
+}
+
+const icp = {
+  get: getIcp,
+  post: postIcp,
+  delete: deleteIcp
+}
+
+export default icp