Commit 04fd1cd5 authored by chenqikuai's avatar chenqikuai

使用用户的addr prikey pubkey进行鉴权

parent 6ddc0468
...@@ -23,6 +23,8 @@ import { chatCardTimeStamp } from "./store/chatCardStore"; ...@@ -23,6 +23,8 @@ import { chatCardTimeStamp } from "./store/chatCardStore";
import { getVisitorId } from "./utils/visitorId"; import { getVisitorId } from "./utils/visitorId";
import { getUserMsg } from "./utils/userMsg"; import { getUserMsg } from "./utils/userMsg";
import { chatLoginActionMark, eLoginType } from "./store/chatStore"; import { chatLoginActionMark, eLoginType } from "./store/chatStore";
import { Toast } from "vant";
import router from "./router";
...@@ -37,13 +39,22 @@ export default defineComponent({ ...@@ -37,13 +39,22 @@ export default defineComponent({
const fmp = new FzmMessageProtocol("ws://172.16.101.107:8888/sub"); const fmp = new FzmMessageProtocol("ws://172.16.101.107:8888/sub");
const UserMsg = getUserMsg();
if (!UserMsg) {
Toast('未登录')
router.push({
name: 'Login'
})
return;
}
fmp fmp
.authorize({ .authorize({
appId: "dtalk", appId: "dtalk",
token: generateToken({ token: generateToken({
address: from, address: UserMsg.userInfo.addr,
privateKeyHex: privateKey, privateKeyHex: UserMsg.userInfo.pri_key,
publicKeyHex: publicKey, publicKeyHex: UserMsg.userInfo.pub_key,
}), }),
}) })
.then((conn) => { .then((conn) => {
......
...@@ -66,6 +66,9 @@ export function userLogin(data: { ...@@ -66,6 +66,9 @@ export function userLogin(data: {
level: eLevel level: eLevel
phone: string phone: string
role: eNewRoleRelatedToBackEnd role: eNewRoleRelatedToBackEnd
pri_key: string
pub_key: string
addr: string
}>({ }>({
url: '/login', url: '/login',
method: 'POST', method: 'POST',
...@@ -85,6 +88,9 @@ export function userRegister(data: { phone: string; verify_code: string }) { ...@@ -85,6 +88,9 @@ export function userRegister(data: { phone: string; verify_code: string }) {
accessToken: string accessToken: string
phone: string phone: string
role: eNewRoleRelatedToBackEnd role: eNewRoleRelatedToBackEnd
pri_key: string
pub_key: string
addr: string
}>({ }>({
url: '/user/register', url: '/user/register',
method: 'post', method: 'post',
......
...@@ -5,6 +5,9 @@ export interface iUserMsg { ...@@ -5,6 +5,9 @@ export interface iUserMsg {
role: eRole role: eRole
userInfo: { userInfo: {
phone?: string phone?: string
addr: string
pri_key: string
pub_key: string
[key: string]: any [key: string]: any
} }
} }
...@@ -52,12 +52,15 @@ export default defineComponent({ ...@@ -52,12 +52,15 @@ export default defineComponent({
verify_code: code verify_code: code
}) })
if (ret.code === 200) { if (ret.code === 200) {
const { accessToken, role, phone } = ret.data const { accessToken, role, phone, addr, pri_key, pub_key} = ret.data
setUserMsg({ setUserMsg({
token: accessToken, token: accessToken,
role: role === eNewRoleRelatedToBackEnd.ACM ? eRole.staff : eRole.user, role: role === eNewRoleRelatedToBackEnd.ACM ? eRole.staff : eRole.user,
userInfo: { userInfo: {
phone: phone, phone: phone,
addr,
pri_key,
pub_key
}, },
}) })
this.$router.push({ this.$router.push({
...@@ -75,12 +78,15 @@ export default defineComponent({ ...@@ -75,12 +78,15 @@ export default defineComponent({
phone: phone phone: phone
}) })
if (ret.code === 200) { if (ret.code === 200) {
const { accessToken, phone, role } = ret.data const { accessToken, phone, role, pri_key, pub_key, addr } = ret.data
setUserMsg({ setUserMsg({
token: accessToken, token: accessToken,
role: eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user, role: eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user,
userInfo: { userInfo: {
phone, phone,
addr,
pri_key,
pub_key
} }
}) })
this.$router.push({ this.$router.push({
...@@ -97,12 +103,15 @@ export default defineComponent({ ...@@ -97,12 +103,15 @@ export default defineComponent({
phone: phone phone: phone
}) })
if (ret.code === 200) { if (ret.code === 200) {
const { accessToken, phone, role } = ret.data const { accessToken, phone, role, addr, pub_key, pri_key} = ret.data
setUserMsg({ setUserMsg({
token: accessToken, token: accessToken,
role: eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user, role: eNewRoleRelatedToBackEnd.ACM === role ? eRole.staff : eRole.user,
userInfo: { userInfo: {
phone, phone,
addr,
pub_key,
pri_key
} }
}) })
this.$router.push({ this.$router.push({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment