diff --git a/wms_pro/hd/.idea/$PROJECT_FILE$ b/wms_pro/hd/.idea/$PROJECT_FILE$ deleted file mode 100644 index 58b7e3e5..00000000 --- a/wms_pro/hd/.idea/$PROJECT_FILE$ +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/wms_pro/hd/.idea/.gitignore b/wms_pro/hd/.idea/.gitignore deleted file mode 100644 index 0a8642fa..00000000 --- a/wms_pro/hd/.idea/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml -# Zeppelin ignored files -/ZeppelinRemoteNotebooks/ diff --git a/wms_pro/hd/.idea/encodings.xml b/wms_pro/hd/.idea/encodings.xml index fb53fb62..4fbbfd3f 100644 --- a/wms_pro/hd/.idea/encodings.xml +++ b/wms_pro/hd/.idea/encodings.xml @@ -3,5 +3,7 @@ + + \ No newline at end of file diff --git a/wms_pro/hd/.idea/inspectionProfiles/Project_Default.xml b/wms_pro/hd/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 6560a989..00000000 --- a/wms_pro/hd/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - \ No newline at end of file diff --git a/wms_pro/hd/.idea/qaplug_profiles.xml b/wms_pro/hd/.idea/qaplug_profiles.xml deleted file mode 100644 index 3dfd21f3..00000000 --- a/wms_pro/hd/.idea/qaplug_profiles.xml +++ /dev/null @@ -1,465 +0,0 @@ - - - - - \ No newline at end of file diff --git a/wms_pro/hd/.idea/runConfigurations.xml b/wms_pro/hd/.idea/runConfigurations.xml deleted file mode 100644 index 797acea5..00000000 --- a/wms_pro/hd/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/0/1/0133ebeb5b54aed369d35ab277528534ef73f401 b/wms_pro/hd/.idea/sonarlint/issuestore/0/1/0133ebeb5b54aed369d35ab277528534ef73f401 deleted file mode 100644 index 89981295..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/0/1/0133ebeb5b54aed369d35ab277528534ef73f401 +++ /dev/null @@ -1,13 +0,0 @@ - -t java:S116"ZRename this field "measure_unit_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n java:S116#"TRename this field "unit_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(٧ -n java:S116("TRename this field "unit_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(︣ -m java:S116-"XRename this field "qty_precision" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S1162"RRename this field "is_used" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -i java:S1167"TRename this field "create_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116<"VRename this field "create_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116A"VRename this field "create_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ه -n java:S116F"TRename this field "update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116K"VRename this field "update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116P"VRename this field "update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S116U"QRename this field "ext_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(񐽕 \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/0/f/0f9efa8480b10f9adaa49898a79423f2ab0f6c1f b/wms_pro/hd/.idea/sonarlint/issuestore/0/f/0f9efa8480b10f9adaa49898a79423f2ab0f6c1f deleted file mode 100644 index 9520db27..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/0/f/0f9efa8480b10f9adaa49898a79423f2ab0f6c1f +++ /dev/null @@ -1,3 +0,0 @@ - -E -java:S3740/"/Provide the parametrized type for this generic.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 b/wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 deleted file mode 100644 index bffb945f..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/1/0/10e40d67bd7d0818c5483704f020703d1bef8378 +++ /dev/null @@ -1,2 +0,0 @@ - -N java:S106."9Replace this use of System.out or System.err by a logger.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/1/1/11978d8ffa97bb119d9c27e2ba034b73db067e4b b/wms_pro/hd/.idea/sonarlint/issuestore/1/1/11978d8ffa97bb119d9c27e2ba034b73db067e4b deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/1/5/15440390b143518a793fd475726cbb96e5d1efa0 b/wms_pro/hd/.idea/sonarlint/issuestore/1/5/15440390b143518a793fd475726cbb96e5d1efa0 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/2/d/2d32fa4ba277a66f4515ea7d34297bcfeca20b22 b/wms_pro/hd/.idea/sonarlint/issuestore/2/d/2d32fa4ba277a66f4515ea7d34297bcfeca20b22 deleted file mode 100644 index 8d64eb7b..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/2/d/2d32fa4ba277a66f4515ea7d34297bcfeca20b22 +++ /dev/null @@ -1,3 +0,0 @@ - -b -java:S3252*"LUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isEmpty".( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/3/2/327e504df1a8ea8af98fe85d21ec4692cccd130d b/wms_pro/hd/.idea/sonarlint/issuestore/3/2/327e504df1a8ea8af98fe85d21ec4692cccd130d deleted file mode 100644 index 4e9de4cc..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/3/2/327e504df1a8ea8af98fe85d21ec4692cccd130d +++ /dev/null @@ -1,6 +0,0 @@ - -E -java:S3740I"/Provide the parametrized type for this generic.(Dž -c java:S100I"NRename this method name to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Dž - -java:S1130I"lRemove the declaration of thrown exception 'java.io.IOException', as it cannot be thrown from method's body.(Dž \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/3/6/363ec6c9460095b38992146a934751ba30bef9af b/wms_pro/hd/.idea/sonarlint/issuestore/3/6/363ec6c9460095b38992146a934751ba30bef9af deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/3/a/3a408b7d961edb8db362ab2025efe90ae43186c9 b/wms_pro/hd/.idea/sonarlint/issuestore/3/a/3a408b7d961edb8db362ab2025efe90ae43186c9 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/4/4/442292b8a7efeabbe4cc176709b833b1792140ec b/wms_pro/hd/.idea/sonarlint/issuestore/4/4/442292b8a7efeabbe4cc176709b833b1792140ec deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/4/8/484515574155d74e2c0fb2f642d010e81da02c12 b/wms_pro/hd/.idea/sonarlint/issuestore/4/8/484515574155d74e2c0fb2f642d010e81da02c12 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/4/f/4fc9e6b89767bdae6bb64ea2eb8bdc73585e739c b/wms_pro/hd/.idea/sonarlint/issuestore/4/f/4fc9e6b89767bdae6bb64ea2eb8bdc73585e739c deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/5/5/553547bce1b3e1671f6cb30528d51898d41fb948 b/wms_pro/hd/.idea/sonarlint/issuestore/5/5/553547bce1b3e1671f6cb30528d51898d41fb948 deleted file mode 100644 index 8204880a..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/5/5/553547bce1b3e1671f6cb30528d51898d41fb948 +++ /dev/null @@ -1,11 +0,0 @@ - -` -java:S1192d"JDefine a constant instead of duplicating this literal "usageRate" 4 times.(Й -a -java:S1192a"FDefine a constant instead of duplicating this literal "total" 3 times.( -e -java:S1192b"JDefine a constant instead of duplicating this literal "available" 3 times.( -Y -java:S3518d"CMake sure this expression can't be zero before doing this division.(Й -> -java:S1659T"#Declare "total" on a separate line.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/5/7/57797c323a45bc67208d3507e8b58517d306782a b/wms_pro/hd/.idea/sonarlint/issuestore/5/7/57797c323a45bc67208d3507e8b58517d306782a deleted file mode 100644 index 7fc4e2dc..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/5/7/57797c323a45bc67208d3507e8b58517d306782a +++ /dev/null @@ -1,2 +0,0 @@ - -u java:S116"[Rename this field "local_table_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ֵ \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/5/b/5bf8a103b07bcc6e53d76381558cf3ce51acec97 b/wms_pro/hd/.idea/sonarlint/issuestore/5/b/5bf8a103b07bcc6e53d76381558cf3ce51acec97 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/5/c/5cf8db646567d767805c9e2c9d75f48bf84445e6 b/wms_pro/hd/.idea/sonarlint/issuestore/5/c/5cf8db646567d767805c9e2c9d75f48bf84445e6 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/5/e/5e792c3d58824a1b5f4e3d3d409be838f13c2ea8 b/wms_pro/hd/.idea/sonarlint/issuestore/5/e/5e792c3d58824a1b5f4e3d3d409be838f13c2ea8 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/6/5/659d014d87cf2cb817ac8aa861692dafad6985ad b/wms_pro/hd/.idea/sonarlint/issuestore/6/5/659d014d87cf2cb817ac8aa861692dafad6985ad deleted file mode 100644 index 3831085a..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/6/5/659d014d87cf2cb817ac8aa861692dafad6985ad +++ /dev/null @@ -1,14 +0,0 @@ - -J -java:S3740I"/Provide the parametrized type for this generic.( -` -java:S1192,"JDefine a constant instead of duplicating this literal "cust_code" 3 times.(ڋ -f java:S117,"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ڋ -k java:S117O"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S117T"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S117Y"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S117Z"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n -java:S3252P"LUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isEmpty".(ē81 -n -java:S3252U"LUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isEmpty".(81 \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/6/a/6a0eb843818d8343bd44f2eb6fb96a2a17ad511d b/wms_pro/hd/.idea/sonarlint/issuestore/6/a/6a0eb843818d8343bd44f2eb6fb96a2a17ad511d deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/6/b/6b42b2e9bd0103ce4b84ace62d3bb90c20fcbc63 b/wms_pro/hd/.idea/sonarlint/issuestore/6/b/6b42b2e9bd0103ce4b84ace62d3bb90c20fcbc63 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/8/5/85dbedfade54927efe168608601c3aefd87bec15 b/wms_pro/hd/.idea/sonarlint/issuestore/8/5/85dbedfade54927efe168608601c3aefd87bec15 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/8/c/8c15afe3f84fae04db4771870c3d8152dc6112b7 b/wms_pro/hd/.idea/sonarlint/issuestore/8/c/8c15afe3f84fae04db4771870c3d8152dc6112b7 deleted file mode 100644 index 55b46039..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/8/c/8c15afe3f84fae04db4771870c3d8152dc6112b7 +++ /dev/null @@ -1,24 +0,0 @@ - -g java:S116"RRename this field "cust_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -i java:S116""TRename this field "cust_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(̓ -n java:S116'"TRename this field "cust_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(꒛ -j java:S116,"URename this field "jurid_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S1161"QRename this field "tax_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(û -p java:S1166"VRename this field "register_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ԝ -s java:S116;"YRename this field "manage_lice_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(҆ -n java:S116@"YRename this field "busi_char_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ҽ -l java:S116E"RRename this field "area_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ٔ -m java:S116J"SRename this field "zip_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116O"WRename this field "corp_tele_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ʿ -q java:S116T"WRename this field "corp_address" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -i java:S116Y"TRename this field "create_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116^"VRename this field "create_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116c"VRename this field "create_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ه -n java:S116h"TRename this field "update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116m"VRename this field "update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116r"VRename this field "update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116w"WRename this field "is_used_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -g java:S116|"RRename this field "is_used" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -o java:S116"TRename this field "is_delete" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(у -g java:S116"QRename this field "ext_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(񐽕 -i java:S116"SRename this field "class_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/8/d/8d5ad7519a7c25dad5b9ac989ab15bddd38c1744 b/wms_pro/hd/.idea/sonarlint/issuestore/8/d/8d5ad7519a7c25dad5b9ac989ab15bddd38c1744 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/9/d/9de12ba5bf4d57379fd943ac5f598bff5f7e9b09 b/wms_pro/hd/.idea/sonarlint/issuestore/9/d/9de12ba5bf4d57379fd943ac5f598bff5f7e9b09 deleted file mode 100644 index 4a3be00b..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/9/d/9de12ba5bf4d57379fd943ac5f598bff5f7e9b09 +++ /dev/null @@ -1,5 +0,0 @@ - -J -java:S3740T"/Provide the parametrized type for this generic.( -G -java:S1602K",Remove useless curly braces around statement( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/a/8/a8ae509ac1fa3c77b43dddd6cf62c4d5b1bda604 b/wms_pro/hd/.idea/sonarlint/issuestore/a/8/a8ae509ac1fa3c77b43dddd6cf62c4d5b1bda604 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/a/a/aa9ec186e2a7aa1989de50b7632ac6126cea19a9 b/wms_pro/hd/.idea/sonarlint/issuestore/a/a/aa9ec186e2a7aa1989de50b7632ac6126cea19a9 deleted file mode 100644 index 1b3eae62..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/a/a/aa9ec186e2a7aa1989de50b7632ac6126cea19a9 +++ /dev/null @@ -1,13 +0,0 @@ - -b java:S1129"FDefine and throw a dedicated exception instead of using a generic one.(󕭷81 -b java:S112@"FDefine and throw a dedicated exception instead of using a generic one.(81 -E -java:S3740@"/Provide the parametrized type for this generic.( -J -java:S3740A"/Provide the parametrized type for this generic.( -E -java:S3740B"/Provide the parametrized type for this generic.( - -java:S11309"lRemove the declaration of thrown exception 'java.lang.Exception', as it cannot be thrown from method's body.(󕭷81 - -java:S1130@"lRemove the declaration of thrown exception 'java.lang.Exception', as it cannot be thrown from method's body.(81 \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/b/0/b0de42f7cfd8eba26add38c170ecd5ad35938d74 b/wms_pro/hd/.idea/sonarlint/issuestore/b/0/b0de42f7cfd8eba26add38c170ecd5ad35938d74 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/b/8/b87f4e47fe0f4be8cc67208a35f33f3b272af09f b/wms_pro/hd/.idea/sonarlint/issuestore/b/8/b87f4e47fe0f4be8cc67208a35f33f3b272af09f deleted file mode 100644 index f1943cfc..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/b/8/b87f4e47fe0f4be8cc67208a35f33f3b272af09f +++ /dev/null @@ -1,2 +0,0 @@ - -8xml:S125"Remove this commented out code.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/c/0/c0e2ef4c9f0be9eecb402d0138aad7541779c88c b/wms_pro/hd/.idea/sonarlint/issuestore/c/0/c0e2ef4c9f0be9eecb402d0138aad7541779c88c deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/c/f/cfb3b9e8e5934039226c5f151fead52f255d3821 b/wms_pro/hd/.idea/sonarlint/issuestore/c/f/cfb3b9e8e5934039226c5f151fead52f255d3821 deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/d/f/df8b3befbd76ade64ad578e8f836ebe7dc24a98f b/wms_pro/hd/.idea/sonarlint/issuestore/d/f/df8b3befbd76ade64ad578e8f836ebe7dc24a98f deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/e/4/e447678e220dc6708fa6d3f2fdf29275c061c85c b/wms_pro/hd/.idea/sonarlint/issuestore/e/4/e447678e220dc6708fa6d3f2fdf29275c061c85c deleted file mode 100644 index e92dd65c..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/e/4/e447678e220dc6708fa6d3f2fdf29275c061c85c +++ /dev/null @@ -1,3 +0,0 @@ - -J -java:S3740#"/Provide the parametrized type for this generic.( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/e/4/e4862e0547db5b758eaf94b49e5b6e4f938c0b99 b/wms_pro/hd/.idea/sonarlint/issuestore/e/4/e4862e0547db5b758eaf94b49e5b6e4f938c0b99 deleted file mode 100644 index 83ba6d7c..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/e/4/e4862e0547db5b758eaf94b49e5b6e4f938c0b99 +++ /dev/null @@ -1,28 +0,0 @@ - -l java:S116"RRename this field "supp_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -h java:S116"TRename this field "supp_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(A -n java:S116#"TRename this field "supp_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -j java:S116("URename this field "jurid_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116-"QRename this field "tax_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(û -p java:S1162"VRename this field "register_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ԝ -s java:S1167"YRename this field "manage_lice_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(҆ -n java:S116<"YRename this field "busi_char_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ҽ -l java:S116A"RRename this field "area_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ٔ -m java:S116F"SRename this field "zip_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116K"WRename this field "corp_tele_no" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ʿ -q java:S116P"WRename this field "corp_address" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -i java:S116U"TRename this field "create_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116Z"VRename this field "create_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116_"VRename this field "create_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ه -n java:S116d"TRename this field "update_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -p java:S116i"VRename this field "update_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116n"VRename this field "update_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116s"WRename this field "is_used_time" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -g java:S116x"RRename this field "is_used" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -n java:S116}"TRename this field "is_delete" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(у -g java:S116"QRename this field "ext_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(񐽕 -s java:S116"XRename this field "barcode_print" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ä -n java:S116"SRename this field "class_id" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116"URename this field "class_code" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -k java:S116"URename this field "class_name" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -l java:S116"VRename this field "honour_days" to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(Ѝ \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/e/7/e70f0441bebe61574c00213f32c632aa2897c910 b/wms_pro/hd/.idea/sonarlint/issuestore/e/7/e70f0441bebe61574c00213f32c632aa2897c910 deleted file mode 100644 index ca99c502..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/e/7/e70f0441bebe61574c00213f32c632aa2897c910 +++ /dev/null @@ -1,6 +0,0 @@ - -k java:S117'"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ǎ -k java:S117("QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S117)"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(ײ -k java:S117*"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.( -f java:S117+"QRename this local variable to match the regular expression '^[a-z][a-zA-Z0-9]*$'.(؅ī \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d b/wms_pro/hd/.idea/sonarlint/issuestore/f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d deleted file mode 100644 index 938d8c65..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/f/b/fb1fedd5a3547392fa64608ed6291c9931a5ae3d +++ /dev/null @@ -1,21 +0,0 @@ - -J -java:S3740"/Provide the parametrized type for this generic.(玟 -E -java:S3740,"/Provide the parametrized type for this generic.(× -A -java:S1602",Remove useless curly braces around statement( -G -java:S1602",Remove useless curly braces around statement( -J -java:S1905"/Remove this unnecessary cast to "QueryWrapper".(玟 -G -java:S1602",Remove useless curly braces around statement(آ -A -java:S1602 ",Remove useless curly braces around statement( -B -java:S1602!",Remove useless curly braces around statement(Ç -G -java:S1602"",Remove useless curly braces around statement( -G -java:S1602#",Remove useless curly braces around statement( \ No newline at end of file diff --git a/wms_pro/hd/.idea/sonarlint/issuestore/f/c/fc51b9e09e27f27eee834adb54557bc93da3ccb4 b/wms_pro/hd/.idea/sonarlint/issuestore/f/c/fc51b9e09e27f27eee834adb54557bc93da3ccb4 deleted file mode 100644 index 3ac74919..00000000 --- a/wms_pro/hd/.idea/sonarlint/issuestore/f/c/fc51b9e09e27f27eee834adb54557bc93da3ccb4 +++ /dev/null @@ -1,9 +0,0 @@ - -2 -java:S1643b"Use a StringBuilder instead.( -7 -java:S1643w"Use a StringBuilder instead.( -m -java:S37766"RRefactor this method to reduce its Cognitive Complexity from 42 to the 15 allowed.(Ì -g -java:S3252h"LUse static access with "cn.hutool.core.text.CharSequenceUtil" for "isEmpty".( \ No newline at end of file diff --git a/wms_pro/hd/.idea/uiDesigner.xml b/wms_pro/hd/.idea/uiDesigner.xml deleted file mode 100644 index e96534fb..00000000 --- a/wms_pro/hd/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-06.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-06.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-07.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-07.0.log deleted file mode 100644 index 029f80b2..00000000 --- a/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-07.0.log +++ /dev/null @@ -1,82 +0,0 @@ -2024-03-07 13:01:05.011 [main] ERROR org.springframework.boot.SpringApplication - Application run failed -org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'requestMappingHandlerMapping' defined in class path resource [org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration$EnableWebMvcConfiguration.class]: Invocation of init method failed; nested exception is java.lang.IllegalStateException: Ambiguous mapping. Cannot map 'bmExternalFieldMappingController' method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#addRows(List) -to {POST [/api/externalFieldMapping]}: There is already 'bmExternalFieldMappingController' bean method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#create(BmExternalFieldMapping) mapped. - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1804) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:620) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) - at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:953) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:918) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:583) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:730) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:412) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:302) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1301) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1290) - at org.nl.AppRun.main(AppRun.java:39) -Caused by: java.lang.IllegalStateException: Ambiguous mapping. Cannot map 'bmExternalFieldMappingController' method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#addRows(List) -to {POST [/api/externalFieldMapping]}: There is already 'bmExternalFieldMappingController' bean method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#create(BmExternalFieldMapping) mapped. - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$MappingRegistry.validateMethodMapping(AbstractHandlerMethodMapping.java:669) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$MappingRegistry.register(AbstractHandlerMethodMapping.java:635) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.registerHandlerMethod(AbstractHandlerMethodMapping.java:332) - at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.registerHandlerMethod(RequestMappingHandlerMapping.java:420) - at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.registerHandlerMethod(RequestMappingHandlerMapping.java:76) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.lambda$detectHandlerMethods$2(AbstractHandlerMethodMapping.java:299) - at java.util.LinkedHashMap.forEach(LinkedHashMap.java:684) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.detectHandlerMethods(AbstractHandlerMethodMapping.java:297) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.processCandidateBean(AbstractHandlerMethodMapping.java:266) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.initHandlerMethods(AbstractHandlerMethodMapping.java:225) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.afterPropertiesSet(AbstractHandlerMethodMapping.java:213) - at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.afterPropertiesSet(RequestMappingHandlerMapping.java:205) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1863) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1800) - ... 16 common frames omitted -2024-03-07 13:04:13.612 [main] ERROR org.springframework.boot.SpringApplication - Application run failed -org.springframework.beans.factory.BeanCreationException: Error creating bean with name 'requestMappingHandlerMapping' defined in class path resource [org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration$EnableWebMvcConfiguration.class]: Invocation of init method failed; nested exception is java.lang.IllegalStateException: Ambiguous mapping. Cannot map 'bmExternalFieldMappingController' method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#addRows(List) -to {POST [/api/externalFieldMapping]}: There is already 'bmExternalFieldMappingController' bean method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#create(BmExternalFieldMapping) mapped. - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1804) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.doCreateBean(AbstractAutowireCapableBeanFactory.java:620) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.createBean(AbstractAutowireCapableBeanFactory.java:542) - at org.springframework.beans.factory.support.AbstractBeanFactory.lambda$doGetBean$0(AbstractBeanFactory.java:335) - at org.springframework.beans.factory.support.DefaultSingletonBeanRegistry.getSingleton(DefaultSingletonBeanRegistry.java:234) - at org.springframework.beans.factory.support.AbstractBeanFactory.doGetBean(AbstractBeanFactory.java:333) - at org.springframework.beans.factory.support.AbstractBeanFactory.getBean(AbstractBeanFactory.java:208) - at org.springframework.beans.factory.support.DefaultListableBeanFactory.preInstantiateSingletons(DefaultListableBeanFactory.java:953) - at org.springframework.context.support.AbstractApplicationContext.finishBeanFactoryInitialization(AbstractApplicationContext.java:918) - at org.springframework.context.support.AbstractApplicationContext.refresh(AbstractApplicationContext.java:583) - at org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext.refresh(ServletWebServerApplicationContext.java:145) - at org.springframework.boot.SpringApplication.refresh(SpringApplication.java:730) - at org.springframework.boot.SpringApplication.refreshContext(SpringApplication.java:412) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:302) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1301) - at org.springframework.boot.SpringApplication.run(SpringApplication.java:1290) - at org.nl.AppRun.main(AppRun.java:39) -Caused by: java.lang.IllegalStateException: Ambiguous mapping. Cannot map 'bmExternalFieldMappingController' method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#addRows(List) -to {POST [/api/externalFieldMapping]}: There is already 'bmExternalFieldMappingController' bean method -org.nl.wms.sync_manage.field_mapping.controller.BmExternalFieldMappingController#create(BmExternalFieldMapping) mapped. - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$MappingRegistry.validateMethodMapping(AbstractHandlerMethodMapping.java:669) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping$MappingRegistry.register(AbstractHandlerMethodMapping.java:635) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.registerHandlerMethod(AbstractHandlerMethodMapping.java:332) - at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.registerHandlerMethod(RequestMappingHandlerMapping.java:420) - at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.registerHandlerMethod(RequestMappingHandlerMapping.java:76) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.lambda$detectHandlerMethods$2(AbstractHandlerMethodMapping.java:299) - at java.util.LinkedHashMap.forEach(LinkedHashMap.java:684) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.detectHandlerMethods(AbstractHandlerMethodMapping.java:297) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.processCandidateBean(AbstractHandlerMethodMapping.java:266) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.initHandlerMethods(AbstractHandlerMethodMapping.java:225) - at org.springframework.web.servlet.handler.AbstractHandlerMethodMapping.afterPropertiesSet(AbstractHandlerMethodMapping.java:213) - at org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping.afterPropertiesSet(RequestMappingHandlerMapping.java:205) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.invokeInitMethods(AbstractAutowireCapableBeanFactory.java:1863) - at org.springframework.beans.factory.support.AbstractAutowireCapableBeanFactory.initializeBean(AbstractAutowireCapableBeanFactory.java:1800) - ... 16 common frames omitted diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-08.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-08.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-11.0.log b/wms_pro/hd/logPath_IS_UNDEFINED/2024-03-11.0.log deleted file mode 100644 index e69de29b..00000000 diff --git a/wms_pro/hd/nladmin-system/pom.xml b/wms_pro/hd/nladmin-system/pom.xml index 7647f453..a1161ade 100644 --- a/wms_pro/hd/nladmin-system/pom.xml +++ b/wms_pro/hd/nladmin-system/pom.xml @@ -28,6 +28,13 @@ + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-adapter-webserver + 1.1.7 + + + org.codehaus.groovy groovy-all diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java index b24571cb..a564271c 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/AppRun.java @@ -1,12 +1,8 @@ package org.nl; import cn.dev33.satoken.annotation.SaIgnore; - +import org.dromara.dynamictp.core.spring.EnableDynamicTp; import org.mybatis.spring.annotation.MapperScan; -import org.nl.common.utils.SpringContextHolder; -import org.nl.common.websocket.heartSocket.clientSocket.HeartClientServer; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.support.AbstractBeanFactory; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -14,14 +10,11 @@ import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactor import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.server.ServletWebServerFactory; import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Import; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import java.net.InetSocketAddress; - /** * 开启审计功能 -> @EnableJpaAuditing * https://www.cnblogs.com/niceyoo/p/10908647.html @@ -37,6 +30,7 @@ import java.net.InetSocketAddress; @ServletComponentScan @EnableTransactionManagement @MapperScan("org.nl.**.mapper") +@EnableDynamicTp public class AppRun implements CommandLineRunner { public static void main(String[] args) { SpringApplication.run(AppRun.class, args); @@ -54,12 +48,12 @@ public class AppRun implements CommandLineRunner { // return new SpringContextHolder(); // } - @Bean + /*@Bean public ServletWebServerFactory webServerFactory() { TomcatServletWebServerFactory fa = new TomcatServletWebServerFactory(); fa.addConnectorCustomizers(connector -> connector.setProperty("relaxedQueryChars", "[]{}")); return fa; - } + }*/ /** * 访问首页提示 @@ -69,6 +63,11 @@ public class AppRun implements CommandLineRunner { @GetMapping("/") @SaIgnore public String index() { + try { + Thread.sleep(10000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } return "Backend service started successfully"; } } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml index 4f7df4a2..2950b1e4 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/flow_manage/flow/service/execution/dao/mapper/xml/ActRuExecutionMapper.xml @@ -19,5 +19,6 @@ and exe.proc_inst_id like '%${query.proc_inst_id}%' + ORDER BY exe.create_time DESC diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java index 61da5292..9d2c1cc6 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/system_manage/service/quartz/utils/QuartzRunnable.java @@ -1,19 +1,21 @@ package org.nl.wms.system_manage.service.quartz.utils; import cn.hutool.core.util.StrUtil; +import com.yomahub.tlog.core.thread.TLogInheritableTask; +import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.common.utils.SpringContextHolder; import org.springframework.util.ReflectionUtils; import java.lang.reflect.Method; -import java.util.concurrent.Callable; /** * 执行定时任务 + * * @author / */ @Slf4j -public class QuartzRunnable implements Callable { +public class QuartzRunnable extends TLogInheritableTask { private final Object target; private final Method method; @@ -31,14 +33,15 @@ public class QuartzRunnable implements Callable { } } + + @SneakyThrows @Override - public Object call() throws Exception { + public void runTask() { ReflectionUtils.makeAccessible(method); if (StrUtil.isNotEmpty(params)) { method.invoke(target, params); } else { method.invoke(target); } - return null; } } diff --git a/wms_pro/hd/nladmin-system/src/main/resources/T.txt b/wms_pro/hd/nladmin-system/src/main/resources/T.txt deleted file mode 100644 index c9f60baf..00000000 --- a/wms_pro/hd/nladmin-system/src/main/resources/T.txt +++ /dev/null @@ -1,10 +0,0 @@ - -测试创建文件 -测试修改 - - - - - -123123221322313 - diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml index 8e7dffbe..712f4c35 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application-dev3.yml @@ -1,11 +1,6 @@ server: port: 8012 max-http-header-size: 65536 - tomcat: - accept-count: 300 - threads: - max: 300 - min-spare: 30 #配置数据源 spring: datasource: @@ -158,6 +153,7 @@ sa-token: # 配置 Cookie 作用域:根据二级域名实现sso登入如lms.sso.com;acs.sso.com domain: is-read-cookie: false + is-print: false schedulerFile: /Users/mima0000/Desktop/scheduler.xml lucene: index: diff --git a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml index 05d5abdb..c370b8e1 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml +++ b/wms_pro/hd/nladmin-system/src/main/resources/config/application.yml @@ -1,3 +1,7 @@ +server: + tomcat: + relaxed-query-chars: [ '|','{','}','[',']' ] #字符问题：https://blog.csdn.net/CanYue_Yi/article/details/109182577 + relaxed-path-chars: [ '|','{','}','[',']' ] #字符问题： https://blog.csdn.net/weixin_41996632/article/details/90715118 spring: freemarker: check-template-location: false @@ -9,6 +13,21 @@ spring: redis: repositories: enabled: false + dynamic: + tp: + enabled: true # 是否启用 dynamictp，默认true + enabledBanner: false # 是否启用 控制台banner，默认true + enabledCollect: true # 是否开启监控指标采集，默认true + collectorTypes: logging # 监控数据采集器类型（logging | micrometer | internal_logging），默认micrometer + logPath: d:\log\lms # 监控日志数据路径，默认 ${user.home}/logs，采集类型非logging不用配置 + monitorInterval: 8 + tomcatTp: # tomcat webserver 线程池配置 + threadPoolAliasName: tomcat 线程池 # 线程池别名，可选 + corePoolSize: 15 + tryInterrupt: false + maximumPoolSize: 100 + keepAliveTime: 60 + runTimeout: 5000 task: pool: # 核心线程池大小 @@ -91,3 +110,6 @@ pageheiper: supportMethodsArguments: true pageSizeZero: false #pageSize=0 返回所有 params: count=countSgl +tlog: + enable-invoke-time-print: true + pattern: "[$traceId]" \ No newline at end of file diff --git a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml index 2d4dbffe..76dd4c73 100644 --- a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml +++ b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml @@ -79,8 +79,8 @@ - + diff --git a/wms_pro/hd/nladmin-system/src/main/resources/test2 b/wms_pro/hd/nladmin-system/src/main/resources/test2 deleted file mode 100644 index 112b8544..00000000 --- a/wms_pro/hd/nladmin-system/src/main/resources/test2 +++ /dev/null @@ -1 +0,0 @@ -123213213