From e31f95b9436a9b7752a3185e2d95197c3e474e29 Mon Sep 17 00:00:00 2001 From: landaiqing Date: Tue, 24 Dec 2024 18:01:54 +0800 Subject: [PATCH] :building_construction: update --- .idea/GOHCache.xml | 2937 +++++------------ app/auth/api/auth.api | 168 + app/auth/api/auth.go | 2 +- app/auth/api/etc/auth.yaml | 16 +- app/auth/api/internal/config/config.go | 7 + .../comment/dislike_comment_handler.go | 7 +- .../comment/get_comment_list_handler.go | 6 +- .../handler/comment/get_reply_list_handler.go | 7 +- .../handler/comment/like_comment_handler.go | 7 +- .../handler/comment/submit_comment_handler.go | 7 +- .../comment/submit_reply_comment_handler.go | 7 +- .../comment/submit_reply_reply_handler.go | 7 +- app/auth/api/internal/handler/routes.go | 70 + .../handler/upscale/upload_image_handler.go | 6 +- .../websocket/file_websocket_handler.go | 4 +- .../logic/comment/dislike_comment_logic.go | 4 +- .../logic/comment/get_comment_list_logic.go | 28 +- .../logic/comment/get_reply_list_logic.go | 26 +- .../logic/comment/like_comment_logic.go | 6 +- .../logic/comment/submit_comment_logic.go | 9 +- .../comment/submit_reply_comment_logic.go | 8 +- .../logic/comment/submit_reply_reply_logic.go | 8 +- .../logic/oauth/gitee_callback_logic.go | 8 +- .../logic/oauth/github_callback_logic.go | 6 +- .../internal/logic/oauth/qq_callback_logic.go | 6 +- .../logic/upscale/upload_image_logic.go | 7 +- .../logic/user/account_login_logic.go | 12 +- .../internal/logic/user/phone_login_logic.go | 2 +- .../user/wechat_offiaccount_login_logic.go | 6 +- .../logic/websocket/file_websocket_logic.go | 16 +- app/auth/api/internal/svc/service_context.go | 17 +- .../api/internal/types/comment.go | 0 app/auth/api/internal/types/types.go | 107 + app/auth/api/model/mysql/generate/generate.go | 107 - app/auth/api/model/mysql/mysql.go | 64 - app/auth/api/model/mysql/query/gen.go | 159 - .../api => auth}/model/mongodb/collection.go | 0 .../api => auth}/model/mongodb/mongodb.go | 0 .../model/mysql/generate/generate.go | 0 .../model/mysql/model/sca_auth_menu.gen.go | 0 .../model/sca_auth_permission_rule.gen.go | 0 .../model/mysql/model/sca_auth_role.gen.go | 0 .../model/mysql/model/sca_auth_user.gen.go | 0 .../mysql/model/sca_auth_user_device.gen.go | 0 .../mysql/model/sca_auth_user_social.gen.go | 0 .../mysql/model/sca_comment_likes.gen.go | 0 .../mysql/model/sca_comment_reply.gen.go | 0 .../model/mysql/model/sca_file_folder.gen.go | 0 .../model/mysql/model/sca_file_info.gen.go | 0 .../model/mysql/model/sca_file_recycle.gen.go | 0 .../model/mysql/model/sca_file_type.gen.go | 0 .../mysql/model/sca_message_report.gen.go | 0 .../model/mysql/model/sca_user_follows.gen.go | 0 .../model/mysql/model/sca_user_level.gen.go | 0 .../model/mysql/model/sca_user_message.gen.go | 0 app/{file/api => auth}/model/mysql/mysql.go | 2 +- .../api => auth}/model/mysql/query/gen.go | 0 .../model/mysql/query/sca_auth_menu.gen.go | 3 +- .../query/sca_auth_permission_rule.gen.go | 3 +- .../model/mysql/query/sca_auth_role.gen.go | 3 +- .../model/mysql/query/sca_auth_user.gen.go | 3 +- .../mysql/query/sca_auth_user_device.gen.go | 3 +- .../mysql/query/sca_auth_user_social.gen.go | 3 +- .../mysql/query/sca_comment_likes.gen.go | 2 +- .../mysql/query/sca_comment_reply.gen.go | 2 +- .../model/mysql/query/sca_file_folder.gen.go | 2 +- .../model/mysql/query/sca_file_info.gen.go | 2 +- .../model/mysql/query/sca_file_recycle.gen.go | 2 +- .../model/mysql/query/sca_file_type.gen.go | 2 +- .../mysql/query/sca_message_report.gen.go | 2 +- .../model/mysql/query/sca_user_follows.gen.go | 2 +- .../model/mysql/query/sca_user_level.gen.go | 3 +- .../model/mysql/query/sca_user_message.gen.go | 3 +- .../resources/ip2region/ip2region.xdb | Bin .../resources/language/active.en.toml | 9 +- .../resources/language/active.zh.toml | 7 + .../resources/sensitive/dict1.txt | 0 .../resources/sensitive/dict2.txt | 0 .../resources/sensitive/其他词库.txt | 0 .../resources/sensitive/反动词库.txt | 0 .../resources/sensitive/暴恐词库.txt | 0 .../resources/sensitive/民生词库.txt | 0 .../resources/sensitive/色情词库.txt | 0 .../resources/sensitive/补充词库.txt | 0 .../resources/sensitive/贪腐词库.txt | 0 .../resources/sensitive/零时-Tencent.txt | 0 app/community/api/community.api | 152 - app/community/api/community.go | 36 - app/community/api/etc/community.yaml | 84 - app/community/api/generate.go | 3 - app/community/api/internal/config/config.go | 27 - app/community/api/internal/handler/routes.go | 63 - .../middleware/authorization_middleware.go | 20 - .../middleware/casbinverify_middleware.go | 24 - .../internal/middleware/nonce_middleware.go | 24 - .../middleware/securityheaders_middleware.go | 20 - .../api/internal/svc/service_context.go | 52 - app/community/api/internal/types/types.go | 105 - .../model/mysql/model/sca_auth_menu.gen.go | 35 - .../model/sca_auth_permission_rule.gen.go | 24 - .../model/mysql/model/sca_auth_role.gen.go | 28 - .../model/mysql/model/sca_auth_user.gen.go | 39 - .../mysql/model/sca_auth_user_device.gen.go | 39 - .../mysql/model/sca_auth_user_social.gen.go | 30 - .../model/mysql/model/sca_user_level.gen.go | 33 - .../model/mysql/model/sca_user_message.gen.go | 31 - app/community/api/model/mysql/mysql.go | 65 - .../model/mysql/query/sca_auth_menu.gen.go | 426 --- .../query/sca_auth_permission_rule.gen.go | 406 --- .../model/mysql/query/sca_auth_role.gen.go | 398 --- .../model/mysql/query/sca_auth_user.gen.go | 442 --- .../mysql/query/sca_auth_user_device.gen.go | 442 --- .../mysql/query/sca_auth_user_social.gen.go | 406 --- .../mysql/query/sca_comment_reply.gen.go | 458 --- .../model/mysql/query/sca_file_info.gen.go | 422 --- .../model/mysql/query/sca_file_type.gen.go | 402 --- .../mysql/query/sca_message_report.gen.go | 422 --- .../model/mysql/query/sca_user_level.gen.go | 418 --- .../model/mysql/query/sca_user_message.gen.go | 410 --- .../api/resources/language/active.en.toml | 8 - .../api/resources/language/active.zh.toml | 8 - app/file/api/etc/file.yaml | 72 - app/file/api/file.api | 43 - app/file/api/file.go | 38 - app/file/api/generate.go | 3 - app/file/api/internal/config/config.go | 20 - app/file/api/internal/handler/routes.go | 44 - .../internal/middleware/nonce_middleware.go | 24 - .../middleware/securityheaders_middleware.go | 20 - app/file/api/internal/svc/service_context.go | 36 - app/file/api/internal/types/types.go | 10 - app/file/api/model/mysql/generate/generate.go | 107 - .../model/mysql/model/sca_auth_menu.gen.go | 35 - .../model/sca_auth_permission_rule.gen.go | 24 - .../model/mysql/model/sca_auth_role.gen.go | 28 - .../model/mysql/model/sca_auth_user.gen.go | 39 - .../mysql/model/sca_auth_user_device.gen.go | 39 - .../mysql/model/sca_auth_user_social.gen.go | 30 - .../mysql/model/sca_comment_likes.gen.go | 25 - .../mysql/model/sca_comment_reply.gen.go | 44 - .../model/mysql/model/sca_file_folder.gen.go | 31 - .../model/mysql/model/sca_file_info.gen.go | 34 - .../model/mysql/model/sca_file_recycle.gen.go | 28 - .../model/mysql/model/sca_file_type.gen.go | 29 - .../mysql/model/sca_message_report.gen.go | 34 - .../model/mysql/model/sca_user_follows.gen.go | 29 - .../model/mysql/model/sca_user_level.gen.go | 33 - .../model/mysql/model/sca_user_message.gen.go | 31 - app/file/api/model/mysql/query/gen.go | 223 -- .../model/mysql/query/sca_auth_menu.gen.go | 426 --- .../query/sca_auth_permission_rule.gen.go | 406 --- .../model/mysql/query/sca_auth_role.gen.go | 398 --- .../model/mysql/query/sca_auth_user.gen.go | 442 --- .../mysql/query/sca_auth_user_device.gen.go | 442 --- .../mysql/query/sca_auth_user_social.gen.go | 406 --- .../mysql/query/sca_comment_likes.gen.go | 394 --- .../model/mysql/query/sca_file_folder.gen.go | 410 --- .../model/mysql/query/sca_file_recycle.gen.go | 406 --- .../model/mysql/query/sca_user_follows.gen.go | 402 --- .../model/mysql/query/sca_user_level.gen.go | 418 --- .../model/mysql/query/sca_user_message.gen.go | 410 --- .../api/resources/language/active.en.toml | 3 - .../api/resources/language/active.zh.toml | 3 - app/file/rpc/file.proto | 71 + app/file/rpc/generate.go | 3 + common/casbinx/casbin.go | 2 +- common/ip2region/ip2region.go | 5 +- common/wechat_official/wechat_official.go | 2 + 168 files changed, 1337 insertions(+), 14789 deletions(-) rename app/{community => auth}/api/internal/handler/comment/dislike_comment_handler.go (71%) rename app/{community => auth}/api/internal/handler/comment/get_comment_list_handler.go (74%) rename app/{community => auth}/api/internal/handler/comment/get_reply_list_handler.go (74%) rename app/{community => auth}/api/internal/handler/comment/like_comment_handler.go (70%) rename app/{community => auth}/api/internal/handler/comment/submit_comment_handler.go (74%) rename app/{community => auth}/api/internal/handler/comment/submit_reply_comment_handler.go (74%) rename app/{community => auth}/api/internal/handler/comment/submit_reply_reply_handler.go (74%) rename app/{file => auth}/api/internal/handler/upscale/upload_image_handler.go (74%) rename app/{file => auth}/api/internal/handler/websocket/file_websocket_handler.go (68%) rename app/{community => auth}/api/internal/logic/comment/dislike_comment_logic.go (91%) rename app/{community => auth}/api/internal/logic/comment/get_comment_list_logic.go (80%) rename app/{community => auth}/api/internal/logic/comment/get_reply_list_logic.go (81%) rename app/{community => auth}/api/internal/logic/comment/like_comment_logic.go (85%) rename app/{community => auth}/api/internal/logic/comment/submit_comment_logic.go (92%) rename app/{community => auth}/api/internal/logic/comment/submit_reply_comment_logic.go (93%) rename app/{community => auth}/api/internal/logic/comment/submit_reply_reply_logic.go (93%) rename app/{file => auth}/api/internal/logic/upscale/upload_image_logic.go (88%) rename app/{file => auth}/api/internal/logic/websocket/file_websocket_logic.go (89%) rename app/{community => auth}/api/internal/types/comment.go (100%) delete mode 100644 app/auth/api/model/mysql/generate/generate.go delete mode 100644 app/auth/api/model/mysql/mysql.go delete mode 100644 app/auth/api/model/mysql/query/gen.go rename app/{community/api => auth}/model/mongodb/collection.go (100%) rename app/{community/api => auth}/model/mongodb/mongodb.go (100%) rename app/{community/api => auth}/model/mysql/generate/generate.go (100%) rename app/auth/{api => }/model/mysql/model/sca_auth_menu.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_auth_permission_rule.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_auth_role.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_auth_user.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_auth_user_device.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_auth_user_social.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_comment_likes.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_comment_reply.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_file_folder.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_file_info.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_file_recycle.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_file_type.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_message_report.gen.go (100%) rename app/{community/api => auth}/model/mysql/model/sca_user_follows.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_user_level.gen.go (100%) rename app/auth/{api => }/model/mysql/model/sca_user_message.gen.go (100%) rename app/{file/api => auth}/model/mysql/mysql.go (96%) rename app/{community/api => auth}/model/mysql/query/gen.go (100%) rename app/auth/{api => }/model/mysql/query/sca_auth_menu.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_auth_permission_rule.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_auth_role.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_auth_user.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_auth_user_device.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_auth_user_social.gen.go (99%) rename app/{community/api => auth}/model/mysql/query/sca_comment_likes.gen.go (99%) rename app/{file/api => auth}/model/mysql/query/sca_comment_reply.gen.go (99%) rename app/{community/api => auth}/model/mysql/query/sca_file_folder.gen.go (99%) rename app/{file/api => auth}/model/mysql/query/sca_file_info.gen.go (99%) rename app/{community/api => auth}/model/mysql/query/sca_file_recycle.gen.go (99%) rename app/{file/api => auth}/model/mysql/query/sca_file_type.gen.go (99%) rename app/{file/api => auth}/model/mysql/query/sca_message_report.gen.go (99%) rename app/{community/api => auth}/model/mysql/query/sca_user_follows.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_user_level.gen.go (99%) rename app/auth/{api => }/model/mysql/query/sca_user_message.gen.go (99%) rename app/auth/{api => }/resources/ip2region/ip2region.xdb (100%) rename app/auth/{api => }/resources/language/active.en.toml (78%) rename app/auth/{api => }/resources/language/active.zh.toml (80%) rename app/{community/api => auth}/resources/sensitive/dict1.txt (100%) rename app/{community/api => auth}/resources/sensitive/dict2.txt (100%) rename app/{community/api => auth}/resources/sensitive/其他词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/反动词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/暴恐词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/民生词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/色情词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/补充词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/贪腐词库.txt (100%) rename app/{community/api => auth}/resources/sensitive/零时-Tencent.txt (100%) delete mode 100644 app/community/api/community.api delete mode 100644 app/community/api/community.go delete mode 100644 app/community/api/etc/community.yaml delete mode 100644 app/community/api/generate.go delete mode 100644 app/community/api/internal/config/config.go delete mode 100644 app/community/api/internal/handler/routes.go delete mode 100644 app/community/api/internal/middleware/authorization_middleware.go delete mode 100644 app/community/api/internal/middleware/casbinverify_middleware.go delete mode 100644 app/community/api/internal/middleware/nonce_middleware.go delete mode 100644 app/community/api/internal/middleware/securityheaders_middleware.go delete mode 100644 app/community/api/internal/svc/service_context.go delete mode 100644 app/community/api/internal/types/types.go delete mode 100644 app/community/api/model/mysql/model/sca_auth_menu.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_auth_permission_rule.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_auth_role.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_auth_user.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_auth_user_device.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_auth_user_social.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_user_level.gen.go delete mode 100644 app/community/api/model/mysql/model/sca_user_message.gen.go delete mode 100644 app/community/api/model/mysql/mysql.go delete mode 100644 app/community/api/model/mysql/query/sca_auth_menu.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_auth_permission_rule.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_auth_role.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_auth_user.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_auth_user_device.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_auth_user_social.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_comment_reply.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_file_info.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_file_type.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_message_report.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_user_level.gen.go delete mode 100644 app/community/api/model/mysql/query/sca_user_message.gen.go delete mode 100644 app/community/api/resources/language/active.en.toml delete mode 100644 app/community/api/resources/language/active.zh.toml delete mode 100644 app/file/api/etc/file.yaml delete mode 100644 app/file/api/file.api delete mode 100644 app/file/api/file.go delete mode 100644 app/file/api/generate.go delete mode 100644 app/file/api/internal/config/config.go delete mode 100644 app/file/api/internal/handler/routes.go delete mode 100644 app/file/api/internal/middleware/nonce_middleware.go delete mode 100644 app/file/api/internal/middleware/securityheaders_middleware.go delete mode 100644 app/file/api/internal/svc/service_context.go delete mode 100644 app/file/api/internal/types/types.go delete mode 100644 app/file/api/model/mysql/generate/generate.go delete mode 100644 app/file/api/model/mysql/model/sca_auth_menu.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_auth_permission_rule.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_auth_role.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_auth_user.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_auth_user_device.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_auth_user_social.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_comment_likes.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_comment_reply.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_file_folder.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_file_info.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_file_recycle.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_file_type.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_message_report.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_user_follows.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_user_level.gen.go delete mode 100644 app/file/api/model/mysql/model/sca_user_message.gen.go delete mode 100644 app/file/api/model/mysql/query/gen.go delete mode 100644 app/file/api/model/mysql/query/sca_auth_menu.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_auth_permission_rule.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_auth_role.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_auth_user.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_auth_user_device.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_auth_user_social.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_comment_likes.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_file_folder.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_file_recycle.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_user_follows.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_user_level.gen.go delete mode 100644 app/file/api/model/mysql/query/sca_user_message.gen.go delete mode 100644 app/file/api/resources/language/active.en.toml delete mode 100644 app/file/api/resources/language/active.zh.toml create mode 100644 app/file/rpc/file.proto create mode 100644 app/file/rpc/generate.go diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml index 5f92c90..acbaa8b 100644 --- a/.idea/GOHCache.xml +++ b/.idea/GOHCache.xml @@ -6,7 +6,6 @@ - @@ -14,24 +13,17 @@ - - - - - - - @@ -39,7 +31,7 @@ @@ -56,17 +48,12 @@ - @@ -76,15 +63,12 @@ - @@ -92,10 +76,7 @@ - @@ -103,8 +84,6 @@ @@ -112,8 +91,6 @@ @@ -121,18 +98,13 @@ - @@ -140,8 +112,6 @@ @@ -149,8 +119,6 @@ @@ -158,18 +126,13 @@ - @@ -178,8 +141,6 @@ @@ -189,7 +150,6 @@ @@ -241,7 +201,6 @@ @@ -275,7 +234,6 @@ @@ -285,6 +243,21 @@ + + + + + + + + + + + + @@ -323,7 +296,6 @@ - @@ -331,7 +303,6 @@ - @@ -341,7 +312,6 @@ @@ -350,7 +320,14 @@ + + + + + + @@ -383,8 +360,6 @@ @@ -393,7 +368,6 @@ @@ -401,7 +375,6 @@ @@ -409,14 +382,12 @@ - @@ -426,6 +397,7 @@ @@ -433,7 +405,7 @@ @@ -482,9 +454,7 @@ @@ -493,9 +463,7 @@ @@ -503,14 +471,12 @@ - @@ -518,7 +484,6 @@ - @@ -528,6 +493,7 @@ @@ -535,6 +501,7 @@ @@ -542,8 +509,6 @@ @@ -551,8 +516,6 @@ @@ -560,8 +523,6 @@ @@ -569,8 +530,6 @@ @@ -579,6 +538,7 @@ @@ -586,20 +546,14 @@ - + - @@ -614,11 +568,8 @@ @@ -627,9 +578,7 @@ @@ -638,9 +587,7 @@ @@ -649,9 +596,7 @@ @@ -660,9 +605,7 @@ @@ -671,9 +614,7 @@ @@ -681,9 +622,7 @@ @@ -691,9 +630,7 @@ @@ -701,9 +638,7 @@ @@ -711,9 +646,7 @@ @@ -721,9 +654,7 @@ @@ -731,9 +662,7 @@ @@ -741,9 +670,7 @@ @@ -751,9 +678,7 @@ @@ -762,9 +687,7 @@ @@ -773,9 +696,7 @@ @@ -784,8 +705,6 @@ @@ -819,8 +738,8 @@ @@ -836,7 +755,6 @@ @@ -845,7 +763,6 @@ @@ -855,7 +772,6 @@ @@ -865,7 +781,6 @@ @@ -878,6 +793,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -890,26 +833,10 @@ - - - - - - - - - - - - - @@ -931,6 +858,7 @@ @@ -938,28 +866,44 @@ - + + + + + + + + + + + + + + + + + + @@ -967,11 +911,11 @@ @@ -979,11 +923,11 @@ @@ -991,11 +935,11 @@ @@ -1003,11 +947,11 @@ @@ -1015,11 +959,11 @@ @@ -1027,11 +971,11 @@ @@ -1039,11 +983,11 @@ @@ -1051,11 +995,11 @@ @@ -1063,11 +1007,11 @@ @@ -1075,11 +1019,11 @@ @@ -1087,11 +1031,11 @@ @@ -1099,187 +1043,187 @@ - - - - - - - - - - - - - - - - @@ -1287,11 +1231,11 @@ @@ -1299,11 +1243,11 @@ @@ -1311,11 +1255,11 @@ @@ -1323,11 +1267,25 @@ + + + + + + + + + + + + @@ -1338,111 +1296,28 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -