diff --git a/.dockerignore b/.dockerignore index e003925..b926c9d 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,5 +2,4 @@ web/dist web/node_modules .vscode .VSCodeCounter -.github -.git \ No newline at end of file +.github \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ddf2e5f..64190b7 100755 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,14 @@ RUN go mod download WORKDIR /go/release ADD . . -RUN CGO_ENABLED=0 GOOS=linux go build -ldflags='-w -extldflags "-static"' -o app main.go + +# RUN CGO_ENABLED=0 GOOS=linux go build -ldflags='-w -extldflags "-static"' -o app main.go + +RUN GIT_COMMIT=$(git rev-parse HEAD) && \ + GIT_COMMIT_DATE=$(git log --date=iso8601-strict -1 --pretty=%ct) && \ + GIT_VERSION=$(git describe --tags --abbrev=0) && \ + GIT_TREE_STATE=$(test -n "`git status --porcelain`" && echo "dirty" || echo "clean") && \ + CGO_ENABLED=0 GOOS=linux go build -ldflags="-w -extldflags '-static' -X main.Commit=$GIT_COMMIT -X main.CommitDate=$GIT_COMMIT_DATE -X main.Version=$GIT_VERSION -X main.TreeState=$GIT_TREE_STATE" -installsuffix cgo -o app ./main.go FROM alpine as prod # Import the user and group files from the builder. diff --git a/README_CN.md b/README_CN.md index 4d5d2ae..a64f4d9 100644 --- a/README_CN.md +++ b/README_CN.md @@ -145,7 +145,13 @@ docker run -d -p 5001:5001 -p 5100:5100 -p 5200:5200 -p 5300:5300 -e WK_EXTERNAL * 社区频道支持 * 支持topic模式的消息投递 +## 监控截图 +![image](./docs/screen1.png) +![image](./docs/screen2.png) +![image](./docs/screen3.png) +![image](./docs/screen4.png) +![image](./docs/screen5.png) License --------------- diff --git a/docs/screen1.png b/docs/screen1.png new file mode 100644 index 0000000..17dc571 Binary files /dev/null and b/docs/screen1.png differ diff --git a/docs/screen2.png b/docs/screen2.png new file mode 100644 index 0000000..2fe279c Binary files /dev/null and b/docs/screen2.png differ diff --git a/docs/screen3.png b/docs/screen3.png new file mode 100644 index 0000000..a9fa4db Binary files /dev/null and b/docs/screen3.png differ diff --git a/docs/screen4.png b/docs/screen4.png new file mode 100644 index 0000000..9ccd76f Binary files /dev/null and b/docs/screen4.png differ diff --git a/docs/screen5.png b/docs/screen5.png new file mode 100644 index 0000000..56051ad Binary files /dev/null and b/docs/screen5.png differ diff --git a/web/src/services/Model.ts b/web/src/services/Model.ts index 8d684dc..6ae78ef 100644 --- a/web/src/services/Model.ts +++ b/web/src/services/Model.ts @@ -189,4 +189,26 @@ export const newConversationPage = (conversationPageObj: any) => { conversationPage.on = conversationPageObj.on conversationPage.conversations = conversationPageObj.conversations.map((conversationObj: any) => newConversation(conversationObj)) return conversationPage +} + +export const channelTypeToString = (channelType: number) => { + if(channelType == 1) { + return "个人频道" + } + if(channelType == 2) { + return "群组频道" + } + if(channelType == 3) { + return "客服频道" + } + if (channelType == 4) { + return "社区频道" + } + if(channelType == 5) { + return "社区话题频道" + } + if(channelType == 6) { + return "资讯频道" + } + return `${channelType}` } \ No newline at end of file diff --git a/web/src/views/ChannelView.vue b/web/src/views/ChannelView.vue index 871a41d..71f0a07 100644 --- a/web/src/views/ChannelView.vue +++ b/web/src/views/ChannelView.vue @@ -1,6 +1,6 @@