Merge pull request #58 from zouchengzhuo/release/2.4

Release/2.4

ChangeList.en.md

+## 20200505(2.4.1)
+- add dcache module to tars web
+
 ## 20200505(2.4.0)
 - fix interface test bug when the server returns result of exception
 - fix protocal parse error when it has some special default value in interface test

ChangeList.zh.md

+## 20200505(2.4.1)
+- 将dcache模块整合到平台代码
+
 ## 20200505(2.4.0)
 - 接口调试被调服务报错时，返回信息异常问题修复
 - 接口调试协议解析，部分默认值解析异常问题修复

LICENSE.md

+# LICENSE
+
+Tencent is pleased to support the open source community by making Tars available.
+
+Copyright \(C\) 2016 THL A29 Limited, a Tencent company. All rights reserved. If you have downloaded a copy of the Tars binary from Tencent, please note that the Tars binary is licensed under the BSD 3-Clause License.
+
+If you have downloaded a copy of the Tars source code from Tencent, please note that Tars source code is licensed under the BSD 3-Clause License, except for the third-party components listed below which are subject to different license terms. Your integration of Tars into your own projects may require compliance with the BSD 3-Clause License, as well as the other licenses applicable to the third-party components included within Tars.
+
+A copy of the BSD 3-Clause License is included in this file.
+
+Other dependencies and licenses:
+
+## Open Source Software Licensed Under the Apache License, Version 2.0:
+
+1. Apache Tomcat 7.0.42 Copyright 1999-2013 The Apache Software Foundation
+2. bootstrap-datepicker 1.7.0 Copyright 2012 Sebastien MALOT
+3. grpc-java Copyright 2015 Google Inc.
+
+## Terms of the Apache License, Version 2.0:
+
+Apache License
+
+Version 2.0, January 2004
+
+[http://www.apache.org/licenses/](http://www.apache.org/licenses/)
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities that control, are controlled by, or are under common control with that entity. For the purposes of this definition, "control" means \(i\) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or \(ii\) ownership of fifty percent \(50%\) or more of the outstanding shares, or \(iii\) beneficial ownership of such entity.
+
+"You" \(or "Your"\) shall mean an individual or Legal Entity exercising permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including but not limited to software source code, documentation source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical transformation or translation of a Source form, including but not limited to compiled object code, generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made available under the License, as indicated by a copyright notice that is included in or attached to the work \(an example is provided in the Appendix below\).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that is based on \(or derived from\) the Work and for which the editorial revisions, annotations, elaborations, or other modifications represent, as a whole, an original work of authorship. For the purposes of this License, Derivative Works shall not include works that remain separable from, or merely link \(or bind by name\) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version of the Work and any modifications or additions to that Work or Derivative Works thereof, that is intentionally submitted to Licensor for inclusion in the Work by the copyright owner or by an individual or Legal Entity authorized to submit on behalf of the copyright owner. For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to the Licensor or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Licensor for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf of whom a Contribution has been received by Licensor and subsequently incorporated within the Work.
+
+1. Grant of Copyright License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare Derivative Works of, publicly display, publicly perform, sublicense, and distribute the Work and such Derivative Works in Source or Object form.
+2. Grant of Patent License. Subject to the terms and conditions of this License, each Contributor hereby grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable \(except as stated in this section\) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by such Contributor that are necessarily infringed by their Contribution\(s\) alone or by combination of their Contribution\(s\) with the Work to which such Contribution\(s\) was submitted. If You institute patent litigation against any entity \(including a cross-claim or counterclaim in a lawsuit\) alleging that the Work or a Contribution incorporated within the Work constitutes direct or contributory patent infringement, then any patent licenses granted to You under this License for that Work shall terminate as of the date such litigation is filed.
+3. Redistribution. You may reproduce and distribute copies of the Work or Derivative Works thereof in any medium, with or without modifications, and in Source or Object form, provided that You meet the following conditions:
+
+a\) You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+b\) You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+c\) You must retain, in the Source form of any Derivative Works that You distribute, all copyright, patent, trademark, and attribution notices from the Source form of the Work, excluding those notices that do not pertain to any part of the Derivative Works; and
+
+d\) If the Work includes a "NOTICE" text file as part of its distribution, then any Derivative Works that You distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or documentation, if provided along with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution notices within Derivative Works that You distribute, alongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.
+
+You may add Your own copyright statement to Your modifications and may provide additional or different license terms and conditions for use, reproduction, or distribution of Your modifications, or for any such Derivative Works as a whole, provided Your use, reproduction, and distribution of the Work otherwise complies with the conditions stated in this License.
+
+1. Submission of Contributions. Unless You explicitly state otherwise, any Contribution intentionally submitted for inclusion in the Work by You to the Licensor shall be under the terms and conditions of this License, without any additional terms or conditions. Notwithstanding the above, nothing herein shall supersede or modify the terms of any separate license agreement you may have executed with Licensor regarding such Contributions.
+2. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor, except as required for reasonable and customary use in describing the origin of the Work and reproducing the content of the NOTICE file.
+3. Disclaimer of Warranty. Unless required by applicable law or agreed to in writing, Licensor provides the Work \(and each Contributor provides its Contributions\) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely responsible for determining the appropriateness of using or redistributing the Work and assume any risks associated with Your exercise of permissions under this License.
+4. Limitation of Liability. In no event and under no legal theory, whether in tort \(including negligence\), contract, or otherwise, unless required by applicable law \(such as deliberate and grossly negligent acts\) or agreed to in writing, shall any Contributor be liable to You for damages, including any direct, indirect, special, incidental, or consequential damages of any character arising as a result of this License or out of the use or inability to use the Work \(including but not limited to damages for loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses\), even if such Contributor has been advised of the possibility of such damages.
+5. Accepting Warranty or Additional Liability. While redistributing the Work or Derivative Works thereof, You may choose to offer, and charge a fee for, acceptance of support, warranty, indemnity, or other liability obligations and/or rights consistent with this License. However, in accepting such obligations, You may act only on Your own behalf and on Your sole responsibility, not on behalf of any other Contributor, and only if You agree to indemnify, defend, and hold each Contributor harmless for any liability incurred by, or claims asserted against, such Contributor by reason of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "\[\]" replaced with your own identifying information. \(Don't include the brackets!\) The text should be enclosed in the appropriate comment syntax for the file format. We also recommend that a file or class name and description of purpose be included on the same "printed page" as the copyright notice for easier identification within third-party archives.
+
+Copyright \[yyyy\] \[name of copyright owner\]
+
+Licensed under the Apache License, Version 2.0 \(the "License"\); you may not use this file except in compliance with the License. You may obtain a copy of the License at [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) 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.
+
+## Open Source Software Licensed Under the Boost Software License, Version 1.0: The below software in this distribution may have been modified by THL A29 Limited \("Tencent Modifications"\). All Tencent Modifications are Copyright \(C\) 2016 THL A29 Limited.
+
+1. Boost 1.53.0:
+
+\(1\) fcontext.hpp Copyright Oliver Kowalke 2009
+
+\(2\) fcontext\_i386.hpp Copyright Oliver Kowalke 2009
+
+\(3\) fcontext\_x86\_64.hpp Copyright Oliver Kowalke 2009
+
+\(4\) jump\_i386\_sysv\_elf\_gas.S Copyright Oliver Kowalke 2009
+
+\(5\) jump\_x86\_64\_sysv\_elf\_gas.S Copyright Oliver Kowalke 2009
+
+\(6\) make\_i386\_sysv\_elf\_gas.S Copyright Oliver Kowalke 2009
+
+\(7\) make\_x86\_64\_sysv\_elf\_gas.S Copyright Oliver Kowalke 2009
+
+\(8\) tuple\_basic.hpp Copyright \(C\) 1999, 2000 Jaakko Jarvi \([jaakko.jarvi@cs.utu.fi](mailto:jaakko.jarvi@cs.utu.fi)\)
+
+## Terms of the Boost Software License, Version 1.0:
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license \(the "Software"\) to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## Open Source Software Licensed Under the MIT License:
+
+1. jquery 1.9.1 Copyright 2012 jQuery Foundation and other contributors [http://jquery.com/](http://jquery.com/)
+2. zTree 3.5.26 copyright \(c\) < hunter.z >
+3. bootstrap 3.3.0 Copyright \(c\) 2011-2014 Twitter, Inc
+4. bootstrap-table 1.11.0 Copyright \(c\) 2012-2016 Zhixin Wen [wenzhixin2010@gmail.com](mailto:wenzhixin2010@gmail.com)
+5. Chart.js Copyright \(c\) 2013-2016 Nick Downie
+6. mkdirp 0.5.0 Copyright 2010 James Halliday \([mail@substack.net](mailto:mail@substack.net)\)
+
+The below software \(7&8\) in this distribution may have been modified by THL A29 Limited \("Tencent Modifications"\). All Tencent Modifications are Copyright \(C\) 2016 THL A29 Limited.
+
+1. loki 0.1.7 Copyright \(c\) Andrei Alexandrescu, Jean-Francois Bastien, Guillaume Chatelet, Lukas Fittl, Fedor Pikus, Peter Kümmel, Rich Sposato
+2. smhasher 0.150.1 Copyright \(c\) 2011 Austin Appleby \(Murmur3 routine\) Copyright \(c\) 2011 Patrick Hensley \(Python wrapper, packaging\)
+
+## Terms of the MIT License:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files \(the "Software"\), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Open Source Software Licensed Under the BSD 3-Clause License:
+
+## The below software in this distribution may have been modified by THL A29 Limited \("Tencent Modifications"\). All Tencent Modifications are Copyright \(C\) 2016 THL A29 Limited.
+
+1. gperftools 2.0 Copyright \(c\) 2005, Google Inc. All rights reserved.
+2. Chrominum 56.0.2884.2
+
+\(1\) bind.h Copyright \(c\) 2011 The Chromium Authors. All rights reserved.
+
+\(2\) bind\_internal.h Copyright \(c\) 2011 The Chromium Authors. All rights reserved.
+
+\(3\) callback.h Copyright \(c\) 2012 The Chromium Authors. All rights reserved.
+
+\(4\) callback\_internal.h Copyright \(c\) 2012 The Chromium Authors. All rights reserved.
+
+\(5\) callback\_internal.cc Copyright \(c\) 2012 The Chromium Authors. All rights reserved.
+
+## Terms of the BSD 3-Clause License:
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+* Neither the name of \[copyright holder\] nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES \(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION\) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT \(INCLUDING NEGLIGENCE OR OTHERWISE\) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+

app.js

@@ -111,23 +111,25 @@ app.use(staticRouter([
     router: '/files'    //路由命名
 }]));
 
-let dcacheConf = require('./config/dcacheConf.js');
-if (dcacheConf.enableDcache) {
-	app.use(async (ctx, next) => {
-		await next();
-		ctx.cookies.set('dcache', 'true', {httpOnly: false});
-	});
-	//  tars-dcache 的包，依赖了很多tars的模块，引用路径是从根目录开始的，防止引用出错，先改后更
-	let cwd = process.cwd();
-	process.chdir(path.join(__dirname, './'));
-	let tarsDcache = require('@tars/dcache');
-	process.chdir(cwd);
-} else {
-	app.use(async (ctx, next) => {
-		await next();
-		ctx.cookies.set('dcache', 'false', {httpOnly: false});
-	})
-}
+require('./dcache');
+
+// let dcacheConf = require('./config/dcacheConf.js');
+// if (dcacheConf.enableDcache) {
+// 	app.use(async (ctx, next) => {
+// 		await next();
+// 		ctx.cookies.set('dcache', 'true', {httpOnly: false});
+// 	});
+// 	//  tars-dcache 的包，依赖了很多tars的模块，引用路径是从根目录开始的，防止引用出错，先改后更
+// 	let cwd = process.cwd();
+// 	process.chdir(path.join(__dirname, './'));
+// 	let tarsDcache = require('@tars/dcache');
+// 	process.chdir(cwd);
+// } else {
+// 	app.use(async (ctx, next) => {
+// 		await next();
+// 		ctx.cookies.set('dcache', 'false', {httpOnly: false});
+// 	})
+// }
 
 //激活router
 // dcache 会添加新的 page、api router， 不能提前

app/controller/patch/PatchController.js

@@ -114,6 +114,9 @@ PatchController.uploadAndPublish = async (ctx) => {
 PatchController.uploadPatchPackage = async (ctx) => {
 	try {
 		let {application, module_name, md5, task_id, comment, package_type} = ctx.req.body;
+
+		package_type = package_type || 0;
+
 		if (!await AuthService.hasDevAuth(application, module_name, ctx.uid)) {
 			ctx.makeNotAuthResObj();
 		} else {
@@ -125,7 +128,7 @@ PatchController.uploadPatchPackage = async (ctx) => {
 			let baseUploadPath = WebConf.pkgUploadPath.path;
 			// 发布包上传目录
 			let updateTgzPath = `${baseUploadPath}/${application}/${module_name}`;
-			console.info('updateTgzPath:', updateTgzPath);
+			// console.info('updateTgzPath:', updateTgzPath);
 			await fs.ensureDirSync(updateTgzPath);
 			let hash = md5Sum(`${baseUploadPath}/${file.filename}`);
 			if (md5 && md5 != hash) {
@@ -151,13 +154,31 @@ PatchController.uploadPatchPackage = async (ctx) => {
 				logger.error('[CompileService.addPatchTask]:', err);
 			});
 
-			ctx.makeResObj(200, '', util.viewFilter(ret, {
+			let data = util.viewFilter(ret, {
 				id: '',
 				server: '',
 				tgz: '',
-				update_text: {key: 'comment'},
-				posttime: {formatter: util.formatTimeStamp}
-			}));
+				update_text: { key: 'comment' },
+				posttime: { formatter: util.formatTimeStamp }
+			});
+
+			let id = data.id;
+			let package = { id, application, module_name, package_type };
+
+			let value = await PatchService.find({
+				where: {
+					server: application + "." + module_name,
+					default_version: 1,
+					package_type: 0
+				}
+			});
+
+			if (!value) {
+				//如果是第一条记录, 则设置为default
+				await PatchService.setPatchPackageDefault(package);
+			}
+
+			ctx.makeResObj(200, '', data);
 		}
 	} catch (e) {
 		logger.error('[PatchController.uploadPatchPackage]:', e, ctx);
@@ -321,12 +342,12 @@ PatchController.setPatchPackageDefault = async (ctx) => {
 	}
 };
 
-PatchController.hasDcahcePatchPackage = async (ctx) => {
+PatchController.hasDcachePatchPackage = async (ctx) => {
 	try {
-		let ret = await PatchService.hasDcahcePatchPackage();
+		let ret = await PatchService.hasDcachePatchPackage();
 		ctx.makeResObj(200, '', ret);
 	} catch (e) {
-		logger.error('[PatchController.hasDcahcePatchPackage]:', e, ctx);
+		logger.error('[PatchController.hasDcachePatchPackage]:', e, ctx);
 		ctx.makeErrResObj(500, e.toString());
 	}
 };

app/router/routerConf.js

@@ -165,7 +165,7 @@ const apiConf = [
     ['get', '/get_compile_conf', PatchController.getCompilerConf],
     ['post', '/delete_patch_package', PatchController.deletePatchPackage],
     ['post', '/set_patch_package_default', PatchController.setPatchPackageDefault],
-    ['get', '/has_dcahce_patch_package', PatchController.hasDcahcePatchPackage],
+    ['get', '/has_dcache_patch_package', PatchController.hasDcachePatchPackage],
 
     // 监控
     ['get', '/tarsstat_monitor_data', MonitorController.tarsstat],

app/service/patch/PatchService.js

@@ -38,7 +38,7 @@ PatchService.find = async ({where}) => {
 	return await PatchDao.find(where)
 };
 
-PatchService.hasDcahcePatchPackage = async () => {
+PatchService.hasDcachePatchPackage = async () => {
 	let has = true;
 	let proxyDefaultPackage = await PatchDao.find({
 		server: 'DCache.RouterServer',

client/dist/css/chunk-common.30dd79ac.css

-.let-form__inline .let-form-item{padding-left:0!important;margin-right:32px;vertical-align:bottom}.let-form__inline .let-label__position_top{padding-right:0;width:100%}.let-form .let-input{width:100%}.let_modal{position:fixed!important}.let-loading .loading-inner{background:rgba(0,0,0,.9);padding:13px}.let-input_small input{font-size:12px;padding-left:8px;padding-right:8px}.let-select_small .let-select__selection{padding-left:8px}.let-select_small .let-select__text_single{margin-left:0}.let-select_small .let-select__option{padding-left:8px;padding-right:8px}.let-radio+.let-radio{margin-left:12px}.let-date-picker{width:100%}.let-table td:last-child.right,.let-table th:last-child.right{padding-right:15px}.let-table tr th .sortContainer{position:relative}.let-table tr th .sortContainer .let-icon-caret-down{left:0}.icon{fill:currentcolor;height:1em;vertical-align:-.25ex;width:1em}.tars-form-item .clickable{color:#3f5ae0}.app_index__footer{height:48px;background:#f0f2f5;color:#a2a9b8;font-size:12px;line-height:48px;text-align:center}.page_server_manage .tbm16{margin:16px 0}.page_server_manage .danger{color:#e0543f}.page_server_manage .icon.iconfont{font-size:10px;cursor:pointer;vertical-align:0}.page_server_manage .more-cmd .let-form-item__content{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.page_server_manage .more-cmd span.let-radio{margin-right:5px}.page_server_manage .more-cmd label.let-radio{width:200px}.section[data-v-2643216f]{margin-bottom:32px;position:relative}.hours-filter{overflow:hidden}.hours-filter h4{color:#9096a3;font-weight:700;margin-bottom:12px}.hours-filter ul{margin-bottom:-8px;overflow:hidden}.hours-filter li{border:1px solid #c0c4cc;border-radius:14px;color:#454e66;cursor:pointer;float:left;font-size:12px;line-height:26px;margin-bottom:8px;margin-right:8px;min-width:39px;padding:0 11px;text-align:center}.hours-filter li.active{border-color:#3f5ae0;color:#3f5ae0}.hours-filter li:last-child{margin-right:0}.page_server_config .add-btn{position:absolute;right:0;top:0;z-index:2}.page_server_config .check-all{position:absolute;z-index:2;top:60px;left:16px}.page_server_config .let-table caption{padding-bottom:16px}.page_server_config .danger{color:#e0543f}.page_server_config .success{color:#49cc8f}.page_server_config .result{display:inline-block;max-width:420px;word-break:break-word;padding-right:10px}.page_server_config pre{color:#909fa3;margin-top:32px}.page_server_config .detail-loading{height:28px}.page_server_config .detail-loading:only-child{margin:20px 0}.page_server_config .history-table{margin-top:20px}.page_server_config .let-checkbox{vertical-align:baseline;vertical-align:initial}.compare-chart{position:relative}.compare-chart-zoom-in{color:inherit;cursor:pointer;font-size:16px;position:absolute;right:35px;top:5px}.compare-chart .let_modal__dialog{max-width:1200px}.btn-link{color:#3f5ae0;cursor:pointer}.page_server_property_monitor{padding-bottom:20px}.page_server_property_monitor .chart{margin-top:20px}.page_server_property_monitor .hours-filter{margin-bottom:16px}.page_server_server_monitor{padding-bottom:20px}.page_server_server_monitor .charts{margin-top:20px}.page_server_server_monitor .hours-filter{margin-bottom:16px}.page_server_debuger .add-btn{position:absolute;right:0;top:0;z-index:2}.page_server_debuger .mt10{margin-top:10px}.page_server_debuger .param_area textarea{border:none!important}.page_server_debuger .params_container{border:1px solid #c0c4cc;overflow:hidden;border-radius:5px}.page_server_debuger .div_line{border-right:1px solid #e4e9f2}.page_server_debuger .left_align{margin-left:-15px}
\ No newline at end of file

client/dist/css/index.bbc20e8e.css

+.app_index__header{height:80px;border-bottom:1px solid #ebecee}.app_index__header .main-width{position:relative}.app_index__header .tabs .let-tabs__header{border-bottom:none}.app_index__header .language-wrap,.app_index__header .logo-wrap,.app_index__header .user-wrap{position:absolute;top:0;height:80px;width:300px;padding:26px 24px}.app_index__header .logo-wrap{left:0;width:auto;z-index:100;padding:0}.app_index__header .logo-wrap a{display:inline-block;height:80px;padding:30px 20px 0;position:relative}.app_index__header .logo-wrap a.active:after{content:"";display:inline-block;height:3px;width:100%;background:#457ff5;position:absolute;top:76px;left:0}.app_index__header .logo-wrap a .logo{height:25px}.app_index__header .logo-wrap .logo{height:28px}.app_index__header .language-wrap{right:150px;width:150px;padding-top:20px}.app_index__header .user-wrap{right:0;width:150px;text-align:right}.app_index__header .user-wrap .user-info{max-width:100%;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;height:28px;cursor:pointer}.app_index__header .user-wrap .user-info .avatar{height:100%;border-radius:50%}.app_index__header .user-wrap .user-info .name{margin:0 8px}.app_index__header .user-wrap .user-info .let-icon-caret-down{position:relative;right:auto;top:auto;padding-left:0;margin-top:0}.app_index__header .user-pop-wrap{position:absolute;right:20px;top:55px;border:1px solid #d7dae0;border-radius:4px;padding:10px;background:#fff;font-size:12px}.app_index__header .fade-enter-active,.app_index__header .fade-leave-active{-webkit-transition:opacity .4s;-o-transition:opacity .4s;transition:opacity .4s}.app_index__header .fade-enter,.app_index__header .fade-leave-to{opacity:0}@font-face{font-family:Lato;src:url(../fonts/Lato-Bold.ea73404b.eot);src:url(../fonts/Lato-Bold.ea73404b.eot?#font-spider) format("embedded-opentype"),url(../fonts/Lato-Bold.1870e9ce.woff2) format("woff2"),url(../fonts/Lato-Bold.530a2a80.woff) format("woff"),url(../fonts/Lato-Bold.624f2afd.ttf) format("truetype"),url(../img/Lato-Bold.70b17765.svg) format("svg");font-weight:700;font-style:normal}@font-face{font-family:Lato;src:url(../fonts/Lato-Regular.e0edef6e.eot);src:url(../fonts/Lato-Regular.e0edef6e.eot?#font-spider) format("embedded-opentype"),url(../fonts/Lato-Regular.6d8f7994.woff2) format("woff2"),url(../fonts/Lato-Regular.9966cbef.woff) format("woff"),url(../fonts/Lato-Regular.252959f2.ttf) format("truetype"),url(../img/Lato-Regular.cd5ac823.svg) format("svg");font-weight:400;font-style:normal}@font-face{font-family:Lato;src:url(../fonts/Lato-Light.d10a5f20.eot);src:url(../fonts/Lato-Light.d10a5f20.eot?#font-spider) format("embedded-opentype"),url(../fonts/Lato-Light.502bf4a6.woff2) format("woff2"),url(../fonts/Lato-Light.493f85b4.woff) format("woff"),url(../fonts/Lato-Light.a3eaa387.ttf) format("truetype"),url(../img/Lato-Light.f5206f13.svg) format("svg");font-weight:300;font-style:normal}*,:after,:before{box-sizing:border-box}a,blockquote,body,dd,div,dl,dt,fieldset,form,h1,h2,h3,h4,h5,h6,input,li,ol,p,pre,td,textarea,th,ul{margin:0;outline:none;padding:0}h1,h2,h3,h4,h5,h6{font-size:14px}li,ol,ul{list-style:none outside none}table{border-spacing:0;border-collapse:collapse}p,td,th{word-break:break-all}fieldset,img{border:0 none}input::-moz-focus-inner{border:none;padding:0}a{outline:none}a,a:hover{text-decoration:none}a img{border:none}img{display:inline-block;max-width:100%;vertical-align:middle}textarea{outline:none;resize:none}button,input{border:none;outline:none}input::-ms-clear{display:none}label{cursor:pointer}cite,em,i{font-style:normal}::-webkit-input-placeholder{color:#ccc;font-weight:400}::-moz-placeholder{color:#ccc;font-weight:400}::placeholder{color:#ccc;font-weight:400}:-ms-input-placeholder{color:#ccc!important;font-weight:400!important}::-webkit-scrollbar{background:#ccc;border-radius:0;height:6px;position:absolute;width:6px}::-webkit-scrollbar-thumb{background:#999;border-radius:3px}body,html{height:100%}body{color:#565b66;font-family:Lato,PingFangSC-Regular,HelveticaNeue-Light,Helvetica Neue Light,Microsoft YaHei,sans-serif;-webkit-font-smoothing:antialiased;-moz-font-smoothing:antialiased;text-align:left}#web_version{position:absolute;top:10px;right:10px;color:#888;font-size:12px}.clearfix{*zoom:1}.clearfix :after,.clearfix :before{display:table;content:" "}.clearfix :after{clear:both}.toe{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.disabled{opacity:.65;pointer-events:none}.hidden{display:none}.main-width{margin:0 auto;max-width:1440px;padding:0 24px}#app{position:relative;padding-bottom:48px;min-height:100%;font-size:14px}.app_index__footer{position:absolute;bottom:0;left:0;width:100%}.let-dialog .let-dialog__foot .let-align__inner{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-webkit-flex-direction:row-reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center}.let-dialog .let-dialog__foot .let-align__inner .let-button:first-child{margin-right:0;margin-left:16px}.page_server{padding-bottom:40px;padding-top:40px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.page_server .left-tree{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;width:152px;min-height:380px}.page_server .left-tree .loading{display:block;text-align:center;margin:180px auto 0}.page_server .left-tree .let-icon-caret-right-small{margin-right:2px;margin-left:4px}.page_server .left-tree ul.let-tree__node{font-size:14px;line-height:24px;margin-left:10px}.page_server .left-tree ul.let-tree__node li{text-overflow:ellipsis;overflow:hidden}.page_server .left-tree>ul.let-tree__node{font-size:16px;margin-bottom:24px;margin-left:0}.page_server .left-tree>ul.let-tree__node>li>ul.let-tree__node{margin-left:0}.page_server .left-tree>ul.let-tree__node>li>ul.let-tree__node li .pointer:first-of-type{margin-left:3px}.page_server .left-tree>ul.let-tree__node>li>ul.let-tree__node li .pointer:first-of-type:empty{margin-left:26px}.page_server .left-tree .tree-icon{width:16px;height:16px;background-repeat:no-repeat;background-position:50%;background-size:100%;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAMAAABF0y+mAAAAkFBMVEUAAACasuCbs+NYXGhhZXBWXGaEpOZGgPZGgPVGgPZGgPZGgfdGgfdHgPZKgP9VgP9Zi/FUXnFWivFUYX+DpOZVXWlUiPJRZpFmbXpRhvJPa6RpbndNhPNMcLmAo+eZseBFf/X///9WW2b39/itsLXs7O1HfOfW19pJeNeNkJi9v8NLcsKlqK5Nba1QaJl1eYI9kzr2AAAAH3RSTlMAwEBA/sD++efJpH9bNhgG/fnx8e3t6Ojm39/Y1tbVyF3SDAAAAKdJREFUKM/NzEkWgjAURNGoKD3Y90pIRLHf/+78RxLLQHDsm95Txb5KI9+PUmYrCT1OeWHSoDhwucoN4tofN1Lv+EOfd/whvC93vKXtngkxWx8ttJpmGSG1KGs0H2QU4elMPLlyNCZSmOfFzRFidFfvQyIgJS9Pmj9KTcCq9zsIWFUIAQCq/gTlL3QOsg17fbCJnS5jmoEgBgaCwBpBYApkYVCTNya9AH72SFhYMf7uAAAAAElFTkSuQmCC);margin-right:4px;margin-left:0;vertical-align:middle}.page_server .left-tree .tree-icon.down{-webkit-transform:rotate(0);-ms-transform:rotate(0);-o-transform:rotate(0);transform:rotate(0)}.page_server .left-tree .tree-icon:before{content:""}.page_server .right-view{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1;margin-left:40px;margin-top:-10px}.page_server .right-view .empty{margin:88px 0 0 calc(50% - 228px);width:240px;text-align:center}.page_server .right-view .empty .package{width:180px;height:114px;margin-bottom:24px}.page_server .right-view .empty .title{font-size:18px;font-weight:700;margin-bottom:12px}.page_server .right-view .empty .notice{line-height:22px;color:#a2a9b8}.page_server .page_server_child{margin-top:20px;position:relative}.page_server .loading-placeholder{min-height:80px;text-align:center;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.page_server .let_modal .let-loading__parent-relative .let-align__inner{padding-top:0}.page_server .let-form.two-columns.let-form-cols-2{margin-right:-30px}.page_server .let-form.two-columns.let-form-cols-2 .let-form-item{padding-right:30px}.page_server .let-table__operation{padding-left:0;padding-right:0;margin-right:10px}.page_server .let-table__operation:last-of-type{margin-right:0}.page_server .status-activating,.page_server .status-active,.page_server .status-off{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center}.page_server .status-activating:before,.page_server .status-active:before,.page_server .status-off:before{content:"";display:inline-block;width:4px;height:4px;border-radius:50%;background:currentColor;margin-right:4px}.page_server .status-activating:after,.page_server .status-active:after,.page_server .status-off:after{display:inline-block}.page_server .status-active{color:#49cc8f}.page_server .status-active:after{content:"Active"}.page_server .status-off{color:#e0543f}.page_server .status-off:after{content:"Off"}.page_server .status-activating{color:#e0543f}.page_server .status-activating:after{content:"Activating"}.page_server_publish{padding-bottom:32px}.page_server_publish .running{color:#3f5ae0}.page_server_publish .success{color:#6accab}.page_server_publish .stop{color:#f56c77}.page_operation{padding-top:30px;padding-bottom:40px}.page_operation_children{padding:20px 0}.set_inputer _item{float:left;margin-right:8px;width:126px}.set_inputer _switch{float:right}.page_operation_deploy .let-table{margin:20px 0 36px}.page_operation_deploy .let-table th span.required{display:inline-block}.page_operation_deploy .let-table th span.required:after{color:#f56c6c;content:"*";margin-left:4px}.page_operation_deploy .let-table tr.err-row td{background:#f56c77!important;color:#fff}.page_operation_deploy .result-text{margin-top:20px;margin-bottom:10px}.page_operation_deploy .set_inputer_item{float:left;margin-right:8px;width:126px}.page_operation_expand .mt40{margin-top:40px}.page_operation_expand tr.err-row td{background:#f56c77!important;color:#fff}.page_operation_expand .let-table{margin:20px 0 36px}.page_operation_expand .let-table th span.required{display:inline-block}.page_operation_expand .let-table th span.required:after{color:#f56c6c;content:"*";margin-left:4px}.page_operation_expand .let-table tr.err-row td{background:#f56c77!important;color:#fff}.page_operation_expand .result-text{margin-top:20px;margin-bottom:10px}.page_operation_expand .set_inputer_item{float:left;margin-right:8px;width:126px}.page_operation_templates pre{color:#909fa3;margin-top:32px}.page_operation_templates .let_modal__body{overflow-y:visible}.page_operation_templates pre[data-v-1f72dbe9]{color:#909fa3;margin-top:32px}.install_step[data-v-1f72dbe9]{margin:10px}.success_txt[data-v-1f72dbe9]{color:#6accab}.fail_txt[data-v-1f72dbe9]{color:#f56c77}.let-table tr.red-row td[data-v-1f72dbe9]{background:#f56c77!important;color:#fff}.active[data-v-1f72dbe9]:before,.inactive[data-v-1f72dbe9]:before{content:" ";display:inline-block;width:7px;height:7px;border-radius:100%;margin-right:5px}.active[data-v-1f72dbe9]{color:green}.active[data-v-1f72dbe9]:before{background:green}.inactive[data-v-1f72dbe9]{color:red}.inactive[data-v-1f72dbe9]:before{background:red}.stdout[data-v-1f72dbe9]{width:650px;white-space:pre-wrap;word-wrap:break-word}.page_operation_templates pre[data-v-760eda4b]{color:#909fa3;margin-top:32px}.let-table tr.checking-row td[data-v-760eda4b]{background:#deb887!important;color:#fff}.let-table tr.warning-row td[data-v-760eda4b]{background:#f56c77!important;color:#fff}.let-table tr.success-row td[data-v-760eda4b]{background:#6accab!important;color:#fff}.let-table tr.checking-row td .let-table__operation[data-v-760eda4b],.let-table tr.success-row td .let-table__operation[data-v-760eda4b],.let-table tr.warning-row td .let-table__operation[data-v-760eda4b]{color:#fff}.checking-row .status[data-v-760eda4b]:before,.success-row .status[data-v-760eda4b]:before,.warning-row .status[data-v-760eda4b]:before{content:" ";display:inline-block;width:7px;height:7px;border-radius:100%;margin-right:5px}.success-row .status[data-v-760eda4b]{color:green}.success-row .status[data-v-760eda4b]:before{background:green}.warning-row .status[data-v-760eda4b]{color:red}.warning-row .status[data-v-760eda4b]:before{background:red}.checking-row .status[data-v-760eda4b]{color:orange}.checking-row .status[data-v-760eda4b]:before{background:orange}
\ No newline at end of file

client/dist/dcache.html

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>DCache</title><link href=/css/chunk-common.30dd79ac.css rel=preload as=style><link href=/css/chunk-vendors.4fa751bd.css rel=preload as=style><link href=/css/dcache.5a9fded0.css rel=preload as=style><link href=/js/chunk-common.3389006a.js rel=preload as=script><link href=/js/chunk-vendors.61dbaa03.js rel=preload as=script><link href=/js/dcache.6592e8cb.js rel=preload as=script><link href=/css/chunk-vendors.4fa751bd.css rel=stylesheet><link href=/css/chunk-common.30dd79ac.css rel=stylesheet><link href=/css/dcache.5a9fded0.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.61dbaa03.js></script><script src=/js/chunk-common.3389006a.js></script><script src=/js/dcache.6592e8cb.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>DCache</title><link href=/css/chunk-common.90ae73d5.css rel=preload as=style><link href=/css/chunk-vendors.4fa751bd.css rel=preload as=style><link href=/css/dcache.5a9fded0.css rel=preload as=style><link href=/js/chunk-common.07dab340.js rel=preload as=script><link href=/js/chunk-vendors.61dbaa03.js rel=preload as=script><link href=/js/dcache.99be8f3b.js rel=preload as=script><link href=/css/chunk-vendors.4fa751bd.css rel=stylesheet><link href=/css/chunk-common.90ae73d5.css rel=stylesheet><link href=/css/dcache.5a9fded0.css rel=stylesheet></head><body><noscript><strong>We're sorry but DCache doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.61dbaa03.js></script><script src=/js/chunk-common.07dab340.js></script><script src=/js/dcache.99be8f3b.js></script></body></html>
\ No newline at end of file

client/dist/index.html

-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsNodeWeb</title><link href=/css/chunk-common.30dd79ac.css rel=preload as=style><link href=/css/chunk-vendors.4fa751bd.css rel=preload as=style><link href=/css/index.82a46ccd.css rel=preload as=style><link href=/js/chunk-common.3389006a.js rel=preload as=script><link href=/js/chunk-vendors.61dbaa03.js rel=preload as=script><link href=/js/index.04415f5d.js rel=preload as=script><link href=/css/chunk-vendors.4fa751bd.css rel=stylesheet><link href=/css/chunk-common.30dd79ac.css rel=stylesheet><link href=/css/index.82a46ccd.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsNodeWeb doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.61dbaa03.js></script><script src=/js/chunk-common.3389006a.js></script><script src=/js/index.04415f5d.js></script></body></html>
\ No newline at end of file
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1"><link rel=icon href=/static/favicon.ico><title>TarsNodeWeb</title><link href=/css/chunk-common.90ae73d5.css rel=preload as=style><link href=/css/chunk-vendors.4fa751bd.css rel=preload as=style><link href=/css/index.bbc20e8e.css rel=preload as=style><link href=/js/chunk-common.07dab340.js rel=preload as=script><link href=/js/chunk-vendors.61dbaa03.js rel=preload as=script><link href=/js/index.4aff4a15.js rel=preload as=script><link href=/css/chunk-vendors.4fa751bd.css rel=stylesheet><link href=/css/chunk-common.90ae73d5.css rel=stylesheet><link href=/css/index.bbc20e8e.css rel=stylesheet></head><body><noscript><strong>We're sorry but TarsNodeWeb doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.61dbaa03.js></script><script src=/js/chunk-common.07dab340.js></script><script src=/js/index.4aff4a15.js></script></body></html>
\ No newline at end of file

client/src/dcache.js

@@ -23,6 +23,7 @@ import App from './dcacheApp';
 import router from './router/dcache';
 import {i18n, loadLang} from './locale/i18n'
 
+import './assets/icon-font/iconfont.css'
 
 Vue.config.productionTip = false;
 

client/src/pages/dcache/moduleManage/batchPublish.vue

@@ -131,7 +131,7 @@
             },
           });
         });
-        console.log(items);
+        // console.log(items);
 
         const releaseId = await addTask({ items });
         this.releaseIng = true;