diff --git a/.gitea/workflows/cicd_local_test.yml b/.gitea/workflows/cicd_local_test.yml new file mode 100644 index 0000000..ec38701 --- /dev/null +++ b/.gitea/workflows/cicd_local_test.yml @@ -0,0 +1,53 @@ +name: local-test-CICD +on: + push: + branches: + - local-test + +jobs: + Docker-Build: + runs-on: joylink-local233 + steps: + - name: 检出代码 + uses: https://gitea.joylink.club/actions/checkout@v4 + with: + submodules: recursive + - name: 设置node环境 + uses: https://gitea.joylink.club/actions/local-setup-node@v0.1.2 + with: + version: 'v18.19.1' + cache: 'yarn' + cache-dependency-path: 'yarn.lock' + - name: 安装yarn,并run build + run: | + node -v + npm -v + npm config set registry https://registry.npmmirror.com + npm install --global yarn + yarn config set registry https://registry.npmmirror.com + yarn + yarn run build:local + tar czvf ./dist-test.tar.gz ./dist + - name: 打包发送到本地测试环境 + uses: https://gitea.joylink.club/appleboy/scp-action@v0.1.7 + with: + host: ${{ secrets.LOCAL_233_SSH_HOST }} + username: ${{ secrets.LOCAL_233_SSH_USER }} + password: ${{ secrets.LOCAL_233_SSH_PASSWORD }} + port: ${{ secrets.LOCAL_233_SSH_PORT }} + source: ./dist-test.tar.gz + target: /home/minio/oss/rtss-simulation-app-client + overwrite: true + - name: SSH连接233并解压发布 + uses: https://gitea.joylink.club/appleboy/ssh-action@v1.0.3 + with: + host: ${{ secrets.LOCAL_233_SSH_HOST }} + port: ${{ secrets.LOCAL_233_SSH_PORT }} + username: ${{ secrets.LOCAL_233_SSH_USER }} + password: ${{ secrets.LOCAL_233_SSH_PASSWORD }} + script: | + cd /home/minio/oss/rtss-simulation-app-client + rm -rf /usr/local/joylink/client/rtsa + mkdir -p /usr/local/joylink/client + tar xz --strip 2 -C /usr/local/joylink/client -f dist-test.tar.gz + - run: echo "This job's status is ${{ job.status }}." diff --git a/package.json b/package.json index fd92261..eb3b733 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "@quasar/extras": "^1.16.4", "axios": "^1.2.1", "google-protobuf": "^3.21.4", - "jl-graphic": "git+http://120.46.212.6:3000/joylink/graphic-pixi.git#v0.1.15", + "jl-graphic": "git+https://gitea.joylink.club/joylink/graphic-pixi.git#v0.1.15", "js-base64": "^3.7.5", "pinia": "^2.0.11", "quasar": "^2.16.0", diff --git a/quasar.config.js b/quasar.config.js index 544d1c2..551e563 100644 --- a/quasar.config.js +++ b/quasar.config.js @@ -10,7 +10,7 @@ require('dotenv').config(); const { configure } = require('quasar/wrappers'); -const BasePath = ''; +const BasePath = 'rtsa'; module.exports = configure(function (/* ctx */) { return { diff --git a/rtss-proto-msg b/rtss-proto-msg index 4029b6c..1672a8c 160000 --- a/rtss-proto-msg +++ b/rtss-proto-msg @@ -1 +1 @@ -Subproject commit 4029b6c96f132115bba08c87bfd3470f3e2d872b +Subproject commit 1672a8c0e2b41c4076c1dc9ec852f425dcba21c3 diff --git a/src/boot/axios.ts b/src/boot/axios.ts index 07cf502..4cc9549 100644 --- a/src/boot/axios.ts +++ b/src/boot/axios.ts @@ -2,7 +2,7 @@ import axios, { AxiosInstance } from 'axios'; import { AxiosError } from 'axios'; import { Dialog } from 'quasar'; import { boot } from 'quasar/wrappers'; -//import { getJwtToken } from 'src/configs/TokenManage'; +import { getJwtToken } from 'src/configs/TokenManage'; import { getHttpBase } from 'src/configs/UrlManage'; declare module '@vue/runtime-core' { @@ -76,9 +76,9 @@ export default boot(({ app, router }) => { // 拦截请求，添加 api.interceptors.request.use( (config) => { - //config.headers.Authorization = getJwtToken(); - config.headers.Authorization = 'Bearer 1e2d0d5d96034f4a0805af6512051ddc'; - config.headers['Token'] = '1e2d0d5d96034f4a0805af6512051ddc'; + const token = getJwtToken(); + config.headers.Authorization = `Bearer ${token}`; + config.headers['Token'] = token; config.cancelToken = source.token; if (isOpenDialog) { source.cancel(); diff --git a/src/configs/TokenManage.ts b/src/configs/TokenManage.ts index 96828b1..fab9822 100644 --- a/src/configs/TokenManage.ts +++ b/src/configs/TokenManage.ts @@ -1,7 +1,7 @@ const JwtTokenKey = 'jwttoken'; export function saveJwtToken(token: string) { - sessionStorage.setItem(JwtTokenKey, `Bearer ${token}`); + sessionStorage.setItem(JwtTokenKey, token); } export function getJwtToken(): string | null { diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index be76d5b..1f778e8 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -121,16 +121,21 @@