diff --git a/Dockerfile b/Dockerfile index e9b9c2d4..0055e6fe 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 2eda823f..308b6faa 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 11485f8f..3e2a1c25 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 f2b34c33..146b27f8 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 156871b1..85dc98a9 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"}} @@ -1089,7 +1089,7 @@ title: '{{ i18n "pages.inbounds.delDepletedClientsTitle"}}', content: '{{ i18n "pages.inbounds.delDepletedClientsContent"}}', class: themeSwitcher.currentTheme, - okText: '{{ i18n "reset"}}', + okText: '{{ i18n "delete"}}', cancelText: '{{ i18n "cancel"}}', onOk: () => this.submit('/xui/inbound/delDepletedClients/' + dbInboundId), })