diff --git a/docs/luban_command_tools.md b/docs/luban_command_tools.md index fa25888..6ab5a30 100644 --- a/docs/luban_command_tools.md +++ b/docs/luban_command_tools.md @@ -11,8 +11,8 @@ Luban工具有两种部属方式。 docker run -d --rm --name luban-server -p 8899:8899 focuscreativegames/luban-server:latest -- 基于 .net 5 runtime (可跨平台,不需要重新编译) - - 自行安装 .net 5 runtime. +- 基于 .net 6 runtime (可跨平台,不需要重新编译) + - 自行安装 .net 6 runtime. - 从[示例项目](https://github.com/focus-creative-games/luban_examples/tree/main/Tools/Luban.Server)拷贝 Luban.Server(**可跨平台,即使在linux、mac平台也不需要重新编译**) - 在Luban.Server目录下运行 dotnet Luban.Server.dll (提示:Win平台可以直接运行 Luban.Server.exe) @@ -22,8 +22,8 @@ Luban工具有两种部属方式。 docker run --rm -v $PWD/.cache.meta:/bin/.cache.meta focuscreativegames/luban-client <参数> 提醒! .cache.meta这个文件用于保存本地生成或者提交到远程的文件md5缓存,**强烈推荐** 添加-v $PWD/.cache.meta:/bin/.cache.meta 映射,不然每次重新计算所有涉及文件的md5,这可能在项目后期会造成多达几秒的延迟。 -- 基于 .net 5 runtime (推荐win平台使用,可跨平台,不需要重新编译) - - 自行安装 .net 5 runtime. +- 基于 .net 6 runtime (推荐win平台使用,可跨平台,不需要重新编译) + - 自行安装 .net 6 runtime. - 从[示例项目](https://github.com/focus-creative-games/luban_examples/tree/main/Tools/Luban.Client)拷贝 Luban.Client(**可跨平台,即使在linux、mac平台也不需要重新编译**) diff --git a/src/Luban.Job.Cfg/Source/.editorconfig b/src/Luban.Job.Cfg/Source/.editorconfig new file mode 100644 index 0000000..456f7a4 --- /dev/null +++ b/src/Luban.Job.Cfg/Source/.editorconfig @@ -0,0 +1,134 @@ +# Rules in this file were initially inferred by Visual Studio IntelliCode from the D:\workspace\luban\src\Luban.Job.Cfg\Source\ codebase based on best match to current usage at 2021/11/10 +# You can modify the rules from these initially generated values to suit your own policies +# You can learn more about editorconfig here: https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference +[*.cs] + + +#Core editorconfig formatting - indentation + +#use soft tabs (spaces) for indentation +indent_style = space + +#Formatting - indentation options + +#csharp_indent_case_contents_when_block +csharp_indent_case_contents_when_block = false + +#Formatting - new line options + +#place catch statements on a new line +csharp_new_line_before_catch = true +#place else statements on a new line +csharp_new_line_before_else = true +#require finally statements to be on a new line after the closing brace +csharp_new_line_before_finally = true +#require members of object initializers to be on the same line +csharp_new_line_before_members_in_object_initializers = false +#require braces to be on a new line for object_collection_array_initializers, control_blocks, properties, lambdas, types, methods, and accessors (also known as "Allman" style) +csharp_new_line_before_open_brace = object_collection_array_initializers, control_blocks, properties, lambdas, types, methods, accessors + +#Formatting - organize using options + +#do not place System.* using directives before other using directives +dotnet_sort_system_directives_first = false + +#Formatting - spacing options + +#require NO space between a cast and the value +csharp_space_after_cast = false +#require a space before the colon for bases or interfaces in a type declaration +csharp_space_after_colon_in_inheritance_clause = true +#require a space after a keyword in a control flow statement such as a for loop +csharp_space_after_keywords_in_control_flow_statements = true +#require a space before the colon for bases or interfaces in a type declaration +csharp_space_before_colon_in_inheritance_clause = true +#remove space within empty argument list parentheses +csharp_space_between_method_call_empty_parameter_list_parentheses = false +#remove space between method call name and opening parenthesis +csharp_space_between_method_call_name_and_opening_parenthesis = false +#do not place space characters after the opening parenthesis and before the closing parenthesis of a method call +csharp_space_between_method_call_parameter_list_parentheses = false +#remove space within empty parameter list parentheses for a method declaration +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +#place a space character after the opening parenthesis and before the closing parenthesis of a method declaration parameter list. +csharp_space_between_method_declaration_parameter_list_parentheses = false + +#Formatting - wrapping options + +#leave code block on single line +csharp_preserve_single_line_blocks = true +#leave statements and member declarations on the same line +csharp_preserve_single_line_statements = true + +#Style - Code block preferences + +#prefer curly braces even for one line of code +csharp_prefer_braces = true:suggestion + +#Style - expression bodied member options + +#prefer expression-bodied members for accessors +csharp_style_expression_bodied_accessors = true:suggestion +#prefer block bodies for constructors +csharp_style_expression_bodied_constructors = false:suggestion +#prefer block bodies for methods +csharp_style_expression_bodied_methods = false:suggestion +#prefer expression-bodied members for properties +csharp_style_expression_bodied_properties = true:suggestion + +#Style - expression level options + +#prefer out variables to be declared inline in the argument list of a method call when possible +csharp_style_inlined_variable_declaration = true:suggestion +#prefer the language keyword for member access expressions, instead of the type name, for types that have a keyword to represent them +dotnet_style_predefined_type_for_member_access = true:suggestion + +#Style - Expression-level preferences + +#prefer objects to be initialized using object initializers when possible +dotnet_style_object_initializer = true:suggestion +#prefer inferred tuple element names +dotnet_style_prefer_inferred_tuple_names = true:suggestion + +#Style - implicit and explicit types + +#prefer var over explicit type in all cases, unless overridden by another code style rule +csharp_style_var_elsewhere = true:suggestion +#prefer explicit type over var to declare variables with built-in system types such as int +csharp_style_var_for_built_in_types = false:suggestion +#prefer var when the type is already mentioned on the right-hand side of a declaration expression +csharp_style_var_when_type_is_apparent = true:suggestion + +#Style - language keyword and framework type options + +#prefer the language keyword for local variables, method parameters, and class members, instead of the type name, for types that have a keyword to represent them +dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion + +#Style - Miscellaneous preferences + +#prefer local functions over anonymous functions +csharp_style_pattern_local_over_anonymous_function = true:suggestion + +#Style - modifier options + +#prefer accessibility modifiers to be declared except for public interface members. This will currently not differ from always and will act as future proofing for if C# adds default interface methods. +dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion + +#Style - Modifier preferences + +#when this rule is set to a list of modifiers, prefer the specified ordering. +csharp_preferred_modifier_order = public,private,internal,static,readonly,async,override,new:suggestion + +#Style - Pattern matching + +#prefer pattern matching instead of is expression with type casts +csharp_style_pattern_matching_over_as_with_null_check = true:suggestion + +#Style - qualification options + +#prefer fields not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_field = false:suggestion +#prefer methods not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_method = false:suggestion +#prefer properties not to be prefaced with this. or Me. in Visual Basic +dotnet_style_qualification_for_property = false:suggestion diff --git a/src/Luban.Job.Cfg/Source/Cache/ExcelTableValueTypeDefInfoCacheManager.cs b/src/Luban.Job.Cfg/Source/Cache/ExcelTableValueTypeDefInfoCacheManager.cs new file mode 100644 index 0000000..ae60e67 --- /dev/null +++ b/src/Luban.Job.Cfg/Source/Cache/ExcelTableValueTypeDefInfoCacheManager.cs @@ -0,0 +1,30 @@ +using Luban.Job.Cfg.DataSources.Excel; +using System.Collections.Concurrent; + +namespace Luban.Job.Cfg.Cache +{ + class ExcelTableValueTypeDefInfoCacheManager + { + private static readonly NLog.Logger s_logger = NLog.LogManager.GetCurrentClassLogger(); + + public static ExcelTableValueTypeDefInfoCacheManager Instance { get; } = new(); + + private readonly ConcurrentDictionary<(string MD5, string Sheet), RawSheetTableDefInfo> _cacheDefs = new(); + + public bool TryGetTableDefInfo(string md5, string sheet, out RawSheetTableDefInfo defInfo) + { + if (_cacheDefs.TryGetValue((md5, sheet), out defInfo)) + { + s_logger.Debug("find RawSheetTableDefInfo in cache. md5:{} sheet:{} def:{@}", md5, sheet, defInfo); + return true; + } + return false; + } + + public void AddTableDefInfoToCache(string md5, string sheet, RawSheetTableDefInfo defInfo) + { + _cacheDefs.TryAdd((md5, sheet), defInfo); + s_logger.Debug("add RawSheetTableDefInfo in cache. md5:{} sheet:{} def:{@}", md5, sheet, defInfo); + } + } +} diff --git a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs index aded09d..4440284 100644 --- a/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs +++ b/src/Luban.Job.Cfg/Source/Defs/CfgDefLoader.cs @@ -1,5 +1,5 @@ -using Bright.Collections; using Luban.Common.Utils; +using Luban.Job.Cfg.Cache; using Luban.Job.Cfg.Datas; using Luban.Job.Cfg.DataSources.Excel; using Luban.Job.Cfg.RawDefs; @@ -7,7 +7,6 @@ using Luban.Job.Cfg.Utils; using Luban.Job.Common.Defs; using Luban.Job.Common.RawDefs; using Luban.Job.Common.Types; -using Luban.Job.Common.Utils; using Luban.Server.Common; using System; using System.Collections.Generic; @@ -288,9 +287,14 @@ namespace Luban.Job.Cfg.Defs { var inputFileInfos = await DataLoaderUtil.CollectInputFilesAsync(this.Agent, table.InputFiles, dataDir); var file = inputFileInfos[0]; - var source = new ExcelDataSource(); - var stream = new MemoryStream(await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5)); - var tableDefInfo = source.LoadTableDefInfo(file.OriginFile, file.SheetName, stream); + RawSheetTableDefInfo tableDefInfo; + if (!ExcelTableValueTypeDefInfoCacheManager.Instance.TryGetTableDefInfo(file.MD5, file.SheetName, out tableDefInfo)) + { + var source = new ExcelDataSource(); + var stream = new MemoryStream(await this.Agent.GetFromCacheOrReadAllBytesAsync(file.ActualFile, file.MD5)); + tableDefInfo = source.LoadTableDefInfo(file.OriginFile, file.SheetName, stream); + ExcelTableValueTypeDefInfoCacheManager.Instance.AddTableDefInfoToCache(file.MD5, file.SheetName, tableDefInfo); + } var cb = new CfgBean() { Namespace = table.Namespace, Name = table.ValueType, Comment = "" }; #if !LUBAN_LITE