Merge pull request #69 from Tencent/dev

同步master

.eslintignore

@@ -1,3 +1 @@
-bin/wwwroot/**/highlight-tsw.js
-bin/wwwroot/**/zepto.min.js
-bin/lib/api/L5/L5.api.js
+bin/wwwroot/**/*.js

.eslintrc.json

@@ -4,7 +4,7 @@
  "commonjs": true,
  "es6": true
  },
- "extends": "eslint:recommended",
+ "extends": "eslint-config-alloy",
  "parserOptions": {
  "sourceType": "module",
  "ecmaVersion": 2017
@@ -79,6 +79,39 @@
  ],
  "prefer-const": [
  "warn"
+ ],
+ "no-param-reassign": [
+ "off"
+ ],
+ "no-template-curly-in-string": [
+ "off"
+ ],
+ "one-var": [
+ "off"
+ ],
+ "guard-for-in": [
+ "off"
+ ],
+ "no-undefined": [
+ "off"
+ ],
+ "complexity": [
+ "off"
+ ],
+ "max-nested-callbacks": [
+ "off"
+ ],
+ "no-path-concat": [
+ "off"
+ ],
+ "eqeqeq": [
+ "off"
+ ],
+ "max-depth": [
+ "off"
+ ],
+ "strict": [
+ "off"
  ]
  },
  "overrides": [
@@ -90,6 +123,13 @@
  "globals": {
  "define": true
  }
+ }, {
+ "files": ["bin/tsw/util/auto-report/tmpl.js"],
+ "rules": {
+ "no-inner-declarations": [
+ "off"
+ ]
+ }
  }, {
  "files": ["bin/lib/util/mail/tmpl.js", "bin/tsw/util/**/tmpl.js"],
  "rules": {

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at tsw@tencent.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,5 @@
+**Checklist:**
+
+- [ ] test cases has added or updated
+- [ ] documentation has added or updated
+- [ ] commit message follows the [convention commit guidelines](https://conventionalcommits.org/)

bin/lib/api/L5/L5.api.js

@@ -1,70 +1,68 @@
-/*!
- * Tencent is pleased to support the open source community by making Tencent Server Web available.
- * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
- * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
- * http://opensource.org/licenses/MIT
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
- */
-"use strict";
-
-const logger = require('logger');
-const Deferred = require('util/Deferred');
-const config = require('config');
-
-//获取路由
-this.ApiGetRoute = function(options,callback){
-
- var defer = Deferred.create();
- var res = this.ApiGetRouteSync(options) || {};
-
- if (typeof callback === 'function') {
- callback(res);
- }
-
- if (res.ret >= 0) {
- defer.resolve(res);
- } else {
- defer.reject(res);
- }
-
- return defer;
-}
-
-//上报结果
-this.ApiRouteResultUpdate = function(options){
-
- var defer = Deferred.create();
- var res = this.ApiRouteResultUpdateSync(options);
-
- if(res.ret >= 0){
- defer.resolve(res);
- }else{
- defer.reject(res);
- }
-
- return defer;
-}
-
-//获取路由
-this.ApiGetRouteSync = function(options){
-
- var res = {
- ret: -1
- };
-
- return res;
-};
-
-//上报结果
-this.ApiRouteResultUpdateSync = function(options){
-
- var res = {
- ret: -1
- };
-
- return res;
-}
-
-//多一组方法
-this.updateRoute = this.ApiRouteResultUpdateSync;
-this.getRouteAsync = this.ApiGetRoute;
+/* !
+ * Tencent is pleased to support the open source community by making Tencent Server Web available.
+ * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+const Deferred = require('util/Deferred');
+
+// 获取路由
+this.ApiGetRoute = function(options, callback) {
+
+ const defer = Deferred.create();
+ const res = this.ApiGetRouteSync(options) || {};
+
+ if (typeof callback === 'function') {
+ callback(res);
+ }
+
+ if (res.ret >= 0) {
+ defer.resolve(res);
+ } else {
+ defer.reject(res);
+ }
+
+ return defer;
+};
+
+// 上报结果
+this.ApiRouteResultUpdate = function(options) {
+
+ const defer = Deferred.create();
+ const res = this.ApiRouteResultUpdateSync(options);
+
+ if (res.ret >= 0) {
+ defer.resolve(res);
+ } else {
+ defer.reject(res);
+ }
+
+ return defer;
+};
+
+// 获取路由
+this.ApiGetRouteSync = function(options) {
+
+ const res = {
+ ret: -1
+ };
+
+ return res;
+};
+
+// 上报结果
+this.ApiRouteResultUpdateSync = function(options) {
+
+ const res = {
+ ret: -1
+ };
+
+ return res;
+};
+
+// 多一组方法
+this.updateRoute = this.ApiRouteResultUpdateSync;
+this.getRouteAsync = this.ApiGetRoute;

bin/lib/api/cmdb/index.js

@@ -1,4 +1,4 @@
-/*!
+/* !
  * Tencent is pleased to support the open source community by making Tencent Server Web available.
  * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
@@ -7,6 +7,7 @@
  */
 'use strict';
 
+
 const Deferred = require('util/Deferred');
 
 

bin/lib/api/code/watcher.js

@@ -1,4 +1,4 @@
-/*!
+/* !
  * Tencent is pleased to support the open source community by making Tencent Server Web available.
  * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
@@ -7,7 +7,8 @@
  */
 'use strict';
 
+
 this.watch = function() {
- 
+
 
 };

bin/lib/api/habo/habo.js

@@ -1,4 +1,4 @@
-/*!
+/* !
  * Tencent is pleased to support the open source community by making Tencent Server Web available.
  * Copyright (C) 2018 THL A29 Limited, a Tencent company. All rights reserved.
  * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
@@ -7,6 +7,7 @@
  */
 'use strict';
 
+
 module.exports.report = function(obj, rate) {
 
 };