Merge pull request 'dev' (#4) from dev into main

Reviewed-on: #4
This commit is contained in:
fanxb 2023-03-11 09:51:06 -05:00
commit 455c4e2b81
6 changed files with 6681 additions and 8 deletions

24
.drone Normal file
View File

@ -0,0 +1,24 @@
kind: pipeline
type: docker
name: bookmarkPublish
trigger:
branch:
- master
clone:
disable: true
steps:
- name: deploy
image: appleboy/drone-ssh
settings:
host:
from_secret: devHost
port: 22
user: root
key:
from_secret: privateSsh
timeout: 3m
script:
- cd /root/qieziStatistics && git pull && bash build.sh && syncFile.sh

3
.gitignore vendored
View File

@ -1,3 +1,4 @@
data/maven/mavenRep
qiezi_front/yarn.lock
.idea
.idea
syncFile.sh

View File

@ -7,7 +7,7 @@ export VUE_APP_QIEZI_KEY="d862c12a68ad4d579c6066ac2f064a07";
base=$(cd "$(dirname "$0")";pwd)
#
# 前端打包
docker run -it --rm --user ${UID} -e VUE_APP_QIEZI_HOST=${VUE_APP_QIEZI_HOST} -e VUE_APP_QIEZI_KEY=${VUE_APP_QIEZI_KEY} -v $base/qiezi_front:/opt/front node:lts-buster-slim bash -c "cd /opt/front && yarn --registry https://registry.npm.taobao.org && yarn build"
docker run -it --rm --user ${UID} -e VUE_APP_QIEZI_HOST=${VUE_APP_QIEZI_HOST} -e VUE_APP_QIEZI_KEY=${VUE_APP_QIEZI_KEY} -v $base/qiezi_front:/opt/front node:lts-slim bash -c "cd /opt/front && yarn --registry https://registry.npm.taobao.org && yarn build"
# 后端打包
docker run -it --rm --user ${UID} -v $base/data/maven/mavenRep:/var/maven/.m2: -v $base/data/maven/settings.xml:/usr/share/maven/conf/settings.xml -v $base/qieziBackend:/code maven:3-openjdk-11-slim bash -c "cd /code && mvn clean install"

View File

@ -14,9 +14,9 @@
"vue-router": "^4.0.0-0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "~4.5.0",
"@vue/cli-plugin-router": "~4.5.0",
"@vue/cli-service": "~4.5.0",
"@vue/cli-plugin-babel": "~5.0.8",
"@vue/cli-plugin-router": "~5.0.8",
"@vue/cli-service": "~5.0.8",
"@vue/compiler-sfc": "^3.0.0",
"less": "^3.0.4",
"less-loader": "^5.0.0"

6650
qiezi_front/pnpm-lock.yaml generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -2,9 +2,7 @@
<router-view />
</template>
<script setup>
import { onMounted } from "@vue/runtime-core";
</script>
<script setup></script>
<style lang="less">
html {