diff --git a/build_docker_release_linux.bat b/build_docker_release_linux.bat index 554eb3a..82691a3 100644 --- a/build_docker_release_linux.bat +++ b/build_docker_release_linux.bat @@ -1 +1 @@ -docker run --rm -v "$PWD":/media/sf_SamWaf -w /media/sf_SamWaf -e CGO_ENABLED=1 -e GOPROXY=https://goproxy.cn,direct golang:1.19 go build -v -ldflags="-X SamWaf/global.GWAF_RELEASE=true -X SamWaf/global.GWAF_RELEASE_VERSION_NAME=20231127 -X SamWaf/global.GWAF_RELEASE_VERSION=v1.0.126 -s -w -extldflags "-static"" -o /media/sf_SamWaf/release/SamWafLinux64 main.go \ No newline at end of file +docker run --rm -v "$PWD":/media/sf_SamWaf -w /media/sf_SamWaf -e CGO_ENABLED=1 -e GOPROXY=https://goproxy.cn,direct golang:1.19 go build -v -ldflags="-X SamWaf/global.GWAF_RELEASE=true -X SamWaf/global.GWAF_RELEASE_VERSION_NAME=20231127 -X SamWaf/global.GWAF_RELEASE_VERSION=v1.0.127 -s -w -extldflags "-static"" -o /media/sf_SamWaf/release/SamWafLinux64 main.go \ No newline at end of file diff --git a/localwaf/src/pages/waf/attack/index.vue b/localwaf/src/pages/waf/attack/index.vue index f78bba4..abd9e13 100644 --- a/localwaf/src/pages/waf/attack/index.vue +++ b/localwaf/src/pages/waf/attack/index.vue @@ -43,7 +43,7 @@ - + @@ -104,7 +104,7 @@ import { prefix } from '@/config/global'; import { attacklogList } from '@/apis/waflog/attacklog'; - import { NowDate, ConvertStringToUnix, ConvertDateToString } from '@/utils/date'; + import { NowDate, ConvertStringToUnix, ConvertDateToString, ConvertUnixToDate } from '@/utils/date'; import { allhost } from '@/apis/host'; @@ -140,13 +140,15 @@ }, data() { return { - presets: { - 最近300天: [ConvertDateToString(new Date(+new Date() - 86400000 * 299)) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], - 最近7天: [ConvertDateToString(new Date(+new Date() - 86400000 * 6)) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], - 最近3天: [ConvertDateToString(new Date(+new Date() - 86400000 * 2)) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], - 今天: [ConvertDateToString(new Date()) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], + dateControl:{ + presets: { + 最近300天: [ConvertDateToString(new Date(+new Date() - 86400000 * 299)) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], + 最近7天: [ConvertDateToString(new Date(+new Date() - 86400000 * 6)) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], + 最近3天: [ConvertDateToString(new Date(+new Date() - 86400000 * 2)) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], + 今天: [ConvertDateToString(new Date()) + " 00:00:00", ConvertDateToString(new Date()) + " 23:59:59"], + }, + range1: ['2023-11-01 00:00:00', '2023-11-16 23:59:59'], }, - range1: ['2023-11-01 00:00:00', '2023-11-16 23:59:59'], action_options: [ { label: '全部', @@ -206,7 +208,7 @@ selectedRowKeys: [], value: 'first', customText: false, - displayColumns: staticColumn.concat(['create_time','host','method','url','src_ip','country']), + displayColumns: staticColumn.concat(['create_time', 'host', 'method', 'url', 'src_ip', 'country']), columns: [ { title: '状态', @@ -258,7 +260,7 @@ width: 100, ellipsis: true, colKey: 'province', - },{ + }, { title: '城市', width: 100, ellipsis: true, @@ -311,6 +313,8 @@ host_code: "", status_code: "", method: "", + unix_add_time_begin: "", + unix_add_time_end: "", }, //主机字典 host_dic: {} @@ -330,7 +334,7 @@ columnControllerConfig() { return { placement: this.placement, - fields: ['action', 'rule', 'create_time', 'host', 'method', 'url', 'header','country','province','city','status'], + fields: ['action', 'rule', 'create_time', 'host', 'method', 'url', 'header', 'country', 'province', 'city', 'status'], // 弹框组件属性透传 dialogProps: { preventScrollThrough: true }, // 列配置按钮属性头像 @@ -342,9 +346,13 @@ }, created() { console.log(NowDate) - this.range1[0] = NowDate + " 00:00:00" - this.range1[1] = NowDate + " 23:59:59" - console.log(this.range1) + this.dateControl.range1[0] = NowDate + " 00:00:00" + this.dateControl.range1[1] = NowDate + " 23:59:59" + this.searchformData.unix_add_time_begin = ConvertStringToUnix(this.dateControl.range1[0]).toString(), + this.searchformData.unix_add_time_end = ConvertStringToUnix(this.dateControl.range1[1]).toString(), + // unix_add_time_begin: ConvertStringToUnix(this.range1[0]).toString(), + //unix_add_time_end: ConvertStringToUnix(this.range1[1]).toString(), + console.log(this.range1) }, mounted() { console.log("attack list mounted "); @@ -358,6 +366,12 @@ const attack = this.$store.state.attacklog; this.pagination.current = attack.msgData.currentpage; this.searchformData = attack.msgData.searchData; // 可以直接取出整个对象 + console.log('daysrc', attack.msgData.searchData) + let newrange = Array() + newrange[0] = ConvertUnixToDate(parseInt(attack.msgData.searchData.unix_add_time_begin)) + newrange[1] = ConvertUnixToDate(parseInt(attack.msgData.searchData.unix_add_time_end)) + //console.log(this.dateControl.range1) + this.$set(this.dateControl, "range1", newrange) } this.loadHostList() @@ -403,12 +417,15 @@ if (keyword != undefined && keyword == "all") { that.pagination.current = 1 } + that.searchformData.unix_add_time_begin = ConvertStringToUnix(this.dateControl.range1[0]).toString() + that.searchformData.unix_add_time_end = ConvertStringToUnix(this.dateControl.range1[1]).toString() + this.$request .post('/waflog/attack/list', { pageSize: that.pagination.pageSize, pageIndex: that.pagination.current, - unix_add_time_begin: ConvertStringToUnix(this.range1[0]).toString(), - unix_add_time_end: ConvertStringToUnix(this.range1[1]).toString(), + unix_add_time_begin: ConvertStringToUnix(this.dateControl.range1[0]).toString(), + unix_add_time_end: ConvertStringToUnix(this.dateControl.range1[1]).toString(), ...that.searchformData }, ) diff --git a/localwaf/src/utils/date.ts b/localwaf/src/utils/date.ts index b8131f1..2860a84 100644 --- a/localwaf/src/utils/date.ts +++ b/localwaf/src/utils/date.ts @@ -22,3 +22,7 @@ export function ConvertStringToUnix(timestr: string) :Number{ export function ConvertDateToString(now: Date) :string{ return dayjs(now).format('YYYY-MM-DD'); } +//时间戳转字符串 +export function ConvertUnixToDate(now: number) :string{ + return dayjs(now).format('YYYY-MM-DD HH:mm:ss'); +} \ No newline at end of file diff --git a/vue/dist/index.html b/vue/dist/index.html index a2fd7bb..b9a8767 100644 --- a/vue/dist/index.html +++ b/vue/dist/index.html @@ -6,7 +6,7 @@ Sam网站应用级入侵防御系统后台(Web Application Firewall) - +