Merge branch 'main' into dev

docker-compose.yaml

@@ -102,7 +102,7 @@ services:
       - paopao-network
 
   backend:
-    image: bitbus/paopao-ce:0.3.0-rc.1
+    image: bitbus/paopao-ce:0.3.0
     restart: always
     depends_on:
       - db

web/package.json

@@ -20,7 +20,7 @@
     "lodash": "^4.17.21",
     "moment": "^2.29.4",
     "naive-ui": "^2.34.3",
-    "nonesir-video": "^1.0.3",
+    "paopao-video-player": "^1.0.0",
     "qrcanvas-vue": "^3.0.0",
     "qrcode": "^1.5.3",
     "unplugin-vue-components": "^0.24.1",
@@ -28,7 +28,6 @@
     "vfonts": "^0.0.3",
     "vue": "^3.3.1",
     "vue-router": "4",
-    "vue3-player-video": "^1.2.5",
     "vuex": "^4.1.0"
   },
   "devDependencies": {

web/src/components/post-video.vue

@@ -2,23 +2,15 @@
     <div v-if="props.videos.length > 0">
         <n-grid :x-gap="4" :y-gap="4" :cols="full ? 1 : 5">
             <n-gi :span="full ? 1 : 3">
-                <n-video
+                <paopao-video-player @click.stop v-for="video in props.videos" :key="video.id" :src="video.content"
-                    @click.stop
+                    :colors="['#18a058', '#2aca75']" :hoverable="true" theme="gradient" />
-                    v-for="video in props.videos"
-                    :key="video.id"
-                    :src="video.content"
-                    :colors="['#18a058', '#2aca75']"
-                    :hoverable="true"
-                    theme="gradient"
-                ></n-video>
             </n-gi>
         </n-grid>
     </div>
 </template>
 
 <script setup lang="ts">
-import { reactive } from 'vue';
+import PaopaoVideoPlayer from 'paopao-video-player';
-import NVideo from 'nonesir-video';
 
 const props = withDefaults(
     defineProps<{

web/src/shims-vue.d.ts

@@ -12,7 +12,7 @@ declare module '*.gif'
 declare module '*.bmp'
 declare module '*.tiff'
 declare module '*.json'
-declare module 'nonesir-video'
+declare module 'paopao-video-player'
 
 interface AnyObject {
 	[key: string]: any