From 982e1d24c9ade0a25741c91813ec936fc677dd44 Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Tue, 28 Dec 2021 13:56:08 +0800
Subject: [PATCH 1/3] remove console service file

---
 console.service | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 console.service

diff --git a/console.service b/console.service
deleted file mode 100644
index dfdb1d1f..00000000
--- a/console.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=infini-console
-After=network.target
-
-[Service]
-Type=forking
-WorkingDirectory=/opt/console
-ExecStart=/opt/console/console -daemon -pidfile /var/run/infini-console.pid  -config /opt/console/console.yml
-ExecStop=/bin/kill `cat /var/run/infini-console.pid`
-PrivateTmp=true
-User=root
-Group=root
-LimitNOFILE=16384:163840
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file

From 4c2e97e7125a3d560417b35bf023eae20543bd4d Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Tue, 28 Dec 2021 14:08:57 +0800
Subject: [PATCH 2/3] update jenkins job

---
 .gitignore  | 3 ++-
 Jenkinsfile | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b634ceff..1e0673e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,4 +31,5 @@ appveyor.yml
 web/.github/
 web/report*
 log/
-.env
\ No newline at end of file
+.env
+/web/
diff --git a/Jenkinsfile b/Jenkinsfile
index f285daed..563d460e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,6 +17,8 @@ pipeline {
                         steps {
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean'
+                                sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && git stash && git pull origin master'
+                                sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm install'
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install'
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm run build'
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-linux'

From 8b86d027161b0cc7e2be621679b1e9d2a232fc6b Mon Sep 17 00:00:00 2001
From: medcl <m@medcl.net>
Date: Tue, 28 Dec 2021 14:11:47 +0800
Subject: [PATCH 3/3] clone web on build

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 563d460e..1dc15bfb 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
                         steps {
                             catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make clean'
-                                sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && git stash && git pull origin master'
+                                sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web'
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm install'
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center && cnpm install'
                                 sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && cnpm run build'