[ISSUE polarismesh#805] Feat issue 805 (polarismesh#836)

* fix issue polarismesh#629 (polarismesh#693)

* docs:优化错误信息描述

* Update zh.toml

* fix:修复eureka心跳协议错误码不兼容问题

* fix:修复eureka心跳协议错误码不兼容问题

* unit:添加单元测试

* test:调整测试配置文件位置

* fix:issue polarismesh#692

* fix:issue polarismesh#692

* fix:issue polarismesh#692

* fix:issue polarismesh#692

* docs:add error code desc

* fix:调整license-checker的触发

* fix:调整license-checker的触发

* feat:issue polarismesh#805

* rollback code modify

* rollback code modify

* fix_client_check

* fix:fix memory leak

* none

* fix:memory leak

* none

* none

* none

* none

Author: chuntaojun

.github/workflows/integration-testing-mysql.yml

@@ -115,7 +115,7 @@ jobs:
           # 清空数据
           mysql -h127.0.0.1 -P3306 -uroot -p"polaris" -e "DROP DATABASE IF EXISTS polaris_server";
           # 初始化 polaris 数据库
-          mysql -h127.0.0.1 -P3306 -uroot -p"polaris" < store/sqldb/scripts/polaris_server.sql
+          mysql -h127.0.0.1 -P3306 -uroot -p"polaris" < store/mysql/scripts/polaris_server.sql
           # 临时放开 DB 的最大连接数
           mysql -h127.0.0.1 -P3306 -uroot -p"polaris" -e "set GLOBAL max_connections = 3000;"
 
@@ -138,7 +138,7 @@ jobs:
               sed -i 's/consoleOpen: \(true\|false\)/consoleOpen: false/g' polaris-server.yaml
           fi
 
-          cat polaris-server.yaml
+          cat conf/polaris-server.yaml
 
           chmod +x ./tool/*.sh
           ./tool/start.sh

.github/workflows/integration-testing.yml

@@ -88,14 +88,14 @@ jobs:
           if [[ "$(uname)" == "Darwin" ]]; then
               # Mac OS X 操作系统
               echo "Run on MacOS"
-              sed -i '' 's/consoleOpen: true/consoleOpen: false/g' polaris-server.yaml
+              sed -i '' 's/consoleOpen: true/consoleOpen: false/g' conf/polaris-server.yaml
           else
               # GNU/Linux操作系统
               echo "Run on Linux"
-              sed -i 's/consoleOpen: \(true\|false\)/consoleOpen: false/g' polaris-server.yaml
+              sed -i 's/consoleOpen: \(true\|false\)/consoleOpen: false/g' conf/polaris-server.yaml
           fi
 
-          cat polaris-server.yaml
+          cat conf/polaris-server.yaml
 
           chmod +x ./tool/*.sh
           ./tool/start.sh

.licenserc.yaml

@@ -68,6 +68,8 @@ header: # `header` section is configurations for source codes license header.
     - "deploy"
     - "**/*.proto"
     - "logo.svg"
+    - "standalone"
+    - "cluster"
     - "common/api/protoc"
   comment: on-failure # on what condition license-eye will comment on the pull request, `on-failure`, `always`, `never`.
 

apiserver/httpserver/http/handler_test.go

@@ -33,8 +33,8 @@ import (
 )
 
 func init() {
-	i18n.LoadI18nMessageFile("../i18n/en.toml")
-	i18n.LoadI18nMessageFile("../i18n/zh.toml")
+	i18n.LoadI18nMessageFile("../../../conf/i18n/en.toml")
+	i18n.LoadI18nMessageFile("../../../conf/i18n/zh.toml")
 }
 
 func Test_i18n(t *testing.T) {

apiserver/httpserver/i18n/translate.go

@@ -38,8 +38,8 @@ var (
 func init() {
 	bundle = ii18n.NewBundle(language.English)
 	bundle.RegisterUnmarshalFunc("toml", toml.Unmarshal)
-	LoadI18nMessageFile("apiserver/httpserver/i18n/zh.toml")
-	LoadI18nMessageFile("apiserver/httpserver/i18n/en.toml")
+	LoadI18nMessageFile("conf/i18n/zh.toml")
+	LoadI18nMessageFile("conf/i18n/en.toml")
 }
 
 // LoadI18nMessageFile 加载i18n配置文件

apiserver/httpserver/i18n/translate_test.go

@@ -26,8 +26,8 @@ import (
 )
 
 func init() {
-	LoadI18nMessageFile("en.toml")
-	LoadI18nMessageFile("zh.toml")
+	LoadI18nMessageFile("../../../conf/i18n/en.toml")
+	LoadI18nMessageFile("../../../conf/i18n/zh.toml")
 }
 
 func Test_Translate(t *testing.T) {

auth/defaultauth/main_test.go

@@ -52,8 +52,8 @@ import (
 	"github.com/polarismesh/polaris/store"
 	"github.com/polarismesh/polaris/store/boltdb"
 	_ "github.com/polarismesh/polaris/store/boltdb"
-	"github.com/polarismesh/polaris/store/sqldb"
-	_ "github.com/polarismesh/polaris/store/sqldb"
+	_ "github.com/polarismesh/polaris/store/mysql"
+	sqldb "github.com/polarismesh/polaris/store/mysql"
 	"github.com/polarismesh/polaris/testdata"
 )
 

build.sh

@@ -63,18 +63,15 @@ export CGO_ENABLED=0
 
 build_date=$(date "+%Y%m%d.%H%M%S")
 package="github.com/polarismesh/polaris-server/common/version"
-i18n_res="apiserver/httpserver/i18n"
-sqldb_res="store/sqldb"
+sqldb_res="store/mysql"
 go build -o ${bin_name} -ldflags="-X ${package}.Version=${version} -X ${package}.BuildDate=${build_date}"
 
 # 打包
 mkdir -p ${folder_name}
 cp ${bin_name} ${folder_name}
 mkdir -p ${folder_name}/${sqldb_res}
-cp -r ${sqldb_res}/scripts ${folder_name}/${sqldb_res}
-cp polaris-server.yaml ${folder_name}
+cp -r ${sqldb_res}/scripts/* ${folder_name}/${sqldb_res}
 cp -r tool ${folder_name}/
-mkdir -p ${folder_name}/${i18n_res}
-cp -r ${i18n_res}/*.toml ${folder_name}/${i18n_res}
+cp -r conf ${folder_name}/
 zip -r "${pkg_name}" ${folder_name}
 md5sum ${pkg_name} >"${pkg_name}.md5sum"

deploy/helm/.helmignore cluster/helm/.helmignore

@@ -10,19 +10,19 @@ data:
       # 全局日志
       logger:
         config:
-          rotateOutputPath: log/polaris-config.log
-          errorRotateOutputPath: log/polaris-config-error.log
+          rotateOutputPath: log/runtime/polaris-config.log
+          errorRotateOutputPath: log/runtime/polaris-config-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
           outputLevel: info
           outputPaths:
-            - stdout
+          - stdout
           errorOutputPaths:
-            - stderr
+          - stderr
         auth:
-          rotateOutputPath: log/polaris-auth.log
-          errorRotateOutputPath: log/polaris-auth-error.log
+          rotateOutputPath: log/runtime/polaris-auth.log
+          errorRotateOutputPath: log/runtime/polaris-auth-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
@@ -32,8 +32,8 @@ data:
           errorOutputPaths:
             - stderr
         store:
-          rotateOutputPath: log/polaris-store.log
-          errorRotateOutputPath: log/polaris-store-error.log
+          rotateOutputPath: log/runtime/polaris-store.log
+          errorRotateOutputPath: log/runtime/polaris-store-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
@@ -43,8 +43,8 @@ data:
           errorOutputPaths:
             - stderr
         cache:
-          rotateOutputPath: log/polaris-cache.log
-          errorRotateOutputPath: log/polaris-cache-error.log
+          rotateOutputPath: log/runtime/polaris-cache.log
+          errorRotateOutputPath: log/runtime/polaris-cache-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
@@ -54,8 +54,8 @@ data:
           errorOutputPaths:
             - stderr
         naming:
-          rotateOutputPath: log/polaris-naming.log
-          errorRotateOutputPath: log/polaris-naming-error.log
+          rotateOutputPath: log/runtime/polaris-naming.log
+          errorRotateOutputPath: log/runtime/polaris-naming-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
@@ -65,8 +65,8 @@ data:
           errorOutputPaths:
             - stderr
         healthcheck:
-          rotateOutputPath: log/polaris-healthcheck.log
-          errorRotateOutputPath: log/polaris-healthcheck-error.log
+          rotateOutputPath: log/runtime/polaris-healthcheck.log
+          errorRotateOutputPath: log/runtime/polaris-healthcheck-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
@@ -76,8 +76,30 @@ data:
           errorOutputPaths:
             - stderr
         xdsv3:
-          rotateOutputPath: log/polaris-xdsv3.log
-          errorRotateOutputPath: log/polaris-xdsv3-error.log
+          rotateOutputPath: log/runtime/polaris-xdsv3.log
+          errorRotateOutputPath: log/runtime/polaris-xdsv3-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        apiserver:
+          rotateOutputPath: log/runtime/polaris-apiserver.log
+          errorRotateOutputPath: log/runtime/polaris-apiserver-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        token-bucket:
+          rotateOutputPath: log/runtime/polaris-ratelimit.log
+          errorRotateOutputPath: log/runtime/polaris-ratelimit-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
@@ -87,11 +109,56 @@ data:
           errorOutputPaths:
             - stderr
         default:
-          rotateOutputPath: log/polaris-default.log
-          errorRotateOutputPath: log/polaris-default-error.log
+          rotateOutputPath: log/runtime/polaris-default.log
+          errorRotateOutputPath: log/runtime/polaris-default-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        discoverEventLocal:
+          rotateOutputPath: log/event/polaris-discoverevent.log
+          errorRotateOutputPath: log/polaris-discoverevent-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        discoverLocal:
+          rotateOutputPath: log/statis/polaris-discoverstat.log
+          errorRotateOutputPath: log/statis/polaris-discoverstat-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        local:
+          rotateOutputPath: log/statis/polaris-statis.log
+          errorRotateOutputPath: log/statis/polaris-statis-error.log
+          rotationMaxSize: 100
+          rotationMaxBackups: 10
+          rotationMaxAge: 7
+          outputLevel: info
+          outputPaths:
+            - stdout
+          errorOutputPaths:
+            - stderr
+        HistoryLogger:
+          rotateOutputPath: log/operation/polaris-history.log
+          errorRotateOutputPath: log/operation/polaris-history-error.log
           rotationMaxSize: 100
           rotationMaxBackups: 10
           rotationMaxAge: 7
+          rotationMaxDurationForHour: 24
           outputLevel: info
           outputPaths:
             - stdout