From 905ffda848be08d63f8df30ffc0819f0a5a8d076 Mon Sep 17 00:00:00 2001 From: Alireza Ahmadi Date: Sun, 10 Dec 2023 16:56:02 +0100 Subject: [PATCH] v1.6.2 --- Dockerfile | 4 +++- config/version | 2 +- sub/subService.go | 2 +- web/assets/css/custom.css | 7 +------ web/html/xui/inbounds.html | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index e9b9c2d4c0..0055e6fe7c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,9 @@ WORKDIR /app ARG TARGETARCH RUN apk --no-cache --update add build-base gcc wget unzip COPY . . -RUN env CGO_ENABLED=1 go build -o build/x-ui main.go +ENV CGO_ENABLED=1 +ENV CGO_CFLAGS="-D_LARGEFILE64_SOURCE" +RUN go build -o build/x-ui main.go RUN ./DockerInitFiles.sh "$TARGETARCH" FROM alpine diff --git a/config/version b/config/version index 2eda823ff5..308b6faa75 100644 --- a/config/version +++ b/config/version @@ -1 +1 @@ -1.6.1 \ No newline at end of file +1.6.2 \ No newline at end of file diff --git a/sub/subService.go b/sub/subService.go index 11485f8f08..3e2a1c259b 100644 --- a/sub/subService.go +++ b/sub/subService.go @@ -802,7 +802,7 @@ func (s *SubService) genRemark(inbound *model.Inbound, email string, extra strin orders['i'] = inbound.Remark } if len(extra) > 0 { - orders['e'] = extra + orders['o'] = extra } var remark []string diff --git a/web/assets/css/custom.css b/web/assets/css/custom.css index f2b34c33d3..146b27f8fc 100644 --- a/web/assets/css/custom.css +++ b/web/assets/css/custom.css @@ -55,7 +55,7 @@ style attribute { } .ant-table-tbody > tr > td, .ant-table-thead > tr > th { - padding: 16px; + padding: 12px 16px; overflow-wrap: break-word; } .ant-table-thead > tr > th { @@ -399,11 +399,6 @@ style attribute { background-color: rgb(255, 127, 127); } -.ant-table-tbody > tr > td, -.ant-table-thead > tr > th { - padding: 16px 5px; -} - .ant-table-expand-icon-th, .ant-table-row-expand-icon-cell { width: 30px; diff --git a/web/html/xui/inbounds.html b/web/html/xui/inbounds.html index 156871b1d1..42980d73b3 100644 --- a/web/html/xui/inbounds.html +++ b/web/html/xui/inbounds.html @@ -423,7 +423,7 @@ :columns="isMobile ? innerMobileColumns : innerColumns" :data-source="getInboundClients(record)" :pagination=pagination(getInboundClients(record)) - :style="isMobile ? 'margin: -16px -5px -17px;' : 'margin-left: 10px;'"> + style="margin: -12px -6px -13px;"> {{template "client_table"}}