Merge pull request #1 from Tencent/master

pull from tencent/bk-cmdb
TencentBlueKing · Jun 1, 2018 · 5241b37 · 5241b37
2 parents 0c4df23 + e305bc9
commit 5241b37
Show file tree

Hide file tree

Showing 6,147 changed files with 2,251,027 additions and 394,874 deletions.
diff --git a/.htaccess b/.htaccess
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,40 @@
+language: go
+
+go:
+  - "1.8.x"
+  - "1.10.x"
+
+# safelist
+branches:
+  only:
+  - master
+  - travis_ci
+
+env:
+  global:
+    - REPO_NAME=bk-cmdb
+    - BUILD_DIR=configcenter
+
+cache:
+  directories:
+    - node_modules
+
+before_install:
+  - go get -v github.com/golang/lint/golint
+
+install: true
+
+script:
+ - pwd && ls ./ && ls ../
+ - cd ../ && mv $REPO_NAME ../../$BUILD_DIR
+ - cd ../../$BUILD_DIR
+ - ./scripts/travis_ci.sh
+ - cd src
+ - make
+
+notifications:
+  email:
+    recipients:
+      - gmaclinuxer@gmail.com
+    on_success: always # default: change
+    on_failure: always # default: always
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,27 @@
+
+问题描述
+===========
+<这里写问题描述>
+
+
+重现方法
+================
+<列出如何重现的方法或操作步骤>
+
+
+**重要提醒**: 请优先尝试最新发布的版本 (发布清单： https://github.com/Tencent/bk-cmdb/releases), 如果问题不能在最新发布的版本里重现，说明此问题已经被修复。
+
+
+关键信息
+=========
+
+**重要提醒**: 这些关键信息会辅助我们快速定位问题。
+
+请提供以下信息:
+
+ - [x] bk-cmdb   版本 (发布版本号 或 git tag): `<示例： v3.0.6-alpha 或者 git sha. 请不要使用 "最新版本" 或 "当前版本"等无法准确定位代码版本的语句描述>`
+ - [ ] Redis     版本: `<示例： 3.2.11>`
+ - [ ] MongoDB   版本: `<示例： 2.8.0>`
+ - [ ] ZooKeeper 版本: `<示例： 3.4.11>`
+ - [ ] 操作系统      : `<示例： Centos 5 (x64)>`
+ - [ ] bk-cmdb 异常日志
diff --git a/LICENSE b/LICENSE
diff --git a/LICENSE.TXT b/LICENSE.TXT
diff --git a/README.md b/README.md
diff --git a/application/cache/.htaccess b/application/cache/.htaccess
diff --git a/application/config/api_error_const.php b/application/config/api_error_const.php
diff --git a/application/config/autoload.php b/application/config/autoload.php