From f07abaa91bbce583ddc8b3cb6a4b10ea29df472e Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Mon, 19 Oct 2020 18:59:01 +0800 Subject: [PATCH 1/3] modeify config --- Dockerfile | 6 +++--- conf/app.conf | 12 ++++++------ conf/product_app.conf | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4ba403..1f3d8b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,15 +10,15 @@ RUN go get github.com/tools/godep # Recompile the standard library without CGO RUN CGO_ENABLED=0 go install -a std -ENV APP_DIR $GOPATH/src/cve-manager +ENV APP_DIR $GOPATH/src/ve-manager RUN mkdir -p $APP_DIR # Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) +ENTRYPOINT (cd $APP_DIR && ./src/ve-manager) ADD . $APP_DIR # Compile the binary and statically link -RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' EXPOSE 80 diff --git a/conf/app.conf b/conf/app.conf index d91af5d..6269b32 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -42,19 +42,19 @@ maxsize=304800 [crontab] ymalflag = 2 -getymal = 00 00 23 * * * +getymal = 00 00 02 * * * cveflag = 2 -getcve = 00 00 01 * * * +getcve = 00 00 03 * * * oricveflag = 2 -oricvecheck = 00 00 02 * * * +oricvecheck = 00 00 05 * * * getissueflag = 2 -getissue = 00 00 03 * * * +getissue = 00 00 05 * * * issueflag = 2 -createissue = * * 01 * * * +createissue = * * 05 * * * test = 0/10 * * * * * gittokenflag = 1 issueoath = * * */20 * * * -genexcelflag = 2 +genexcelflag = 7 genexcel = 00 00 04 * * * days = -30 prcnum = 100 diff --git a/conf/product_app.conf b/conf/product_app.conf index f070c48..a5ea8cb 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,5 +1,5 @@ appname = cve_manager -httpport = 80 +httpport = 8080 runmode = dev autorender = false copyrequestbody = true @@ -23,7 +23,7 @@ labelUnFix = "CVE/UNFIX" [mysql] -dbhost = fafd55e8084b402d9998539b072eef7fin01.internal.ap-southeast-1.mysql.rds.myhuaweicloud.com +dbhost = 172.16.1.73 dbport = 3306 dbuser = "${DB_USER||cve}" dbpwd = "${DB_PWD||***}" @@ -41,24 +41,24 @@ maxlines=50000 maxsize=304800 [crontab] -ymalflag = 1 -getymal = 00 00 23 * * * +ymalflag = 2 +getymal = 00 00 02 * * * cveflag = 2 -getcve = 00 00 01 * * * +getcve = 00 00 03 * * * oricveflag = 2 -oricvecheck = 00 00 02 * * * +oricvecheck = 00 00 05 * * * getissueflag = 2 -getissue = 00 00 03 * * * +getissue = 00 00 05 * * * issueflag = 2 -createissue = * * 01 * * * +createissue = * * 05 * * * test = 0/10 * * * * * gittokenflag = 1 issueoath = * * */20 * * * -genexcelflag = 2 +genexcelflag = 7 genexcel = 00 00 04 * * * days = -30 prcnum = 100 -printlogflag = 2 +printlogflag = 1 printlog = 0 */10 * * * * @@ -66,7 +66,7 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -redirect_uri = http://159.138.2.2:80/v1/issue/oauth/callback +redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** @@ -79,7 +79,7 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -hookurl = http://159.138.2.2:80/v1/issue/hook/event +hookurl = https://api.openeuler.org/v1/issue/hook/event -- Gitee From c6ae58bce0bb87521b98220796053f7db092f7a9 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Mon, 19 Oct 2020 19:17:28 +0800 Subject: [PATCH 2/3] 1. Dockerfile file error correction; 2. configer error correction --- Dockerfile | 4 ++-- conf/product_app.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1f3d8b5..2a2bd8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,11 @@ RUN go get github.com/tools/godep # Recompile the standard library without CGO RUN CGO_ENABLED=0 go install -a std -ENV APP_DIR $GOPATH/src/ve-manager +ENV APP_DIR $GOPATH/src/cve-manager RUN mkdir -p $APP_DIR # Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./src/ve-manager) +ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link diff --git a/conf/product_app.conf b/conf/product_app.conf index a5ea8cb..c9ad606 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -66,7 +66,7 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback +#redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** -- Gitee From 1e9a8afe5e40eee40187a3ae2b85c6ea9a7fe4f5 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Mon, 19 Oct 2020 19:25:00 +0800 Subject: [PATCH 3/3] modeify configer --- conf/product_app.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/product_app.conf b/conf/product_app.conf index c9ad606..b87c697 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -66,7 +66,7 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -#redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback +#redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** @@ -79,7 +79,7 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -hookurl = https://api.openeuler.org/v1/issue/hook/event +hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event -- Gitee