rename search-center to console

This commit is contained in:
medcl 2022-01-25 15:34:58 +08:00
parent 37bda632e1
commit df19e6bcb7
25 changed files with 102 additions and 92 deletions

52
Jenkinsfile vendored
View File

@ -16,34 +16,34 @@ 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/ && rm -rif web'
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/web && cnpm run build'
sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && mv static/* ../.public/static'
sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-linux'
sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-arm'
sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-darwin'
sh 'cd /home/jenkins/go/src/infini.sh/search-center && git stash && git pull origin master && make config build-win'
sh "cd /home/jenkins/go/src/infini.sh/search-center/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \
cd /home/jenkins/go/src/infini.sh/search-center/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh"
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make clean'
sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web'
sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && mv static/* ../.public/static'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-linux'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-arm'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-darwin'
sh 'cd /home/jenkins/go/src/infini.sh/console && git stash && git pull origin master && make config build-win'
sh "cd /home/jenkins/go/src/infini.sh/console/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \
cd /home/jenkins/go/src/infini.sh/console/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh"
sh label: 'package-linux-amd64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-amd64.tar.gz console-linux-amd64 console.yml '
sh label: 'package-linux-386', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-386.tar.gz console-linux-386 console.yml '
sh label: 'package-linux-mips', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips.tar.gz console-linux-mips console.yml '
sh label: 'package-linux-mipsle', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mipsle.tar.gz console-linux-mipsle console.yml '
sh label: 'package-linux-mips64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips64.tar.gz console-linux-mips64 console.yml '
sh label: 'package-linux-mips64le', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips64le.tar.gz console-linux-mips64le console.yml '
sh label: 'package-linux-arm5', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm5.tar.gz console-linux-armv5 console.yml '
sh label: 'package-linux-arm6', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm6.tar.gz console-linux-armv6 console.yml '
sh label: 'package-linux-arm7', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm7.tar.gz console-linux-armv7 console.yml '
sh label: 'package-linux-arm64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm64.tar.gz console-linux-arm64 console.yml '
sh label: 'package-linux-amd64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-amd64.tar.gz console-linux-amd64 console.yml '
sh label: 'package-linux-386', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-386.tar.gz console-linux-386 console.yml '
sh label: 'package-linux-mips', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips.tar.gz console-linux-mips console.yml '
sh label: 'package-linux-mipsle', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mipsle.tar.gz console-linux-mipsle console.yml '
sh label: 'package-linux-mips64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips64.tar.gz console-linux-mips64 console.yml '
sh label: 'package-linux-mips64le', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-mips64le.tar.gz console-linux-mips64le console.yml '
sh label: 'package-linux-arm5', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm5.tar.gz console-linux-armv5 console.yml '
sh label: 'package-linux-arm6', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm6.tar.gz console-linux-armv6 console.yml '
sh label: 'package-linux-arm7', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm7.tar.gz console-linux-armv7 console.yml '
sh label: 'package-linux-arm64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && tar cfz ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-linux-arm64.tar.gz console-linux-arm64 console.yml '
sh label: 'package-mac-amd64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-mac-amd64.zip console-mac-amd64 console.yml '
sh label: 'package-mac-arm64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-mac-arm64.zip console-mac-arm64 console.yml '
sh label: 'package-win-amd64', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-windows-amd64.zip console-windows-amd64.exe console.yml '
sh label: 'package-win-386', script: 'cd /home/jenkins/go/src/infini.sh/search-center/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-windows-386.zip console-windows-386.exe console.yml '
sh label: 'package-mac-amd64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-mac-amd64.zip console-mac-amd64 console.yml '
sh label: 'package-mac-arm64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-mac-arm64.zip console-mac-arm64 console.yml '
sh label: 'package-win-amd64', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-windows-amd64.zip console-windows-amd64.exe console.yml '
sh label: 'package-win-386', script: 'cd /home/jenkins/go/src/infini.sh/console/bin && zip -r ${WORKSPACE}/console-$VERSION-$BUILD_NUMBER-windows-386.zip console-windows-386.exe console.yml '
archiveArtifacts artifacts: 'console-$VERSION-$BUILD_NUMBER-*.*', fingerprint: true, followSymlinks: true, onlyIfSuccessful: false
}
}

View File

@ -19,13 +19,13 @@ 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/console && git stash && git pull origin master && make clean'
sh 'cd /home/jenkins/go/src/infini.sh/search-center/ && rm -rif web'
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/web && cnpm run build'
sh 'cd /home/jenkins/go/src/infini.sh/search-center/web && mv static/* ../.public/static'
sh 'cd /home/jenkins/go/src/infini.sh/console/ && rm -rif web'
sh 'cd /home/jenkins/go/src/infini.sh/console/ && git clone ssh://git@git.infini.ltd:64221/infini/console-ui.git web'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm install'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && cnpm run build'
sh 'cd /home/jenkins/go/src/infini.sh/console/web && mv static/* ../.public/static'
sh label: 'docker-build', script: 'cd /home/jenkins/go/src/infini.sh/ && docker build -t infini-console -f search-center/docker/Dockerfile .'
sh label: 'docker-tagging', script: 'docker tag infini-console infinilabs/console:latest && docker tag infini-console infinilabs/console:$VERSION-$BUILD_NUMBER'

View File

@ -9,15 +9,15 @@ RUN mkdir -p /go/src/infini.sh
WORKDIR /go/src/infini.sh/
COPY ./framework /go/src/infini.sh/framework
COPY ./search-center /go/src/infini.sh/search-center
COPY ./search-center /go/src/infini.sh/console
COPY ./license /go/src/infini.sh/license
COPY ./vendor /go/src/infini.sh/vendor
RUN cd search-center && OFFLINE_BUILD=true make config build
RUN chmod a+x /go/src/infini.sh/search-center/bin/console
RUN chmod a+x /go/src/infini.sh/console/bin/console
FROM alpine:latest
WORKDIR /
COPY --from=0 /go/src/infini.sh/search-center/bin/console /console
COPY --from=0 /go/src/infini.sh/search-center/bin/console.yml /console.yml
COPY --from=0 /go/src/infini.sh/console/bin/console /console
COPY --from=0 /go/src/infini.sh/console/bin/console.yml /console.yml
CMD ["/console"]

View File

@ -7,7 +7,7 @@ services:
- 9010:9000
container_name: "infini-search-center-dev"
volumes:
- ../:/go/src/infini.sh/search-center
- ../:/go/src/infini.sh/console
- ./entrypoint.sh:/entrypoint.sh
volumes:

View File

@ -7,4 +7,4 @@ echo "INFINI GOLANG ENV READY TO ROCK!"
cd search-center
make build
cd /go/src/infini.sh/search-center && ./bin/search-center
cd /go/src/infini.sh/console && ./bin/search-center

View File

@ -3,6 +3,10 @@ package main
import (
"errors"
_ "expvar"
"infini.sh/console/config"
"infini.sh/console/model"
"infini.sh/console/model/alerting"
alertSrv "infini.sh/console/service/alerting"
"infini.sh/framework"
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/env"
@ -21,10 +25,6 @@ import (
"infini.sh/framework/plugins/elastic/json_indexing"
api2 "infini.sh/gateway/api"
_ "infini.sh/gateway/proxy"
"infini.sh/search-center/config"
"infini.sh/search-center/model"
"infini.sh/search-center/model/alerting"
alertSrv "infini.sh/search-center/service/alerting"
)
var appConfig *config.AppConfig

View File

@ -0,0 +1,35 @@
package account
import (
"infini.sh/framework/core/api"
"infini.sh/framework/core/api/router"
"infini.sh/framework/core/util"
"net/http"
)
type Account struct {
api.Handler
}
func init() {
account:=Account{}
api.HandleAPIMethod(api.POST, "/account/login", account.AccountLogin)
api.HandleAPIMethod(api.GET, "/account/current_user", account.CurrentUser)
}
func (handler Account)AccountLogin(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
data := util.MapStr{
"status": "ok",
"type": "account",
"currentAuthority": "admin",
"userid": "10001",
}
handler.WriteJSON(w, data, http.StatusOK)
}
func (handler Account)CurrentUser(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
data := []byte("{ \"name\": \"INFINI Labs\", \"avatar\": \"\", \"userid\": \"10001\", \"email\": \"hello@infini.ltd\", \"signature\": \"极限科技 - 专业的开源搜索与实时数据分析整体解决方案提供商。\", \"title\": \"首席设计师\", \"group\": \"INFINI LabsUED\", \"tags\": [ { \"key\": \"0\", \"label\": \"很有想法的\" }, { \"key\": \"1\", \"label\": \"专注设计\" }, { \"key\": \"2\", \"label\": \"辣~\" }, { \"key\": \"3\", \"label\": \"大长腿\" }, { \"key\": \"4\", \"label\": \"川妹子\" }, { \"key\": \"5\", \"label\": \"海纳百川\" } ], \"notifyCount\": 12, \"country\": \"China\", \"geographic\": { \"province\": { \"label\": \"湖南省\", \"key\": \"330000\" }, \"city\": { \"label\": \"长沙市\", \"key\": \"330100\" } }, \"address\": \"岳麓区湘江金融中心\", \"phone\": \"4001399200\" }")
handler.Write(w, data)
}

View File

@ -10,8 +10,8 @@ import (
httprouter "infini.sh/framework/core/api/router"
"infini.sh/framework/core/orm"
"infini.sh/framework/core/util"
"infini.sh/search-center/config"
model2 "infini.sh/search-center/model"
"infini.sh/console/config"
model2 "infini.sh/console/model"
)
type APIHandler struct {
@ -116,20 +116,3 @@ func (handler APIHandler) UpdateDictItemAction(w http.ResponseWriter, req *http.
handler.WriteJSON(w, resp, http.StatusOK)
}
func (handler APIHandler) AccountLogin(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
data := util.MapStr{
"status": "ok",
"type": "account",
"currentAuthority": "admin",
"userid": "10001",
}
handler.WriteJSON(w, data, http.StatusOK)
}
func (handler APIHandler) CurrentUser(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {
data := []byte("{ \"name\": \"INFINI Labs\", \"avatar\": \"\", \"userid\": \"10001\", \"email\": \"hello@infini.ltd\", \"signature\": \"极限科技 - 专业的开源搜索与实时数据分析整体解决方案提供商。\", \"title\": \"首席设计师\", \"group\": \"INFINI LabsUED\", \"tags\": [ { \"key\": \"0\", \"label\": \"很有想法的\" }, { \"key\": \"1\", \"label\": \"专注设计\" }, { \"key\": \"2\", \"label\": \"辣~\" }, { \"key\": \"3\", \"label\": \"大长腿\" }, { \"key\": \"4\", \"label\": \"川妹子\" }, { \"key\": \"5\", \"label\": \"海纳百川\" } ], \"notifyCount\": 12, \"country\": \"China\", \"geographic\": { \"province\": { \"label\": \"湖南省\", \"key\": \"330000\" }, \"city\": { \"label\": \"长沙市\", \"key\": \"330100\" } }, \"address\": \"岳麓区湘江金融中心\", \"phone\": \"4001399200\" }")
handler.Write(w, data)
}

View File

@ -1,11 +1,11 @@
package index_management
import (
log "github.com/cihub/seelog"
httprouter "infini.sh/framework/core/api/router"
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/util"
"net/http"
log "src/github.com/cihub/seelog"
)
func (handler APIHandler) HandleGetMappingsAction(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {

View File

@ -3,16 +3,16 @@ package index_management
import (
"encoding/json"
"fmt"
log "github.com/cihub/seelog"
"infini.sh/framework/core/orm"
"net/http"
log "github.com/cihub/seelog"
"strings"
"time"
httprouter "infini.sh/framework/core/api/router"
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/util"
"infini.sh/search-center/model"
"infini.sh/console/model"
)
func (handler APIHandler) HandleReindexAction(w http.ResponseWriter, req *http.Request, ps httprouter.Params) {

View File

@ -1,14 +1,15 @@
package api
import (
"infini.sh/console/config"
"infini.sh/console/plugin/api/index_management"
"infini.sh/console/service/alerting"
"infini.sh/framework/core/api"
"infini.sh/search-center/api/index_management"
"infini.sh/search-center/config"
"infini.sh/search-center/service/alerting"
"path"
)
func Init(cfg *config.AppConfig) {
handler := index_management.APIHandler{
Config: cfg,
}
@ -77,15 +78,6 @@ func Init(cfg *config.AppConfig) {
api.HandleAPIMethod(api.POST, "/elasticsearch/:id/alerting/_monitors/:monitorID/_acknowledge/alerts", alerting.AcknowledgeAlerts)
api.HandleAPIMethod(api.POST, "/account/login", handler.AccountLogin)
api.HandleAPIMethod(api.GET, "/account/current_user", handler.CurrentUser)
api.HandleAPIMethod(api.GET, "/account/current_user", handler.CurrentUser)
//task.RegisterScheduleTask(task.ScheduleTask{
// Description: "sync reindex task result",
// Task: func() {

View File

@ -3,7 +3,7 @@ package action
import (
"crypto/tls"
"fmt"
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"net"
"net/smtp"
"strings"

View File

@ -1,7 +1,7 @@
package action
import (
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"testing"
)

View File

@ -3,7 +3,7 @@ package action
import (
"crypto/tls"
"fmt"
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"io/ioutil"
"net/http"
"strings"

View File

@ -1,7 +1,7 @@
package action
import (
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"net/http"
"testing"
)

View File

@ -8,7 +8,7 @@ import (
"fmt"
httprouter "infini.sh/framework/core/api/router"
"infini.sh/framework/core/orm"
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"io"
"net/http"
"net/url"

View File

@ -7,7 +7,7 @@ import (
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/orm"
"infini.sh/framework/core/util"
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"net/http"
"strings"
"time"

View File

@ -7,8 +7,8 @@ import (
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/orm"
"infini.sh/framework/core/util"
"infini.sh/search-center/model/alerting"
alertUtil "infini.sh/search-center/service/alerting/util"
"infini.sh/console/model/alerting"
alertUtil "infini.sh/console/service/alerting/util"
"net/http"
"strconv"
"strings"

View File

@ -13,9 +13,9 @@ import (
"infini.sh/framework/core/conditions"
"infini.sh/framework/core/elastic"
"infini.sh/framework/core/orm"
"infini.sh/search-center/model/alerting"
"infini.sh/search-center/service/alerting/action"
"infini.sh/search-center/service/alerting/util"
"infini.sh/console/model/alerting"
"infini.sh/console/service/alerting/action"
"infini.sh/console/service/alerting/util"
"io"
"net/http"
"strings"

View File

@ -3,7 +3,7 @@ package util
import (
"fmt"
cronlib "github.com/robfig/cron"
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"time"
)

View File

@ -2,7 +2,7 @@ package util
import (
"fmt"
"infini.sh/search-center/model/alerting"
"infini.sh/console/model/alerting"
"testing"
"time"
)

6
ui.go
View File

@ -2,15 +2,15 @@ package main
import (
"fmt"
public "infini.sh/search-center/.public"
public "infini.sh/console/.public"
"net/http"
log "github.com/cihub/seelog"
"infini.sh/framework/core/api"
"infini.sh/framework/core/util"
"infini.sh/framework/core/vfs"
uiapi "infini.sh/search-center/api"
"infini.sh/search-center/config"
"infini.sh/console/config"
uiapi "infini.sh/console/plugin/api"
)
type UI struct {