From 93edb32ffbdcd05d1ea16646dafae864e9850aef Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Thu, 4 Jul 2024 09:48:21 +0800 Subject: [PATCH] merge code for log and encryption and desccryption --- .idea/inspectionProfiles/Project_Default.xml | 66 ------------------ .../1fd70d40f7c9cb50a47ee5948b3fd37458651d5f | 0 .../5f3e07e732703a75dec38fdc223ff19f81693be2 | 28 -------- .../aa608ec83cbef0157ad034a45ce178fe8d3e1f1d | 31 -------- .../d56c65f042936ed45626ea96a8a3be8a1f991518 | 10 --- .../e6de4bae11e5f329670d8eefa8f2efcb19f7ff88 | 2 - .idea/sonarlint/issuestore/index.pb | 49 ------------- .idea/sonarlint/securityhotspotstore/index.pb | 49 ------------- .../common/security/utils/LogsUtils.class | Bin 0 -> 4595 bytes 9 files changed, 235 deletions(-) delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/sonarlint/issuestore/1/f/1fd70d40f7c9cb50a47ee5948b3fd37458651d5f delete mode 100644 .idea/sonarlint/issuestore/5/f/5f3e07e732703a75dec38fdc223ff19f81693be2 delete mode 100644 .idea/sonarlint/issuestore/a/a/aa608ec83cbef0157ad034a45ce178fe8d3e1f1d delete mode 100644 .idea/sonarlint/issuestore/d/5/d56c65f042936ed45626ea96a8a3be8a1f991518 delete mode 100644 .idea/sonarlint/issuestore/e/6/e6de4bae11e5f329670d8eefa8f2efcb19f7ff88 delete mode 100644 .idea/sonarlint/issuestore/index.pb delete mode 100644 .idea/sonarlint/securityhotspotstore/index.pb create mode 100644 bonus-common/bonus-common-security/target/classes/com/bonus/common/security/utils/LogsUtils.class diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 85fda15..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/1/f/1fd70d40f7c9cb50a47ee5948b3fd37458651d5f b/.idea/sonarlint/issuestore/1/f/1fd70d40f7c9cb50a47ee5948b3fd37458651d5f deleted file mode 100644 index e69de29..0000000 diff --git a/.idea/sonarlint/issuestore/5/f/5f3e07e732703a75dec38fdc223ff19f81693be2 b/.idea/sonarlint/issuestore/5/f/5f3e07e732703a75dec38fdc223ff19f81693be2 deleted file mode 100644 index b7b9c52..0000000 --- a/.idea/sonarlint/issuestore/5/f/5f3e07e732703a75dec38fdc223ff19f81693be2 +++ /dev/null @@ -1,28 +0,0 @@ - - java:S112^"FDefine and throw a dedicated exception instead of using a generic one.(J$a11442a9-8d63-4e07-b71d-8bbd99f23d2c - -java:S2293W"YReplace the type specification in this constructor call with the diamond operator ("<>").(J$416ded59-af84-4426-9b48-f83bd19950e0 - -java:S2293`"YReplace the type specification in this constructor call with the diamond operator ("<>").(J$27d903c5-8337-45a5-9487-c9b6382b00de - -java:S2293j"YReplace the type specification in this constructor call with the diamond operator ("<>").(J$a16dd6cf-1b96-4717-87b7-c9f068b6fb5a - -java:S1192"FDefine a constant instead of duplicating this literal "roles" 3 times.(J$c6896070-0294-4abc-a161-3e23920dbf5e - -java:S1192"NDefine a constant instead of duplicating this literal "新增用户'" 3 times.(ӚJ$1d0d7412-1caf-4ba7-bedd-7f6977aef86f - -java:S1192"NDefine a constant instead of duplicating this literal "修改用户'" 3 times.(J$955f325a-7983-4ba4-b019-c635db935788 -~ -java:S68133"BRemove this field injection and use constructor injection instead.(J$18d02424-12fa-4fe9-9589-301064ff6621 -~ -java:S68136"BRemove this field injection and use constructor injection instead.(J$af97443c-b483-4714-a15e-8ff638d25d48 -~ -java:S68139"BRemove this field injection and use constructor injection instead.(J$304f05f5-990c-4db1-8ffc-9457d2e774de -~ -java:S6813<"BRemove this field injection and use constructor injection instead.(J$8bfcda33-286c-4fb5-8121-10afaac59e76 -~ -java:S6813?"BRemove this field injection and use constructor injection instead.(J$cf9bc31d-c0ec-4699-8cad-87063e8cb226 -~ -java:S6813B"BRemove this field injection and use constructor injection instead.(J$f777a01b-edea-458c-bbb2-52a029ebf061 - -java:S1130h"lRemove the declaration of thrown exception 'java.io.IOException', as it cannot be thrown from method's body.([J$5b9bbe61-57c5-4b05-ba1e-73a0abd75888 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/a/a/aa608ec83cbef0157ad034a45ce178fe8d3e1f1d b/.idea/sonarlint/issuestore/a/a/aa608ec83cbef0157ad034a45ce178fe8d3e1f1d deleted file mode 100644 index 045b49d..0000000 --- a/.idea/sonarlint/issuestore/a/a/aa608ec83cbef0157ad034a45ce178fe8d3e1f1d +++ /dev/null @@ -1,31 +0,0 @@ - - -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(J$e1a9f8da-eff9-4bdf-b97a-a600f6c356f7 - -java:S2293"YReplace the type specification in this constructor call with the diamond operator ("<>").(힡J$e3523b3c-5ad8-499f-8ff7-bf9ed82d7f1a - -java:S1192"FDefine a constant instead of duplicating this literal "
" 4 times.(J$1ba3156b-b3a6-486b-9d57-6a7aa8850a41 -j -java:S5411"(Use a primitive boolean expression here.(J$26408d15-1f4c-4cd2-a4f5-58b1b3e5fde6 -~ -java:S6813,"BRemove this field injection and use constructor injection instead.(J$a84cd146-4f87-4427-9d47-5069d78e2801 -~ -java:S6813/"BRemove this field injection and use constructor injection instead.(J$13bb241c-6bc4-4d7f-aac3-5d608cf5aeb1 -~ -java:S68132"BRemove this field injection and use constructor injection instead.(J$761aa5b4-f63b-437e-9f34-f77b55b48e13 -~ -java:S68135"BRemove this field injection and use constructor injection instead.(J$e6b2d573-8b11-428f-b5de-e38833a19041 -~ -java:S68138"BRemove this field injection and use constructor injection instead.(J$5fd175a1-26cb-4a75-a852-810b655c3dbe -~ -java:S6813;"BRemove this field injection and use constructor injection instead.(J$cca9b812-26b4-43d0-b202-b70d706bcbc0 -~ -java:S6813>"BRemove this field injection and use constructor injection instead.(J$6a2f9c20-2af1-486f-b54d-ce8296e21114 -~ -java:S6813A"BRemove this field injection and use constructor injection instead.(J$5e5b493c-b4b9-4dbc-9e53-9db8ac63a56c - -java:S3252"JUse static access with "org.apache.commons.lang3.StringUtils" for "EMPTY".(J$0ae963e1-2cb5-4ae5-ae2b-44bc612a7c59 - -java:S3252"JUse static access with "org.apache.commons.lang3.StringUtils" for "EMPTY".(J$6279aaf7-7b1f-46d0-bb4c-34c82cf9a516 -{ -java:S1155">Use isEmpty() to check whether the collection is empty or not.(J$084360c0-7ef2-403b-a292-12b957d31f5b \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/d/5/d56c65f042936ed45626ea96a8a3be8a1f991518 b/.idea/sonarlint/issuestore/d/5/d56c65f042936ed45626ea96a8a3be8a1f991518 deleted file mode 100644 index ceb12f6..0000000 --- a/.idea/sonarlint/issuestore/d/5/d56c65f042936ed45626ea96a8a3be8a1f991518 +++ /dev/null @@ -1,10 +0,0 @@ - - -java:S6813"BRemove this field injection and use constructor injection instead.(8Δ2J$403f21c8-b418-475a-a8c0-81c2dc7a02d9 - -java:S1128"CRemove this unused import 'com.bonus.file.utils.FileDownloadUtils'.(ޤ8Δ2J$f034c7f8-3d6e-4ecd-9b95-cd848a3a7999 - -java:S1128 -"QRemove this unused import 'org.springframework.web.bind.annotation.RequestParam'.(¬8Δ2J$66d84852-c1a6-42a3-8a30-06506bcb8d2c -x -java:S1128"0Remove this unused import 'java.io.IOException'.(8Δ2J$372f4653-0162-4233-9cf3-fc20ef558e82 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/e/6/e6de4bae11e5f329670d8eefa8f2efcb19f7ff88 b/.idea/sonarlint/issuestore/e/6/e6de4bae11e5f329670d8eefa8f2efcb19f7ff88 deleted file mode 100644 index a06b796..0000000 --- a/.idea/sonarlint/issuestore/e/6/e6de4bae11e5f329670d8eefa8f2efcb19f7ff88 +++ /dev/null @@ -1,2 +0,0 @@ - - java:S112"FDefine and throw a dedicated exception instead of using a generic one.(ܶJ$9b182cea-bc39-42f7-909d-809033563b29 \ No newline at end of file diff --git a/.idea/sonarlint/issuestore/index.pb b/.idea/sonarlint/issuestore/index.pb deleted file mode 100644 index 6149509..0000000 --- a/.idea/sonarlint/issuestore/index.pb +++ /dev/null @@ -1,49 +0,0 @@ - -� -Wbonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java,d/5/d56c65f042936ed45626ea96a8a3be8a1f991518 -7 -pom.xml,4/4/442292b8a7efeabbe4cc176709b833b1792140ec -� -Qbonus-modules/bonus-file/src/main/java/com/bonus/file/config/ResourcesConfig.java,7/c/7ce726513da4afdbc3421b816e8def845a39a0bb -A -bonus-api/pom.xml,4/d/4d66766070d502e9495acbf654cd20829c4425b3 -� -^bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java,a/a/aa608ec83cbef0157ad034a45ce178fe8d3e1f1d -� -Vbonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java,e/9/e9e9c8aa0ae1931dc6e028fc6aa2a4445d3ba19e -} -Mbonus-modules/bonus-file/src/main/java/com/bonus/file/config/MinioConfig.java,5/0/5004442f77e22ef4c1d07b99806239bb7fb7ffbd - -Obonus-modules/bonus-file/src/main/java/com/bonus/file/BonusFileApplication.java,1/f/1fd70d40f7c9cb50a47ee5948b3fd37458651d5f -R -"bonus-visual/bonus-monitor/pom.xml,a/5/a567507002bfc4cb69f800244bcc422fbcc10e5d -� -[bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java,5/f/5f3e07e732703a75dec38fdc223ff19f81693be2 -� -Rbonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileDownloadUtils.java,9/7/9722eda79f36a8f93bcf90763a02040c63aa2fde -� -Tbonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java,8/4/840a68431ce1f8c33ff92941ebcdc18c832f00e4 -~ -Nbonus-gateway/src/main/java/com/bonus/gateway/service/ValidateCodeService.java,d/6/d6fecdfdef18b3d6832231c6f1b018c886d4fab8 -z -Jbonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java,2/c/2cc24e5aa9771bcc9b5a17544600b0e244d9c2ad -q -Abonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java,9/1/911ccbfd7be6b58e893061cdfb63c958e37d6eda -D -sql/bns_20240604.sql,8/5/85b1974774f16ce7959a122e4766c9a31a7a7895 -� -\bonus-modules/bonus-file/src/main/java/com/bonus/file/service/FastDfsSysFileServiceImpl.java,c/6/c6d854777bca75255487810d12805069bf1a4f45 -P - bonus-modules/bonus-file/pom.xml,0/f/0fbb26476b87bedf6f864aa5d52284b75bde6869 -� -Ubonus-modules/bonus-system/src/main/java/com/bonus/system/BonusSystemApplication.java,a/7/a7445a685a0b55cc0d903c370a10674cfbd15608 -E -bonus-modules/pom.xml,7/3/73fe31f1bc837e4395fd9296f4f1793cc44fbd07 -� -Pbonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUploadUtils.java,c/9/c9d1df9f46abbc0b2e5a3d147c7b3407ef09b84e -� -Rbonus-modules/bonus-file/src/main/java/com/bonus/file/service/ISysFileService.java,6/7/6796766c5f6d21c9e346f89b25160c0dd6401a5b -� -Zbonus-modules/bonus-file/src/main/java/com/bonus/file/service/MinioSysFileServiceImpl.java,8/7/8721859fd7a6cfb3d43a453ba3850048c6eeb2d2 -� -Zbonus-modules/bonus-file/src/main/java/com/bonus/file/service/LocalSysFileServiceImpl.java,2/e/2ef247d050a0881cb49e4a582bc1a311f9bc6be0 \ No newline at end of file diff --git a/.idea/sonarlint/securityhotspotstore/index.pb b/.idea/sonarlint/securityhotspotstore/index.pb deleted file mode 100644 index 6149509..0000000 --- a/.idea/sonarlint/securityhotspotstore/index.pb +++ /dev/null @@ -1,49 +0,0 @@ - -� -Wbonus-modules/bonus-file/src/main/java/com/bonus/file/controller/SysFileController.java,d/5/d56c65f042936ed45626ea96a8a3be8a1f991518 -7 -pom.xml,4/4/442292b8a7efeabbe4cc176709b833b1792140ec -� -Qbonus-modules/bonus-file/src/main/java/com/bonus/file/config/ResourcesConfig.java,7/c/7ce726513da4afdbc3421b816e8def845a39a0bb -A -bonus-api/pom.xml,4/d/4d66766070d502e9495acbf654cd20829c4425b3 -� -^bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysUserServiceImpl.java,a/a/aa608ec83cbef0157ad034a45ce178fe8d3e1f1d -� -Vbonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysUserService.java,e/9/e9e9c8aa0ae1931dc6e028fc6aa2a4445d3ba19e -} -Mbonus-modules/bonus-file/src/main/java/com/bonus/file/config/MinioConfig.java,5/0/5004442f77e22ef4c1d07b99806239bb7fb7ffbd - -Obonus-modules/bonus-file/src/main/java/com/bonus/file/BonusFileApplication.java,1/f/1fd70d40f7c9cb50a47ee5948b3fd37458651d5f -R -"bonus-visual/bonus-monitor/pom.xml,a/5/a567507002bfc4cb69f800244bcc422fbcc10e5d -� -[bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysUserController.java,5/f/5f3e07e732703a75dec38fdc223ff19f81693be2 -� -Rbonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileDownloadUtils.java,9/7/9722eda79f36a8f93bcf90763a02040c63aa2fde -� -Tbonus-api/bonus-api-system/src/main/java/com/bonus/system/api/RemoteFileService.java,8/4/840a68431ce1f8c33ff92941ebcdc18c832f00e4 -~ -Nbonus-gateway/src/main/java/com/bonus/gateway/service/ValidateCodeService.java,d/6/d6fecdfdef18b3d6832231c6f1b018c886d4fab8 -z -Jbonus-gateway/src/main/java/com/bonus/gateway/BonusGatewayApplication.java,2/c/2cc24e5aa9771bcc9b5a17544600b0e244d9c2ad -q -Abonus-auth/src/main/java/com/bonus/auth/BonusAuthApplication.java,9/1/911ccbfd7be6b58e893061cdfb63c958e37d6eda -D -sql/bns_20240604.sql,8/5/85b1974774f16ce7959a122e4766c9a31a7a7895 -� -\bonus-modules/bonus-file/src/main/java/com/bonus/file/service/FastDfsSysFileServiceImpl.java,c/6/c6d854777bca75255487810d12805069bf1a4f45 -P - bonus-modules/bonus-file/pom.xml,0/f/0fbb26476b87bedf6f864aa5d52284b75bde6869 -� -Ubonus-modules/bonus-system/src/main/java/com/bonus/system/BonusSystemApplication.java,a/7/a7445a685a0b55cc0d903c370a10674cfbd15608 -E -bonus-modules/pom.xml,7/3/73fe31f1bc837e4395fd9296f4f1793cc44fbd07 -� -Pbonus-modules/bonus-file/src/main/java/com/bonus/file/utils/FileUploadUtils.java,c/9/c9d1df9f46abbc0b2e5a3d147c7b3407ef09b84e -� -Rbonus-modules/bonus-file/src/main/java/com/bonus/file/service/ISysFileService.java,6/7/6796766c5f6d21c9e346f89b25160c0dd6401a5b -� -Zbonus-modules/bonus-file/src/main/java/com/bonus/file/service/MinioSysFileServiceImpl.java,8/7/8721859fd7a6cfb3d43a453ba3850048c6eeb2d2 -� -Zbonus-modules/bonus-file/src/main/java/com/bonus/file/service/LocalSysFileServiceImpl.java,2/e/2ef247d050a0881cb49e4a582bc1a311f9bc6be0 \ No newline at end of file diff --git a/bonus-common/bonus-common-security/target/classes/com/bonus/common/security/utils/LogsUtils.class b/bonus-common/bonus-common-security/target/classes/com/bonus/common/security/utils/LogsUtils.class new file mode 100644 index 0000000000000000000000000000000000000000..04032b72f023291ab86735d770950d71732dc76c GIT binary patch literal 4595 zcma)AiGNgA75-jkCO4URA!JB^uoTLgObD+6LP;V9XpmqwnXnZUUS=N2gqeBM_uc@Z zuC?xK-GkcNTEzvGQVpR9Qma+#R`;#$yZ!^}PsH!O_a-v~p^)E?ceiuTJ?A^$J?9S3 z{O^fN0M_B3VQhpGMjl7QIELf$GZw}P+*^%T;#FaOULD3-yhaXR8^P;vUl@1d^-|=1 zx$O;d_(p*@NAOm>tqO0KEANn#?-Y1f81+(nJ>D&qJWz%A$iV{w@0H{C3A{gy1#qe< z{(&$)hz|+0%b9U$*2yqFjE~6AM+F{~?Lz_|i(n-lj^Gh|Tz(!E_(TLP_+$j9@UXzA zB3O-23w%c4vjV3DK39d$SK$j)I8%kk1kMUPt{~dAcWckCySfez?Cc-t+Bw+W6<088 zf6u6XRM*mac36u$Rw_H(uAs6bl}$OD6a<=@cPj{PHIs&d+MZO_=*wq@3~NvyN^>UK zV5_v1-jA?l%mA17WbJ*S`dpxn$ zHk_TtJ$b`+cI)Xpbtjs7Olw%v?VOQtMm+-uEHhykNgBDsOl1f7&uK3?#vZdBBctiL zl$JCzdMc~M$834ZZnJ$FKc#DxIo;ATG&edO4%MTDV-&2oHFFdQGiO*lRl&+zv`s;s zaXgXECyfDVO`o1IXi<&j;n8b2BW6-TwP$Lto|B<)qb70GI6(ksmxp33R|vabtzNKOpcB^;>-&XM*d{@Om91{4R zf+m?C^mJ-SAJVnMy6s4MtkHJF`}_7VOBmL&ZHDgTE!rgfp1}82Jc}PFfQlc=gLDij zm~(9k+mcVElZK_@NBFUdpJ0-dTTDI`<)(UNR!!$4FGDJ+%S)hbNo8f~-f7tMRKZNw|*9g!z%#oSeWedOhvW3j~b`4XRkc{dhOpgN{ZlAa+7 zj+R>I*CDskU4O)3w>)ZI9b?_T@hRmQxIm7Q%gPW`r|dq{>C30njDw!b8Cl-j)>3PH ztgc7OPta6S{D&3w+8|>dEA0d2)MMsrUV#CZyAc zIYKplsb|EhNDDs!%qqLLg`!HL`)?DzjLGboa)X&+0%RE<Lq?5myt zHe(A%)!2%=D8zG024(fs3e}#LVK7v@Ph`wt_YQ^AN&()bMxJ zTr8v;i|E{9Y^TF7#Zn}&+_ilZ?Q5r07q(HJmf|Ipk$*{aV~6Wmk~`YzQHW2M9?AtM zzX!eO<9Yp*l>U1&1DtsoXKE0*0!?72Kz#lj400++p?L_)#}IoGoMtMj;z}l3*Bg5p z$=Ia_aWK}`dTD(yus+lfY6w1p{?>-jnzqWu%1K1W(JtFrC$YA%vZV+?o4A1bedo}y zY67zx#RTTCjn3s~0*$?=5NZ?mhm=!S&v1SI86Lg{FUKJo6L8Ur(I}vmqt*1}4lLpN z8mwnDH&Cvfk{dC^`4LKYQgR(}*i2OS5D7u)PVB`#H_92@js29MODzGh8SoXt!&!N6-e>C`nL08a-voy_A*&eKako#l&oWxu*D)@(HF+|g`(@@`zoUw;*aAtdBYW# ivob}2d8Psu+X~opPG+MDa<~P