7x31
/
anylink
mirror of https://github.com/bjdgyc/anylink.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from bjdgyc/dev 

Dev
This commit is contained in:
bjdgyc 2021-08-02 14:21:13 +08:00 committed by GitHub
parent 6daf4e1b03 12febf3723
commit 88c1d09c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -18,7 +18,7 @@ COPY --from=builder_node /web/ui /anylink/server/ui
#TODO 本地打包时使用镜像 #TODO 本地打包时使用镜像
#RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories #RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
RUN apk add --no-cache git gcc RUN apk add --no-cache git gcc musl-dev
RUN cd /anylink/server;go build -o anylink -ldflags "-X main.CommitId=$(git rev-parse HEAD)" \ RUN cd /anylink/server;go build -o anylink -ldflags "-X main.CommitId=$(git rev-parse HEAD)" \
&& /anylink/server/anylink tool -v && /anylink/server/anylink tool -v

1
build.sh
View File

@ -39,6 +39,7 @@ mkdir $deploy
cp -r server/anylink $deploy cp -r server/anylink $deploy
cp -r server/bridge-init.sh $deploy cp -r server/bridge-init.sh $deploy
cp -r server/conf $deploy
cp -r systemd $deploy cp -r systemd $deploy

2
web/src/pages/group/List.vue
View File

@ -166,7 +166,7 @@
<el-form-item label="带宽限制" prop="bandwidth"> <el-form-item label="带宽限制" prop="bandwidth">
<el-input v-model.number="ruleForm.bandwidth"> <el-input v-model.number="ruleForm.bandwidth">
<template slot="append">BYTE</template> <template slot="append">BYTE/S</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="本地网络" prop="allow_lan"> <el-form-item label="本地网络" prop="allow_lan">