Merge remote-tracking branch 'origin/master' into master

src/dataType/utString.erl

@@ -9,29 +9,51 @@
 	, isAlpha/1
 ]).
 
-toLowerStr(List) when is_list(List) ->
-	[begin
-		 case C >= $A andalso C =< $Z of
-			 true ->
-				 C + 32;
-			 _ ->
-				 C
-		 end
-	 end || C <- List];
-toLowerStr(Bin) when is_binary(Bin) ->
-	toLowerStr(utTypeCast:toList(Bin)).
-
-toUpperStr(List) when is_list(List) ->
-	[begin
-		 case C >= $a andalso C =< $z of
-			 true ->
-				 C - 32;
-			 _ ->
-				 C
-		 end
-	 end || C <- List];
-toUpperStr(Bin) when is_binary(Bin) ->
-	toUpperStr(utTypeCast:toList(Bin)).
+toLowerStr(ListStr) when is_list(ListStr) ->
+	[
+		begin
+			case C >= $A andalso C =< $Z of
+				true ->
+					C + 32;
+				_ ->
+					C
+			end
+		end || C <- ListStr
+	];
+toLowerStr(BinStr) when is_binary(BinStr) ->
+	<<
+		begin
+			case C >= $A andalso C =< $Z of
+				true ->
+					<<(C + 32)>>;
+				_ ->
+					<<C>>
+			end
+		end || <<C:8>> <= BinStr
+	>>.
+
+toUpperStr(ListStr) when is_list(ListStr) ->
+	[
+		begin
+			case C >= $a andalso C =< $z of
+				true ->
+					C - 32;
+				_ ->
+					C
+			end
+		end || C <- ListStr
+	];
+toUpperStr(BinStr) when is_binary(BinStr) ->
+	<<
+		begin
+			case C >= $a andalso C =< $z of
+				true ->
+					<<(C - 32)>>;
+				_ ->
+					<<C>>
+			end
+		end || <<C:8>> <= BinStr
+	>>.
 
 -spec isAlpha(Char :: char()) -> boolean().
 isAlpha(Char) ->
@@ -47,22 +69,20 @@ isAlphaNum(Char) ->
 	isAlpha(Char) orelse isNum(Char).
 
 %% 字符加密
-check_char_encrypt(Id, Time, TK) ->
+checkEncrypt(Id, Time, TK) ->
 	TICKET = "7YnELt8MmA4jVED7",
 	Hex = utMd5:getMd5HexBin(lists:concat([Time, Id, TICKET])),
-	%NowTime = time:unixtime(),
-	%Hex =:= TK andalso NowTime - Time >= -10 andalso NowTime - Time < 300.
-	Hex =:= TK.
-
+	NowTime = utTime:now(),
+	Hex =:= TK andalso NowTime - Time >= -10 andalso NowTime - Time < 300.
 
 %% Function: 检查客户端发过来的内容,false为不合法,true为合法
-%% @param: String: 客户端发来的字符串
+%% @param: String: 客户端发来的字符串 格式为binary
 %% @param: Length: 服务端限制的字符串长度
-check_string(String, Length) ->
-	case check_length(String, Length) of
+checkValid(BinStr, Length) ->
+	case checkLen(BinStr, Length) of
 		true ->
-			not check_keyword(String, ["'", "/", "\"", "_", "<", ">"]);
-		false ->
+			not checkKeyword(BinStr, ["'", "/", "\"", "_", "<", ">"]);
+		_ ->
 			false
 	end.
 
@@ -70,21 +90,21 @@ check_string(String, Length) ->
 %% @spec check_keyword(Text, Words) -> false | true
 %% @param Text : 需要检查的字符串（或字符串的二进制形式）
 %% @param Words: 非法字符列表
-check_keyword(_, []) ->
+checkKeyword(_, []) ->
 	false;
-check_keyword(Text, [Word | Words]) ->
+checkKeyword(Text, [Word | Words]) ->
 	case re:run(Text, Word, [{capture, none}]) of
-		match ->
-			true;
 		nomatch ->
-			check_keyword(Text, Words)
+			checkKeyword(Text, Words);
+		_ ->
+			true
 	end.
 
 %% 长度合法性检查
-check_length(Item, LenLimit) ->
-	check_length(Item, 1, LenLimit).
+checkLen(BinStr, LenLimit) ->
+	checkLen(BinStr, 1, LenLimit).
 
-check_length(Item, MinLen, MaxLen) ->
+checkLen(BinStr, MinLen, MaxLen) ->
 	% case asn1rt:utf8_binary_to_list(list_to_binary(Item)) of
 	%     {ok, UnicodeList} ->
 	%         Len = string_width(UnicodeList),
@@ -92,7 +112,8 @@ check_length(Item, MinLen, MaxLen) ->
 	%     {error, _Reason} ->
 	%         false
 	% end.
-	case unicode:characters_to_list(list_to_binary(Item)) of
+	% case unicode:characters_to_list(list_to_binary(BinStr)) of
+	case unicode:characters_to_list(BinStr) of
 		UnicodeList when is_list(UnicodeList) ->
 			Len = string_width(UnicodeList),
 			Len =< MaxLen andalso Len >= MinLen;
@@ -146,16 +167,16 @@ listToUtfString(List) ->
 %% desc   获取字符串汉字和非汉字的个数
 %% parm   UTF8String  			UTF8编码的字符串
 %% return {汉字个数,非汉字个数}
-getChineseNum(UTF8String) ->
+getChineseCnt(UTF8String) ->
 	UnicodeList = unicode:characters_to_list(list_to_binary(UTF8String)),
-	Fun = fun(Num, {Sum}) ->
+	Fun = fun(Num, Sum) ->
 		case Num >= ?UNICODE_CHINESE_BEGIN andalso Num =< ?UNICODE_CHINESE_END of
 			true ->
-				{Sum + 1};
+				Sum + 1;
 			false ->
-				{Sum}
+				Sum
 		end
 			end,
-	{ChineseCount} = lists:foldl(Fun, {0}, UnicodeList),
+	ChineseCount = lists:foldl(Fun, 0, UnicodeList),
 	OtherCount = length(UnicodeList) - ChineseCount,
 	{ChineseCount, OtherCount}.

src/docs/rebar3使用.md

@@ -0,0 +1,83 @@
+# 安装
+    1)[直接下载](https://s3.amazonaws.com/rebar3/rebar3) 
+        安装到本地 ./rebar3 local install
+        升级版本   rebar3 local upgrade
+    2)源码安装
+        $ git clone https://github.com/erlang/rebar3.git
+        $ cd rebar3
+        $ ./bootstrap
+        $ ./rebar3 local install
+
+# 使用rebar3创建新的项目
+    使用rebar3组织项目主要有两种方式：
+    1) 作为单个应用程序
+        单个应用程序项目在目录的根目录中包含一个单独的顶级应用程序，其Erlang源模块直接位于src/目录中。
+    2)作为伞行项目
+        伞项目的定义特征是它们可以包含多个顶层的Erlang / OTP应用中，通常内的顶层apps/或lib/目录。这些应用程序中的每一个都可能包含其自己的rebar.config文件。此格式仅适用于具有一个或多个顶级应用程序的发行版。
+
+    Rebar3带有用于创建这两种类型的项目的模板，可通过rebar3 new <template> <project-name>命令进行调用。该<template>值可以是以下任意值：
+        app：带有监控树的有状态OTP应用程序，作为单个应用程序项目
+        lib：一个库OTP应用程序（无监督树），对于将各个模块组合在一起作为单个应用程序项目很有用
+        release：准备发布的伞项目
+        escript：单个应用程序项目的一种特殊形式，可以将其构建为可运行的脚本
+        plugin：rebar3插件的结构。
+
+# 添加依赖
+    依赖格式
+        {deps,[
+        %% Packages
+        rebar,
+        {rebar,"1.0.0"},
+        {rebar, {pkg, rebar_fork}}, % rebar app under a different pkg name
+        {rebar, "1.0.0", {pkg, rebar_fork}},
+        %% Source Dependencies
+        {rebar, {git, "git://github.com/erlang/rebar3.git"}},
+        {rebar, {git, "http://github.com/erlang/rebar3.git"}},
+        {rebar, {git, "https://github.com/erlang/rebar3.git"}},
+        {rebar, {git, "git@github.com:erlang/rebar3.git"}},
+        {rebar, {hg, "https://othersite.com/erlang/rebar3"}},
+        {rebar, {git, "git://github.com/erlang/rebar3.git", {ref, "aef728"}}},
+        {rebar, {git, "git://github.com/erlang/rebar3.git", {branch, "master"}}},
+        {rebar, {git, "git://github.com/erlang/rebar3.git", {tag, "3.0.0"}}},
+        %% Source dependencies (git only) in subdirectories, from version 3.14 onwards
+        {rebar, {git_subdir, "git://github.com/erlang/rebar3.git", {branch, "main"}, "subdir"}},
+        {rebar, {git_subdir, "git://github.com/erlang/rebar3.git", {tag, "3.14"}, "sub/dir"},
+        {rebar, {git_subdir, "git://github.com/erlang/rebar3.git", {ref, "aeaefd"}, "dir"}
+        ]}.
+
+# 命令相关
+    rebar3 update               更新缓存软件依赖包到最新, 但是不会修改到项目中
+    rebar3 upgrade <depname>    升级软件包到项目中   这将更新锁文件定义，并且在下一个构建中，将提取并编译新副本。如果传递依赖项也已升级，则将检测并处理。
+    您应该避免在可能的情况下删除锁定文件，并且如果需要升级多个应用程序，可以致电rebar3 upgrade app1,app2,app3。如果rebar3 upgrade不带任何参数调用，将升级所有应用程序。在小型项目上可以这样做，但是您可能希望在大型项目上逐步进行。 
+
+# 为常见任务创建别名(别名可以手动创建一个简单的命令来运行多个任务，而不是手动调用所有任务)
+    {alias, [
+    {check, [xref, dialyzer, edoc,
+             {proper, "--regressions"},
+             {proper, "-c"}, {ct, "-c"}, {cover, "-v --min_coverage=80"}]}
+    ]}.
+
+# 各种工具的推荐配置
+
+    一些rebar3配置和默认设置可能太宽松或太严格。但是，由于对向后兼容性的承诺，我们不能总是对其进行更改和改编，因为这可能会破坏依赖于这些特定配置的项目。
+    以下是一些配置的集合，这些配置在启动新项目时可用作新的默认值。
+    {dialyzer, [
+    {warnings, [
+       %% Warn about undefined types and unknown functions
+       unknown
+    ]}
+    ]}.
+
+    {xref_checks,[
+        %% enable most checks, but avoid 'unused calls' which is often very verbose
+        undefined_function_calls, undefined_functions, locals_not_used,
+        deprecated_function_calls, deprecated_functions
+    ]}.
+
+    {profiles, [
+    {test, [
+        %% Avoid warnings when test suites use `-compile(export_all)`
+        {erl_opts, [nowarn_export_all]}
+    ]}
+    ]}.
+

src/testCase/utSelectVal.erl

@@ -7,7 +7,6 @@ write(N) ->
    HandStr = makeStr(N, Head),
    ok = file:write_file("./genCfg/utTestCfg" ++ integer_to_list(N) ++ ".erl", HandStr).
 
-
 makeStr(0, BinStr) ->
    <<BinStr/binary, "hand(_) -> undefined.">>;
 makeStr(N, BinStr) ->
@@ -21,7 +20,6 @@ write2(N) ->
    HandStr = makeStr2(N, Head),
    ok = file:write_file("./genCfg/utTestHand" ++ integer_to_list(N) ++ ".erl", HandStr).
 
-
 makeStr2(0, BinStr) ->
    <<BinStr/binary, "hand(_, _) -> undefined.">>;
 makeStr2(N, BinStr) ->
@@ -30,6 +28,27 @@ makeStr2(N, BinStr) ->
    Str = <<"hand(test", (integer_to_binary(N))/binary, ", {test", (integer_to_binary(N))/binary, ", ", VStr/binary, "V100}) ->\n\t", (integer_to_binary(N))/binary, ";\n">>,
    makeStr2(N - 1, <<BinStr/binary, Str/binary>>).
 
+writeGet(N) ->
+   Head = <<"-module(utTestGet", (integer_to_binary(N))/binary, ").\n-compile([export_all, nowarn_function, nowarn_unused_vars, nowarn_export_all]).\n\n">>,
+   HandStr = makeStrGet(1, N, Head),
+   ok = file:write_file("./genCfg/utTestGet" ++ integer_to_list(N) ++ ".erl", HandStr).
+
+makeStrGet(Index, N, BinStr) when Index > N ->
+   <<BinStr/binary, "hand(_) -> undefined.">>;
+makeStrGet(Index, N, BinStr) ->
+   Str = <<"hand(", (integer_to_binary(Index))/binary, ") -> ", (integer_to_binary(Index))/binary, ";\n">>,
+   makeStrGet(Index + 1, N, <<BinStr/binary, Str/binary>>).
+
+writeWhen(N) ->
+   Head = <<"-module(utTestWhen", (integer_to_binary(N))/binary, ").\n-compile([export_all, nowarn_function, nowarn_unused_vars, nowarn_export_all]).\n\n">>,
+   HandStr = makeStrWhen(1, N, Head),
+   ok = file:write_file("./genCfg/utTestWhen" ++ integer_to_list(N) ++ ".erl", HandStr).
+
+makeStrWhen(Index, N, BinStr) when Index > N ->
+   <<BinStr/binary, "hand(_) -> undefined.">>;
+makeStrWhen(Index, N, BinStr) ->
+   Str = <<"hand(X) when X < ", (integer_to_binary(Index))/binary, " -> ", (integer_to_binary(Index))/binary, ";\n">>,
+   makeStrWhen(Index + 1, N, <<BinStr/binary, Str/binary>>).
 
 call1(N, Y) ->
    KVList = [{{value, test, Index, Index}, {value, test, Index, Index + 2}} || Index <- lists:seq(1, Y)],

src/testCase/utTestBinAddr.erl

@@ -0,0 +1,33 @@
+-module(utTestBinAddr).
+
+-compile([export_all, nowarn_unused_function, nowarn_unused_vars, nowarn_export_all]).
+
+getBin11() ->
+   <<"fdsafsdf范德萨发送发送"/utf8>>.
+
+getBin12() ->
+   <<"fdsafsdf范德萨发送发送"/utf8>>.
+
+getBin21() ->
+   <<"fdsafsdfsdfdsfasfdsffffffffffffffffffffffffffffffffffffffffffffffffffffHJlhdsjflshdalfkhsaklfhsdafjkdshfkla范德萨发送发送"/utf8>>.
+
+getBin22() ->
+   <<"fdsafsdfsdfdsfasfdsffffffffffffffffffffffffffffffffffffffffffffffffffffHJlhdsjflshdalfkhsaklfhsdafjkdshfkla范德萨发送发送"/utf8>>.
+
+test() ->
+   A = <<"fdsafsdf范德萨发送发送"/utf8>>,
+   B = <<"fdsafsdfsdfdsfasfdsffffffffffffffffffffffffffffffffffffffffffffffffffffHJlhdsjflshdalfkhsaklfhsdafjkdshfkla范德萨发送发送"/utf8>>,
+   io:format("IMY************************~n~p\n~p\n~p\n~p~n~p\n~p\n",
+      [
+         binaryAddr:getBinAddr(getBin11()),
+         binaryAddr:getBinAddr(getBin12()),
+         binaryAddr:getBinAddr(getBin21()),
+         binaryAddr:getBinAddr(getBin22()),
+         binaryAddr:getBinAddr(A),
+         binaryAddr:getBinAddr(B)
+      ]).
+
+
+
+
+