diff --git a/Jenkinsfile b/Jenkinsfile index 28ea6ea1..75d5ac62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { stage('Stop Front Docker') { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ - sh 'cd /home/deploy/logging-center/web && cnpm run docker:stop-dev || true' + sh 'cd /home/deploy/search-center/web && cnpm run docker:stop-dev || true' } } } @@ -17,7 +17,7 @@ pipeline { stage('Stop Backend Docker') { steps { catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE'){ - sh 'cd /home/deploy/logging-center/docker && docker-compose -f docker-compose.dev.yml down || true' + sh 'cd /home/deploy/search-center/docker && docker-compose -f docker-compose.dev.yml down || true' } } } @@ -40,38 +40,38 @@ pipeline { stage('Update Files') { steps { - sh 'cd /home/deploy/logging-center && git add . && git stash && git pull origin master' + sh 'cd /home/deploy/search-center && git add . && git stash && git pull origin master' } } stage('Install Packages') { steps { - sh 'cd /home/deploy/logging-center && cnpm install' + sh 'cd /home/deploy/search-center && cnpm install' } } stage('Fix FileAttr') { steps { - sh "cd /home/deploy/logging-center/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \ - cd /home/deploy/logging-center/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh" + sh "cd /home/deploy/search-center/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh && \ + cd /home/deploy/search-center/web/docker && chmod a+x *.sh && perl -pi -e 's/\r\n/\n/g' *.sh" } } stage('Start Front Docker') { steps { - sh 'cd /home/deploy/logging-center/web && cnpm run docker:dev' + sh 'cd /home/deploy/search-center/web && cnpm run docker:dev' } } stage('Build Front Files') { steps { - sh 'cd /home/deploy/logging-center/web && cnpm run docker:build' + sh 'cd /home/deploy/search-center/web && cnpm run docker:build' } } stage('Start Backend Docker') { steps { - sh 'cd /home/deploy/logging-center/docker && docker-compose -f docker-compose.dev.yml up -d' + sh 'cd /home/deploy/search-center/docker && docker-compose -f docker-compose.dev.yml up -d' } } diff --git a/Makefile b/Makefile index 891f67c8..3dc6fcca 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ SHELL=/bin/bash # APP info -APP_NAME := logging-center +APP_NAME := search-center APP_VERSION := 1.0.0_SNAPSHOT APP_CONFIG := $(APP_NAME).yml APP_STATIC_FOLDER := .public diff --git a/README.md b/README.md index d5cb3ca4..4a3d5253 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# 极限日志分析中心 +# 极限搜索中心 -INFINI Logging Center +INFINI Search Center ## 前端开发说明 @@ -95,7 +95,7 @@ cnpm install --save md5 ## 后端开发说明 -后端采用 Golang 开发,最终输出为 `bin` 目录的可执行文件 `logging-center` 和配置文件 `logging-center.yml`。 +后端采用 Golang 开发,最终输出为 `bin` 目录的可执行文件 `search-center` 和配置文件 `search-center.yml`。 ### Docker 开发环境 diff --git a/api/index_management/index.go b/api/index_management/index.go new file mode 100644 index 00000000..ce59e5b3 --- /dev/null +++ b/api/index_management/index.go @@ -0,0 +1,12 @@ +package index_management + +import ( + httprouter "infini.sh/framework/core/api/router" + "net/http" +) + + + +func API1(w http.ResponseWriter, req *http.Request, ps httprouter.Params) { + +} \ No newline at end of file diff --git a/api/init.go b/api/init.go new file mode 100644 index 00000000..1bf25418 --- /dev/null +++ b/api/init.go @@ -0,0 +1,11 @@ +package api + +import ( + "infini.sh/framework/core/api" + "infini.sh/framework/core/ui" + "infini.sh/search-center/api/index_management" +) + +func Init() { + ui.HandleUIMethod(api.POST, "/api/get_indices",index_management.API1) +} \ No newline at end of file diff --git a/docker/docker-compose-mysql.dev.yml b/docker/docker-compose-mysql.dev.yml index 2e18acb1..0dd6be98 100644 --- a/docker/docker-compose-mysql.dev.yml +++ b/docker/docker-compose-mysql.dev.yml @@ -1,12 +1,12 @@ version: '3' services: - infini-logging-center-db: + infini-search-center-db: image: mariadb:10.1.19 # volumes: # - ../data/db_data:/var/lib/mysql restart: always - container_name: "infini-logging-center-db" + container_name: "infini-search-center-db" environment: MYSQL_ROOT_PASSWORD: admin ports: diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index 11a93b00..6bebf0dc 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -1,20 +1,13 @@ version: "3.5" services: - infini-logging-center-api-dev: - # option 1: pull image from infini docker registry + infini-search-center-api-dev: image: docker.infini.ltd:64443/golang-dev:latest - - # # option 2: build image locally -# build: -# context: . -# dockerfile: ./Dockerfile - ports: - 9000:9000 - container_name: "infini-logging-center-api-dev" + container_name: "infini-search-center-api-dev" volumes: - - ../:/go/src/infini.sh/logging-center + - ../:/go/src/infini.sh/search-center - ./entrypoint.sh:/entrypoint.sh volumes: diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index a7ef2ec9..baa5f7f4 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -4,7 +4,7 @@ cd /go/src/infini.sh/ echo "INFINI GOLANG ENV READY TO ROCK!" -cd logging-center +cd search-center make build -cd /go/src/infini.sh/logging-center && ./bin/logging-center \ No newline at end of file +cd /go/src/infini.sh/search-center && ./bin/search-center \ No newline at end of file diff --git a/main.go b/main.go index 4ee39016..737d3a6f 100644 --- a/main.go +++ b/main.go @@ -7,7 +7,7 @@ import ( "infini.sh/framework/core/env" "infini.sh/framework/core/module" "infini.sh/framework/modules" - "infini.sh/logging-center/config" + "infini.sh/search-center/config" ) var appConfig *config.AppConfig @@ -35,7 +35,7 @@ func main() { terminalFooter += ("/_//_/|_//_/ /_//_/|_//_/() /___//_/ /__,' \n\n") terminalFooter += ("©2020 INFINI.LTD, All Rights Reserved.\n") - app := framework.NewApp("logging-center", "the easiest way to operate your own logging center.", + app := framework.NewApp("search-center", "the easiest way to operate your own search center.", config.Version, config.LastCommitLog, config.BuildDate, terminalHeader, terminalFooter) app.Init(nil) @@ -53,7 +53,7 @@ func main() { UILocalEnabled: true, } - ok, err := env.ParseConfig("logging-center", appConfig) + ok, err := env.ParseConfig("search-center", appConfig) if err != nil { panic(err) } diff --git a/logging-center.yml b/search-center.yml similarity index 80% rename from logging-center.yml rename to search-center.yml index b3ea8698..d0e77c7f 100644 --- a/logging-center.yml +++ b/search-center.yml @@ -1,7 +1,7 @@ elasticsearch: - name: default enabled: true - endpoint: http://192.168.3.98:9200 + endpoint: https://192.168.3.98:9200 index_prefix: infini- basic_auth: username: elastic @@ -13,7 +13,7 @@ modules: network: binding: 0.0.0.0:9000 -logging-center: +search-center: index_name: reports ui_path: .public ui_vfs: true diff --git a/ui.go b/ui.go index 78b67684..9f2c7d13 100644 --- a/ui.go +++ b/ui.go @@ -7,8 +7,9 @@ import ( "infini.sh/framework/core/ui" "infini.sh/framework/core/util" "infini.sh/framework/core/vfs" - "infini.sh/logging-center/.public" - "infini.sh/logging-center/config" + "infini.sh/search-center/.public" + "infini.sh/search-center/api/index_management" + "infini.sh/search-center/config" "net/http" ) @@ -23,6 +24,7 @@ func (h UI) InitUI() { ui.HandleUI("/", vfs.FileServer(vfs.VFS())) + index_management.Init() ui.HandleUIFunc("/api/", func(w http.ResponseWriter, req *http.Request) { log.Warn("api: ",req.URL," not implemented") diff --git a/web/docker/docker-compose.build.yml b/web/docker/docker-compose.build.yml index f1afdfd9..1715ae78 100644 --- a/web/docker/docker-compose.build.yml +++ b/web/docker/docker-compose.build.yml @@ -1,7 +1,7 @@ version: "3.5" services: - infini-logging-center-ui-dev: + infini-search-center-ui-dev: # option 1: pull image from infini docker registry image: docker.infini.ltd:64443/nodejs-dev:latest @@ -10,7 +10,7 @@ services: # context: ./ # dockerfile: ./Dockerfile - container_name: "infini-logging-center-ui-dev" + container_name: "infini-search-center-ui-dev" volumes: - ../src:/usr/src/app/src - ../config:/usr/src/app/config diff --git a/web/docker/docker-compose.dev.yml b/web/docker/docker-compose.dev.yml index f0def8dc..850f7357 100644 --- a/web/docker/docker-compose.dev.yml +++ b/web/docker/docker-compose.dev.yml @@ -1,7 +1,7 @@ version: "3.5" services: - infini-logging-center-ui-build: + infini-search-center-ui-build: # option 1: pull image from infini docker registry image: docker.infini.ltd:64443/nodejs-dev:latest @@ -13,7 +13,7 @@ services: ports: - 3000:3000 - 8000:8000 - container_name: "infini-logging-center-ui-build" + container_name: "infini-search-center-ui-build" volumes: - ../src:/usr/src/app/src - ../config:/usr/src/app/config diff --git a/web/docker/entrypoint-build.sh b/web/docker/entrypoint-build.sh index f96689fa..37576a74 100644 --- a/web/docker/entrypoint-build.sh +++ b/web/docker/entrypoint-build.sh @@ -4,7 +4,7 @@ npm config set registry http://registry.npm.taobao.org/; cd /usr/src/app -echo "START TO RELEASE INFINI-LOGGING-CENTER" +echo "START TO RELEASE INFINI-SEARCH-CENTER" npm install --registry=https://registry.npm.taobao.org npm run build diff --git a/web/docker/entrypoint-dev.sh b/web/docker/entrypoint-dev.sh index 78bd4ae6..d4bb78af 100644 --- a/web/docker/entrypoint-dev.sh +++ b/web/docker/entrypoint-dev.sh @@ -6,7 +6,7 @@ npm config set registry http://registry.npm.taobao.org/; cd /usr/src/app -echo "START DEBUG INFINI-LOGGING-CENTER" +echo "START DEBUG INFINI-SEARCH-CENTER" if [ ! -f "$lockPath" ]; then npm install --registry=https://registry.npm.taobao.org diff --git a/web/package.json b/web/package.json index d33ef225..243980cd 100644 --- a/web/package.json +++ b/web/package.json @@ -1,7 +1,7 @@ { - "name": "logging-center", + "name": "search-center", "version": "1.0.0", - "description": "极限日志分析中心,致力于简单易用。", + "description": "极限搜索,致力于简单易用。", "dependencies": { "@ant-design/charts": "^1.0.4", "@ant-design/icons": "^4.0.0", @@ -95,7 +95,7 @@ }, "repository": { "type": "git", - "url": "ssh://git@git.infini.ltd:64221/infini/logging-center.git" + "url": "ssh://git@git.infini.ltd:64221/infini/search-center.git" }, "author": "INFINI.LTD", "license": "INFINI-EULA" diff --git a/web/src/locales/en-US.js b/web/src/locales/en-US.js index 1db47158..fe27b16d 100644 --- a/web/src/locales/en-US.js +++ b/web/src/locales/en-US.js @@ -1,8 +1,8 @@ export default { 'navBar.lang': 'Languages', - 'layout.user.appname':"INFINI LOGGING CENTER", - 'layout.user.appslogon':"INFINI logging center is the best log analysis platform in the world", + 'layout.user.appname':"INFINI SEARCH CENTER", + 'layout.user.appslogon':"INFINI search center is the best search platform in the world", 'layout.user.link.help': 'Help', 'layout.user.link.privacy': 'Privacy', @@ -183,7 +183,7 @@ export default { 'app.monitor.resource-surplus': 'Resource Surplus', 'app.monitor.fund-surplus': 'Fund Surplus', - 'app.setting.appname':"Logging Center", + 'app.setting.appname':"Search Center", 'app.settings.menuMap.basic': 'Basic Settings', 'app.settings.menuMap.security': 'Security Settings', diff --git a/web/src/locales/zh-CN.js b/web/src/locales/zh-CN.js index c60d212c..d2a985d7 100644 --- a/web/src/locales/zh-CN.js +++ b/web/src/locales/zh-CN.js @@ -1,8 +1,8 @@ export default { 'navBar.lang': '语言', - 'layout.user.appname':"极限日志分析中心", - 'layout.user.appslogon':"极限科技的日志分析中心是东半球最好用的日志分析平台", + 'layout.user.appname':"极限搜索管理后台", + 'layout.user.appslogon':"极限科技的搜索平台是东半球最好用的搜索服务平台", 'layout.user.link.help': '帮助', 'layout.user.link.privacy': '隐私', @@ -183,10 +183,9 @@ export default { 'app.monitor.resource-surplus': '资源剩余', 'app.monitor.fund-surplus': '补贴资金剩余', - 'app.setting.appname':"日志分析中心", - - 'app.login.appname':"日志分析中心", + 'app.setting.appname':"极限搜索中心", + 'app.settings.menuMap.basic': '基本设置', 'app.settings.menuMap.security': '安全设置', 'app.settings.menuMap.binding': '账号绑定',