diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml
index 3d2d4cc..bc256a7 100644
--- a/.idea/GOHCache.xml
+++ b/.idea/GOHCache.xml
@@ -45,6 +45,13 @@
             </set>
           </value>
         </entry>
+        <entry key="CommentContent">
+          <value>
+            <set>
+              <option value="file://$PROJECT_DIR$/app/core/api/internal/types/comment_types.go" />
+            </set>
+          </value>
+        </entry>
         <entry key="CommentDisLikeRequest">
           <value>
             <set>
@@ -52,13 +59,6 @@
             </set>
           </value>
         </entry>
-        <entry key="CommentImage">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mongodb/types/comment_image.go" />
-            </set>
-          </value>
-        </entry>
         <entry key="CommentImages">
           <value>
             <set>
@@ -73,6 +73,20 @@
             </set>
           </value>
         </entry>
+        <entry key="CommentListPageResponse">
+          <value>
+            <set>
+              <option value="file://$PROJECT_DIR$/app/core/api/internal/types/comment_types.go" />
+            </set>
+          </value>
+        </entry>
+        <entry key="CommentListQueryResult">
+          <value>
+            <set>
+              <option value="file://$PROJECT_DIR$/app/core/api/internal/types/comment_types.go" />
+            </set>
+          </value>
+        </entry>
         <entry key="CommentListRequest">
           <value>
             <set>
@@ -374,6 +388,13 @@
             </set>
           </value>
         </entry>
+        <entry key="ReplyListQueryResult">
+          <value>
+            <set>
+              <option value="file://$PROJECT_DIR$/app/core/api/internal/types/comment_types.go" />
+            </set>
+          </value>
+        </entry>
         <entry key="ReplyListRequest">
           <value>
             <set>
@@ -413,7 +434,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_menu.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_menu.go" />
             </set>
           </value>
         </entry>
@@ -421,7 +441,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_permission_rule.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_permission_rule.go" />
             </set>
           </value>
         </entry>
@@ -429,7 +448,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_role.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_role.go" />
             </set>
           </value>
         </entry>
@@ -437,7 +455,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user.go" />
             </set>
           </value>
         </entry>
@@ -445,7 +462,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_device.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_device.go" />
             </set>
           </value>
         </entry>
@@ -453,7 +469,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_social.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_social.go" />
             </set>
           </value>
         </entry>
@@ -464,18 +479,10 @@
             </set>
           </value>
         </entry>
-        <entry key="ScaCommentLikes">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_likes.go" />
-            </set>
-          </value>
-        </entry>
         <entry key="ScaCommentReply">
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_reply.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_reply.go" />
             </set>
           </value>
         </entry>
@@ -483,7 +490,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_folder.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_folder.go" />
             </set>
           </value>
         </entry>
@@ -491,7 +497,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_info.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_info.go" />
             </set>
           </value>
         </entry>
@@ -499,7 +504,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_recycle.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_recycle.go" />
             </set>
           </value>
         </entry>
@@ -507,7 +511,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_type.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_type.go" />
             </set>
           </value>
         </entry>
@@ -515,7 +518,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_message_report.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_message_report.go" />
             </set>
           </value>
         </entry>
@@ -526,18 +528,10 @@
             </set>
           </value>
         </entry>
-        <entry key="ScaUserFollows">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_follows.go" />
-            </set>
-          </value>
-        </entry>
         <entry key="ScaUserLevel">
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_level.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_level.go" />
             </set>
           </value>
         </entry>
@@ -545,7 +539,6 @@
           <value>
             <set>
               <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_message.gen.go" />
-              <option value="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_message.go" />
             </set>
           </value>
         </entry>
@@ -584,13 +577,6 @@
             </set>
           </value>
         </entry>
-        <entry key="SessionData">
-          <value>
-            <set>
-              <option value="file://$PROJECT_DIR$/app/core/api/internal/types/session.go" />
-            </set>
-          </value>
-        </entry>
         <entry key="SmsSendRequest">
           <value>
             <set>
@@ -1351,7 +1337,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/handler/routes.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732123577892" />
+              <option name="lastModified" value="1732178739833" />
             </ScannedPath>
           </value>
         </entry>
@@ -1464,7 +1450,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/dislike_comment_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1731724739505" />
+              <option name="lastModified" value="1732206802641" />
               <option name="schema">
                 <list>
                   <option value="DislikeCommentLogic" />
@@ -1476,7 +1462,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/get_comment_list_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732090118720" />
+              <option name="lastModified" value="1732187874238" />
               <option name="schema">
                 <list>
                   <option value="GetCommentListLogic" />
@@ -1488,7 +1474,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/get_reply_list_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1731649071023" />
+              <option name="lastModified" value="1732204593983" />
               <option name="schema">
                 <list>
                   <option value="GetReplyListLogic" />
@@ -1500,7 +1486,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/like_comment_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1731649071021" />
+              <option name="lastModified" value="1732206803475" />
               <option name="schema">
                 <list>
                   <option value="LikeCommentLogic" />
@@ -1512,7 +1498,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/submit_comment_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099603" />
+              <option name="lastModified" value="1732205167683" />
               <option name="schema">
                 <list>
                   <option value="SubmitCommentLogic" />
@@ -1524,7 +1510,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/submit_reply_comment_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099619" />
+              <option name="lastModified" value="1732206803314" />
               <option name="schema">
                 <list>
                   <option value="SubmitReplyCommentLogic" />
@@ -1536,7 +1522,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/comment/submit_reply_reply_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099603" />
+              <option name="lastModified" value="1732206752952" />
               <option name="schema">
                 <list>
                   <option value="SubmitReplyReplyLogic" />
@@ -1596,7 +1582,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/oauth/gitee_callback_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099603" />
+              <option name="lastModified" value="1732207514893" />
               <option name="schema">
                 <list>
                   <option value="GiteeCallbackLogic" />
@@ -1610,7 +1596,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/oauth/github_callback_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099580" />
+              <option name="lastModified" value="1732207593259" />
               <option name="schema">
                 <list>
                   <option value="GithubCallbackLogic" />
@@ -1623,7 +1609,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/oauth/qq_callback_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099587" />
+              <option name="lastModified" value="1732207592449" />
               <option name="schema">
                 <list>
                   <option value="QqCallbackLogic" />
@@ -1638,7 +1624,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/oauth/wechat_callback_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099587" />
+              <option name="lastModified" value="1732207592457" />
               <option name="schema">
                 <list>
                   <option value="WechatCallbackLogic" />
@@ -1698,7 +1684,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/user/account_login_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099580" />
+              <option name="lastModified" value="1732207461448" />
               <option name="schema">
                 <list>
                   <option value="AccountLoginLogic" />
@@ -1722,7 +1708,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/logic/user/phone_login_logic.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732164099587" />
+              <option name="lastModified" value="1732207481081" />
               <option name="schema">
                 <list>
                   <option value="PhoneLoginLogic" />
@@ -1808,11 +1794,15 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/types/comment_types.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732158442383" />
+              <option name="lastModified" value="1732204594475" />
               <option name="schema">
                 <list>
-                  <option value="CommentResponse" />
                   <option value="CommentImages" />
+                  <option value="CommentResponse" />
+                  <option value="CommentContent" />
+                  <option value="CommentListPageResponse" />
+                  <option value="CommentListQueryResult" />
+                  <option value="ReplyListQueryResult" />
                 </list>
               </option>
             </ScannedPath>
@@ -1830,22 +1820,10 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/internal/types/session.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731558663074" />
-              <option name="schema">
-                <list>
-                  <option value="SessionData" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/types/types.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732123577889" />
+              <option name="lastModified" value="1732178739829" />
               <option name="schema">
                 <list>
                   <option value="AccountLoginRequest" />
@@ -1911,13 +1889,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/casbinx/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732089933416" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/idgenerator/idgenerator.go">
           <value>
             <ScannedPath>
@@ -1925,20 +1896,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/idgenerator/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731561557146" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/ip2region/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731512008624" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/ip2region/ip2region.go">
           <value>
             <ScannedPath>
@@ -1953,13 +1910,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mongodb/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731467940093" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mongodb/mongodb.go">
           <value>
             <ScannedPath>
@@ -1967,55 +1917,17 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mongodb/types/comment_image.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731502491633" />
-              <option name="schema">
-                <list>
-                  <option value="CommentImage" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/generate.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732119049750" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/generate/generate.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732163724260" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732122222763" />
+              <option name="lastModified" value="1732166449406" />
             </ScannedPath>
           </value>
         </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_menu.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416173" />
-              <option name="schema">
-                <list>
-                  <option value="ScaAuthMenu" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_menu.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534931" />
+              <option name="lastModified" value="1732166474380" />
               <option name="schema">
                 <list>
                   <option value="ScaAuthMenu" />
@@ -2027,19 +1939,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_permission_rule.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416235" />
-              <option name="schema">
-                <list>
-                  <option value="ScaAuthPermissionRule" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_permission_rule.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732087589462" />
+              <option name="lastModified" value="1732166474446" />
               <option name="schema">
                 <list>
                   <option value="ScaAuthPermissionRule" />
@@ -2051,19 +1951,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_role.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416076" />
-              <option name="schema">
-                <list>
-                  <option value="ScaAuthRole" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_role.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534916" />
+              <option name="lastModified" value="1732166474390" />
               <option name="schema">
                 <list>
                   <option value="ScaAuthRole" />
@@ -2075,19 +1963,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416326" />
-              <option name="schema">
-                <list>
-                  <option value="ScaAuthUser" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534926" />
+              <option name="lastModified" value="1732166474441" />
               <option name="schema">
                 <list>
                   <option value="ScaAuthUser" />
@@ -2099,19 +1975,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_device.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416190" />
-              <option name="schema">
-                <list>
-                  <option value="ScaAuthUserDevice" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_device.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732095326986" />
+              <option name="lastModified" value="1732166474679" />
               <option name="schema">
                 <list>
                   <option value="ScaAuthUserDevice" />
@@ -2123,19 +1987,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_social.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416183" />
-              <option name="schema">
-                <list>
-                  <option value="ScaAuthUserSocial" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_auth_user_social.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534904" />
+              <option name="lastModified" value="1732166474370" />
               <option name="schema">
                 <list>
                   <option value="ScaAuthUserSocial" />
@@ -2147,7 +1999,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_likes.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416055" />
+              <option name="lastModified" value="1732166474424" />
               <option name="schema">
                 <list>
                   <option value="ScaCommentLike" />
@@ -2156,34 +2008,10 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_likes.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088306734" />
-              <option name="schema">
-                <list>
-                  <option value="ScaCommentLikes" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_reply.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416140" />
-              <option name="schema">
-                <list>
-                  <option value="ScaCommentReply" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_comment_reply.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732098716907" />
+              <option name="lastModified" value="1732166479398" />
               <option name="schema">
                 <list>
                   <option value="ScaCommentReply" />
@@ -2195,19 +2023,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_folder.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416092" />
-              <option name="schema">
-                <list>
-                  <option value="ScaFileFolder" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_folder.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534907" />
+              <option name="lastModified" value="1732166474632" />
               <option name="schema">
                 <list>
                   <option value="ScaFileFolder" />
@@ -2219,19 +2035,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_info.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416173" />
-              <option name="schema">
-                <list>
-                  <option value="ScaFileInfo" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_info.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534913" />
+              <option name="lastModified" value="1732166474639" />
               <option name="schema">
                 <list>
                   <option value="ScaFileInfo" />
@@ -2243,19 +2047,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_recycle.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416137" />
-              <option name="schema">
-                <list>
-                  <option value="ScaFileRecycle" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_recycle.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534929" />
+              <option name="lastModified" value="1732166474335" />
               <option name="schema">
                 <list>
                   <option value="ScaFileRecycle" />
@@ -2267,19 +2059,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_type.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416381" />
-              <option name="schema">
-                <list>
-                  <option value="ScaFileType" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_file_type.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534918" />
+              <option name="lastModified" value="1732166474406" />
               <option name="schema">
                 <list>
                   <option value="ScaFileType" />
@@ -2291,19 +2071,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_message_report.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416101" />
-              <option name="schema">
-                <list>
-                  <option value="ScaMessageReport" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_message_report.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534934" />
+              <option name="lastModified" value="1732166474416" />
               <option name="schema">
                 <list>
                   <option value="ScaMessageReport" />
@@ -2315,7 +2083,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_follows.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416391" />
+              <option name="lastModified" value="1732166474680" />
               <option name="schema">
                 <list>
                   <option value="ScaUserFollow" />
@@ -2324,34 +2092,10 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_follows.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534921" />
-              <option name="schema">
-                <list>
-                  <option value="ScaUserFollows" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_level.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416202" />
-              <option name="schema">
-                <list>
-                  <option value="ScaUserLevel" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_level.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534937" />
+              <option name="lastModified" value="1732166474370" />
               <option name="schema">
                 <list>
                   <option value="ScaUserLevel" />
@@ -2363,19 +2107,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_message.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122416390" />
-              <option name="schema">
-                <list>
-                  <option value="ScaUserMessage" />
-                </list>
-              </option>
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/model/sca_user_message.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732088534910" />
+              <option name="lastModified" value="1732166474371" />
               <option name="schema">
                 <list>
                   <option value="ScaUserMessage" />
@@ -2394,7 +2126,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417947" />
+              <option name="lastModified" value="1732166480938" />
               <option name="schema">
                 <list>
                   <option value="Query" />
@@ -2408,7 +2140,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_auth_menu.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417569" />
+              <option name="lastModified" value="1732166480522" />
               <option name="schema">
                 <list>
                   <option value="scaAuthMenu" />
@@ -2421,7 +2153,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_auth_permission_rule.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417505" />
+              <option name="lastModified" value="1732166480486" />
               <option name="schema">
                 <list>
                   <option value="scaAuthPermissionRule" />
@@ -2434,7 +2166,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_auth_role.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417745" />
+              <option name="lastModified" value="1732166480481" />
               <option name="schema">
                 <list>
                   <option value="scaAuthRole" />
@@ -2447,7 +2179,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_auth_user.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417557" />
+              <option name="lastModified" value="1732166480731" />
               <option name="schema">
                 <list>
                   <option value="scaAuthUser" />
@@ -2460,7 +2192,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_auth_user_device.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417736" />
+              <option name="lastModified" value="1732166480552" />
               <option name="schema">
                 <list>
                   <option value="scaAuthUserDevice" />
@@ -2473,7 +2205,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_auth_user_social.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417542" />
+              <option name="lastModified" value="1732166480461" />
               <option name="schema">
                 <list>
                   <option value="scaAuthUserSocial" />
@@ -2486,7 +2218,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_comment_likes.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417525" />
+              <option name="lastModified" value="1732166480445" />
               <option name="schema">
                 <list>
                   <option value="scaCommentLike" />
@@ -2499,7 +2231,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_comment_reply.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417476" />
+              <option name="lastModified" value="1732166480563" />
               <option name="schema">
                 <list>
                   <option value="scaCommentReply" />
@@ -2512,7 +2244,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_file_folder.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417430" />
+              <option name="lastModified" value="1732166480742" />
               <option name="schema">
                 <list>
                   <option value="scaFileFolder" />
@@ -2525,7 +2257,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_file_info.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417454" />
+              <option name="lastModified" value="1732166480746" />
               <option name="schema">
                 <list>
                   <option value="scaFileInfo" />
@@ -2538,7 +2270,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_file_recycle.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417570" />
+              <option name="lastModified" value="1732166480466" />
               <option name="schema">
                 <list>
                   <option value="scaFileRecycle" />
@@ -2551,7 +2283,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_file_type.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417510" />
+              <option name="lastModified" value="1732166480726" />
               <option name="schema">
                 <list>
                   <option value="scaFileType" />
@@ -2564,7 +2296,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_message_report.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417755" />
+              <option name="lastModified" value="1732166480530" />
               <option name="schema">
                 <list>
                   <option value="scaMessageReport" />
@@ -2577,7 +2309,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_user_follows.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417454" />
+              <option name="lastModified" value="1732166480467" />
               <option name="schema">
                 <list>
                   <option value="scaUserFollow" />
@@ -2590,7 +2322,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_user_level.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417540" />
+              <option name="lastModified" value="1732166480542" />
               <option name="schema">
                 <list>
                   <option value="scaUserLevel" />
@@ -2603,7 +2335,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/query/sca_user_message.gen.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732122417716" />
+              <option name="lastModified" value="1732166480523" />
               <option name="schema">
                 <list>
                   <option value="scaUserMessage" />
@@ -2613,20 +2345,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/mysql/sync.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1732089492350" />
-            </ScannedPath>
-          </value>
-        </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/redis_session/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731845841399" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/redis_session/redis_session.go">
           <value>
             <ScannedPath>
@@ -2634,13 +2352,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/redisx/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731518783002" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/redisx/redis.go">
           <value>
             <ScannedPath>
@@ -2648,13 +2359,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/sensitivex/inti.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731598869766" />
-            </ScannedPath>
-          </value>
-        </entry>
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/sensitivex/sensitive.go">
           <value>
             <ScannedPath>
@@ -2669,13 +2373,6 @@
             </ScannedPath>
           </value>
         </entry>
-        <entry key="file://$PROJECT_DIR$/app/core/api/repository/wechat_public/init.go">
-          <value>
-            <ScannedPath>
-              <option name="lastModified" value="1731579992706" />
-            </ScannedPath>
-          </value>
-        </entry>
       </map>
     </option>
     <option name="tableStructMapping">
@@ -2686,10 +2383,12 @@
         <entry key="account_login_request" value="AccountLoginRequest" />
         <entry key="auth_q_qme" value="AuthQQme" />
         <entry key="casbin_verify_middleware" value="CasbinVerifyMiddleware" />
+        <entry key="comment_content" value="CommentContent" />
         <entry key="comment_dis_like_request" value="CommentDisLikeRequest" />
-        <entry key="comment_image" value="CommentImage" />
         <entry key="comment_images" value="CommentImages" />
         <entry key="comment_like_request" value="CommentLikeRequest" />
+        <entry key="comment_list_page_response" value="CommentListPageResponse" />
+        <entry key="comment_list_query_result" value="CommentListQueryResult" />
         <entry key="comment_list_request" value="CommentListRequest" />
         <entry key="comment_request" value="CommentRequest" />
         <entry key="comment_response" value="CommentResponse" />
@@ -2734,6 +2433,7 @@
         <entry key="refresh_jwt_payload" value="RefreshJWTPayload" />
         <entry key="refresh_token_logic" value="RefreshTokenLogic" />
         <entry key="reply_comment_request" value="ReplyCommentRequest" />
+        <entry key="reply_list_query_result" value="ReplyListQueryResult" />
         <entry key="reply_list_request" value="ReplyListRequest" />
         <entry key="reply_reply_request" value="ReplyReplyRequest" />
         <entry key="reset_password_logic" value="ResetPasswordLogic" />
@@ -2753,7 +2453,6 @@
         <entry key="sca_auth_user_social_do" value="scaAuthUserSocialDo" />
         <entry key="sca_comment_like" value="scaCommentLike" />
         <entry key="sca_comment_like_do" value="scaCommentLikeDo" />
-        <entry key="sca_comment_likes" value="ScaCommentLikes" />
         <entry key="sca_comment_reply" value="scaCommentReply" />
         <entry key="sca_comment_reply_do" value="scaCommentReplyDo" />
         <entry key="sca_file_folder" value="scaFileFolder" />
@@ -2768,7 +2467,6 @@
         <entry key="sca_message_report_do" value="scaMessageReportDo" />
         <entry key="sca_user_follow" value="scaUserFollow" />
         <entry key="sca_user_follow_do" value="scaUserFollowDo" />
-        <entry key="sca_user_follows" value="ScaUserFollows" />
         <entry key="sca_user_level" value="scaUserLevel" />
         <entry key="sca_user_level_do" value="scaUserLevelDo" />
         <entry key="sca_user_message" value="scaUserMessage" />
@@ -2778,7 +2476,6 @@
         <entry key="send_sms_by_smsbao_logic" value="SendSmsBySmsbaoLogic" />
         <entry key="send_sms_by_test_logic" value="SendSmsByTestLogic" />
         <entry key="service_context" value="ServiceContext" />
-        <entry key="session_data" value="SessionData" />
         <entry key="sms_send_request" value="SmsSendRequest" />
         <entry key="submit_comment_logic" value="SubmitCommentLogic" />
         <entry key="submit_reply_comment_logic" value="SubmitReplyCommentLogic" />
@@ -2787,6 +2484,6 @@
         <entry key="wechat_callback_logic" value="WechatCallbackLogic" />
       </map>
     </option>
-    <option name="lastTimeChecked" value="1732116692127" />
+    <option name="lastTimeChecked" value="1732203656738" />
   </component>
 </project>
\ No newline at end of file
diff --git a/app/core/api/core.api b/app/core/api/core.api
index 1fef782..92a98a5 100644
--- a/app/core/api/core.api
+++ b/app/core/api/core.api
@@ -103,16 +103,16 @@ type (
 	// 评论列表请求参数
 	CommentListRequest {
 		TopicId string `json:"topic_id"`
-		Page    int64  `json:"page,default=1,optional"`
-		Size    int64  `json:"size,default=5,optional"`
+		Page    int    `json:"page,default=1,optional"`
+		Size    int    `json:"size,default=5,optional"`
 		IsHot   bool   `json:"is_hot,default=true,optional"`
 	}
 	// 回复列表请求参数
 	ReplyListRequest {
 		TopicId   string `json:"topic_id"`
 		CommentId int64  `json:"comment_id"`
-		Page      int64  `json:"page,default=1,optional"`
-		Size      int64  `json:"size,default=5,optional"`
+		Page      int    `json:"page,default=1,optional"`
+		Size      int    `json:"size,default=5,optional"`
 	}
 	// 点赞评论的请求参数
 	CommentLikeRequest {
diff --git a/app/core/api/internal/logic/comment/dislike_comment_logic.go b/app/core/api/internal/logic/comment/dislike_comment_logic.go
index 5a20356..83203b0 100644
--- a/app/core/api/internal/logic/comment/dislike_comment_logic.go
+++ b/app/core/api/internal/logic/comment/dislike_comment_logic.go
@@ -2,7 +2,9 @@ package comment
 
 import (
 	"context"
+	"errors"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
 
@@ -24,7 +26,34 @@ func NewDislikeCommentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Di
 }
 
 func (l *DislikeCommentLogic) DislikeComment(req *types.CommentDisLikeRequest) (resp *types.Response, err error) {
-	// todo: add your logic here and delete this line
-
-	return
+	uid, ok := l.ctx.Value("user_id").(string)
+	if !ok {
+		return nil, errors.New("user_id not found in context")
+	}
+	tx := l.svcCtx.DB.Begin()
+	commentLike := l.svcCtx.DB.ScaCommentLike
+	resultInfo, err := tx.ScaCommentLike.Where(commentLike.TopicID.Eq(req.TopicId), commentLike.CommentID.Eq(req.CommentId), commentLike.UserID.Eq(uid)).Delete()
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	if resultInfo.RowsAffected == 0 {
+		_ = tx.Rollback()
+		return response.ErrorWithI18n(l.ctx, "comment.CancelLikeError"), nil
+	}
+	comment := l.svcCtx.DB.ScaCommentReply
+	updates, err := tx.ScaCommentReply.Where(comment.TopicID.Eq(req.TopicId), comment.ID.Eq(req.CommentId)).Update(comment.Likes, comment.Likes.Sub(1))
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	if updates.RowsAffected == 0 {
+		_ = tx.Rollback()
+		return response.ErrorWithI18n(l.ctx, "comment.LikeError"), nil
+	}
+	err = tx.Commit()
+	if err != nil {
+		return nil, err
+	}
+	return response.Success(), nil
 }
diff --git a/app/core/api/internal/logic/comment/get_comment_list_logic.go b/app/core/api/internal/logic/comment/get_comment_list_logic.go
index 1a58c1c..fe30946 100644
--- a/app/core/api/internal/logic/comment/get_comment_list_logic.go
+++ b/app/core/api/internal/logic/comment/get_comment_list_logic.go
@@ -2,17 +2,28 @@ package comment
 
 import (
 	"context"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"sync"
 
+	"github.com/chenmingyong0423/go-mongox/v2/builder/query"
 	"github.com/zeromicro/go-zero/core/logx"
+	"gorm.io/gen/field"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/constant"
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
+	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mongodb/collection"
 )
 
 type GetCommentListLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
+	wg     sync.WaitGroup
 }
 
 func NewGetCommentListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetCommentListLogic {
@@ -25,11 +36,128 @@ func NewGetCommentListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *Ge
 
 func (l *GetCommentListLogic) GetCommentList(req *types.CommentListRequest) (resp *types.Response, err error) {
 	// 获取用户ID
-	// uid, ok := l.ctx.Value("user_id").(string)
-	// if !ok {
-	// 	return nil, errors.New("user_id not found in context")
-	// }
+	uid, ok := l.ctx.Value("user_id").(string)
+	if !ok {
+		return nil, errors.New("user_id not found in context")
+	}
+	var commentQueryList []types.CommentListQueryResult
+	comment := l.svcCtx.DB.ScaCommentReply
+	user := l.svcCtx.DB.ScaAuthUser
+	var orderConditions []field.Expr
 
-	// 查询评论列表
-	return
+	if req.IsHot {
+		orderConditions = append(orderConditions, comment.Likes.Desc(), comment.ReplyCount.Desc())
+	} else {
+		orderConditions = append(orderConditions, comment.CreatedAt.Desc())
+	}
+	count, err := comment.Select(
+		comment.ID,
+		comment.UserID,
+		comment.TopicID,
+		comment.Content,
+		comment.CreatedAt,
+		comment.Author,
+		comment.Likes,
+		comment.ReplyCount,
+		comment.Browser,
+		comment.OperatingSystem,
+		comment.Location,
+		user.Avatar,
+		user.Nickname,
+	).LeftJoin(user, comment.UserID.EqCol(user.UID)).
+		Where(comment.TopicID.Eq(req.TopicId), comment.CommentType.Eq(constant.COMMENT)).
+		Order(orderConditions...).
+		ScanByPage(&commentQueryList, (req.Page-1)*req.Size, req.Size)
+	if err != nil {
+		return nil, err
+	}
+	if count == 0 || len(commentQueryList) == 0 {
+		return response.SuccessWithData(types.CommentListPageResponse{
+			Total:   count,
+			Size:    req.Size,
+			Current: req.Page,
+		}), nil
+	}
+	// **************** 获取评论Id和用户Id ************
+	commentIds := make([]int64, 0, len(commentQueryList))
+	for _, commentList := range commentQueryList {
+		commentIds = append(commentIds, commentList.ID)
+	}
+	l.wg.Add(2)
+
+	// *************** 获取评论点赞状态 **********
+	likeMap := make(map[int64]bool)
+	go func() {
+		defer l.wg.Done()
+		commentLike := l.svcCtx.DB.ScaCommentLike
+		likeList, err := commentLike.Where(
+			commentLike.TopicID.Eq(req.TopicId),
+			commentLike.UserID.Eq(uid),
+			commentLike.CommentID.In(commentIds...)).
+			Find()
+		if err != nil {
+			logx.Error(err)
+			return
+		}
+		for _, like := range likeList {
+			likeMap[like.CommentID] = true
+		}
+	}()
+	// ***************获取评论图片 **********
+	commentImageMap := make(map[int64][]string)
+	go func() {
+		defer l.wg.Done()
+		newCollection := collection.MustNewCollection[types.CommentImages](l.svcCtx, constant.COMMENT_IMAGES)
+		commentImages, err := newCollection.Finder().
+			Filter(query.Eq("topic_id", req.TopicId)).
+			Filter(query.In("comment_id", commentIds...)).
+			Find(l.ctx)
+		if err != nil {
+			logx.Error(err)
+			return
+		}
+
+		for _, image := range commentImages {
+			if len(image.Images) == 0 {
+				continue
+			}
+			imagesBase64 := make([]string, len(image.Images))
+			for i, img := range image.Images {
+				imagesBase64[i] = fmt.Sprintf("data:%s;base64,%s", utils.GetMimeType(img), base64.StdEncoding.EncodeToString(img))
+			}
+			commentImageMap[image.CommentId] = imagesBase64
+		}
+	}()
+	l.wg.Wait()
+
+	// *************** 组装数据 **********
+	result := make([]types.CommentContent, 0, len(commentQueryList))
+	for _, commentData := range commentQueryList {
+		commentContent := types.CommentContent{
+			Avatar:          commentData.Avatar,
+			NickName:        commentData.Nickname,
+			Content:         commentData.Content,
+			CreatedTime:     commentData.CreatedAt,
+			Level:           0,
+			Id:              commentData.ID,
+			UserId:          commentData.UserID,
+			TopicId:         commentData.TopicID,
+			IsAuthor:        commentData.Author,
+			Likes:           commentData.Likes,
+			ReplyCount:      commentData.ReplyCount,
+			Location:        commentData.Location,
+			Browser:         commentData.Browser,
+			OperatingSystem: commentData.OperatingSystem,
+			IsLiked:         likeMap[commentData.ID],
+			Images:          commentImageMap[commentData.ID],
+		}
+		result = append(result, commentContent)
+	}
+	commentListPageResponse := types.CommentListPageResponse{
+		Total:    count,
+		Size:     req.Size,
+		Current:  req.Page,
+		Comments: result,
+	}
+	return response.SuccessWithData(commentListPageResponse), nil
 }
diff --git a/app/core/api/internal/logic/comment/get_reply_list_logic.go b/app/core/api/internal/logic/comment/get_reply_list_logic.go
index 89a0652..f223e6d 100644
--- a/app/core/api/internal/logic/comment/get_reply_list_logic.go
+++ b/app/core/api/internal/logic/comment/get_reply_list_logic.go
@@ -2,9 +2,19 @@ package comment
 
 import (
 	"context"
+	"encoding/base64"
+	"errors"
+	"fmt"
+	"sync"
 
+	"github.com/chenmingyong0423/go-mongox/v2/builder/query"
+
+	"schisandra-album-cloud-microservices/app/core/api/common/constant"
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
+	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mongodb/collection"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -13,6 +23,7 @@ type GetReplyListLogic struct {
 	logx.Logger
 	ctx    context.Context
 	svcCtx *svc.ServiceContext
+	wg     sync.WaitGroup
 }
 
 func NewGetReplyListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetReplyListLogic {
@@ -24,7 +35,134 @@ func NewGetReplyListLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetR
 }
 
 func (l *GetReplyListLogic) GetReplyList(req *types.ReplyListRequest) (resp *types.Response, err error) {
-	// todo: add your logic here and delete this line
+	// 获取用户ID
+	uid, ok := l.ctx.Value("user_id").(string)
+	if !ok {
+		return nil, errors.New("user_id not found in context")
+	}
+	var replyQueryList []types.ReplyListQueryResult
+	reply := l.svcCtx.DB.ScaCommentReply
+	user := l.svcCtx.DB.ScaAuthUser
+	commentUser := user.As("comment_user")
+	replyUser := user.As("reply_user")
 
-	return
+	count, err := reply.Select(
+		reply.ID,
+		reply.UserID,
+		reply.TopicID,
+		reply.Content,
+		reply.CreatedAt,
+		reply.Author,
+		reply.ReplyCount,
+		reply.Likes,
+		reply.Browser,
+		reply.OperatingSystem,
+		reply.Location,
+		reply.ReplyUser,
+		reply.ReplyTo,
+		reply.ReplyID,
+		commentUser.Avatar,
+		commentUser.Nickname,
+		replyUser.Nickname.As("reply_nickname"),
+	).LeftJoin(commentUser, reply.UserID.EqCol(commentUser.UID)).
+		LeftJoin(replyUser, reply.ReplyUser.EqCol(replyUser.UID)).
+		Where(reply.TopicID.Eq(req.TopicId), reply.CommentType.Eq(constant.REPLY)).
+		Order(reply.Likes.Desc(), reply.CreatedAt.Desc()).
+		ScanByPage(&replyQueryList, (req.Page-1)*req.Size, req.Size)
+	if err != nil {
+		return nil, err
+	}
+	if count == 0 || len(replyQueryList) == 0 {
+		return response.SuccessWithData(types.CommentListPageResponse{
+			Total:   count,
+			Size:    req.Size,
+			Current: req.Page,
+		}), nil
+	}
+	// **************** 获取评论Id和用户Id ************
+	commentIds := make([]int64, 0, len(replyQueryList))
+	for _, commentList := range replyQueryList {
+		commentIds = append(commentIds, commentList.ID)
+	}
+	l.wg.Add(2)
+
+	// *************** 获取评论点赞状态 **********
+	likeMap := make(map[int64]bool)
+	go func() {
+		defer l.wg.Done()
+		commentLike := l.svcCtx.DB.ScaCommentLike
+		likeList, err := commentLike.Where(
+			commentLike.TopicID.Eq(req.TopicId),
+			commentLike.UserID.Eq(uid),
+			commentLike.CommentID.In(commentIds...)).
+			Find()
+		if err != nil {
+			logx.Error(err)
+			return
+		}
+		for _, like := range likeList {
+			likeMap[like.CommentID] = true
+		}
+	}()
+	// ***************获取评论图片 **********
+	commentImageMap := make(map[int64][]string)
+	go func() {
+		defer l.wg.Done()
+		newCollection := collection.MustNewCollection[types.CommentImages](l.svcCtx, constant.COMMENT_IMAGES)
+		commentImages, err := newCollection.Finder().
+			Filter(query.Eq("topic_id", req.TopicId)).
+			Filter(query.In("comment_id", commentIds...)).
+			Find(l.ctx)
+		if err != nil {
+			logx.Error(err)
+			return
+		}
+
+		for _, image := range commentImages {
+			if len(image.Images) == 0 {
+				continue
+			}
+			imagesBase64 := make([]string, len(image.Images))
+			for i, img := range image.Images {
+				imagesBase64[i] = fmt.Sprintf("data:%s;base64,%s", utils.GetMimeType(img), base64.StdEncoding.EncodeToString(img))
+			}
+			commentImageMap[image.CommentId] = imagesBase64
+		}
+	}()
+	l.wg.Wait()
+
+	// *************** 组装数据 **********
+	result := make([]types.CommentContent, 0, len(replyQueryList))
+	for _, replyData := range replyQueryList {
+		commentContent := types.CommentContent{
+			Avatar:          replyData.Avatar,
+			NickName:        replyData.Nickname,
+			Content:         replyData.Content,
+			CreatedTime:     replyData.CreatedAt,
+			Level:           0,
+			Id:              replyData.ID,
+			UserId:          replyData.UserID,
+			TopicId:         replyData.TopicID,
+			IsAuthor:        replyData.Author,
+			Likes:           replyData.Likes,
+			ReplyCount:      replyData.ReplyCount,
+			Location:        replyData.Location,
+			Browser:         replyData.Browser,
+			OperatingSystem: replyData.OperatingSystem,
+			IsLiked:         likeMap[replyData.ID],
+			Images:          commentImageMap[replyData.ID],
+			ReplyUser:       replyData.ReplyUser,
+			ReplyTo:         replyData.ReplyTo,
+			ReplyId:         replyData.ReplyId,
+			ReplyNickname:   replyData.ReplyNickname,
+		}
+		result = append(result, commentContent)
+	}
+	commentListPageResponse := types.CommentListPageResponse{
+		Total:    count,
+		Size:     req.Size,
+		Current:  req.Page,
+		Comments: result,
+	}
+	return response.SuccessWithData(commentListPageResponse), nil
 }
diff --git a/app/core/api/internal/logic/comment/like_comment_logic.go b/app/core/api/internal/logic/comment/like_comment_logic.go
index 4aa4d4b..10c0413 100644
--- a/app/core/api/internal/logic/comment/like_comment_logic.go
+++ b/app/core/api/internal/logic/comment/like_comment_logic.go
@@ -2,9 +2,13 @@ package comment
 
 import (
 	"context"
+	"errors"
+	"time"
 
+	"schisandra-album-cloud-microservices/app/core/api/common/response"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 
 	"github.com/zeromicro/go-zero/core/logx"
 )
@@ -24,7 +28,35 @@ func NewLikeCommentLogic(ctx context.Context, svcCtx *svc.ServiceContext) *LikeC
 }
 
 func (l *LikeCommentLogic) LikeComment(req *types.CommentLikeRequest) (resp *types.Response, err error) {
-	// todo: add your logic here and delete this line
-
-	return
+	uid, ok := l.ctx.Value("user_id").(string)
+	if !ok {
+		return nil, errors.New("user_id not found in context")
+	}
+	tx := l.svcCtx.DB.Begin()
+	commentLike := &model.ScaCommentLike{
+		CommentID: req.CommentId,
+		TopicID:   req.TopicId,
+		UserID:    uid,
+		LikeTime:  time.Now(),
+	}
+	err = tx.ScaCommentLike.Create(commentLike)
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	comment := l.svcCtx.DB.ScaCommentReply
+	updates, err := tx.ScaCommentReply.Where(comment.TopicID.Eq(req.TopicId), comment.ID.Eq(req.CommentId)).Update(comment.Likes, comment.Likes.Add(1))
+	if err != nil {
+		_ = tx.Rollback()
+		return nil, err
+	}
+	if updates.RowsAffected == 0 {
+		_ = tx.Rollback()
+		return response.ErrorWithI18n(l.ctx, "comment.LikeError"), nil
+	}
+	err = tx.Commit()
+	if err != nil {
+		return nil, err
+	}
+	return response.Success(), nil
 }
diff --git a/app/core/api/internal/logic/comment/submit_comment_logic.go b/app/core/api/internal/logic/comment/submit_comment_logic.go
index fcf57ae..5ea486a 100644
--- a/app/core/api/internal/logic/comment/submit_comment_logic.go
+++ b/app/core/api/internal/logic/comment/submit_comment_logic.go
@@ -16,6 +16,7 @@ import (
 	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mongodb/collection"
 	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 )
 
@@ -59,7 +60,7 @@ func (l *SubmitCommentLogic) SubmitComment(r *http.Request, req *types.CommentRe
 	operatingSystem := ua.OS()
 	var isAuthor int64 = 0
 	session, err := l.svcCtx.Session.Get(r, constant.SESSION_KEY)
-	if err == nil {
+	if err != nil {
 		return nil, err
 	}
 	uid, ok := session.Values["uid"].(string)
@@ -99,14 +100,16 @@ func (l *SubmitCommentLogic) SubmitComment(r *http.Request, req *types.CommentRe
 		if err != nil {
 			return nil, err
 		}
-		commentImages := types.CommentImages{
+		commentImages := &types.CommentImages{
 			UserId:    uid,
 			TopicId:   req.TopicId,
 			CommentId: comment.ID,
 			Images:    imagesData,
-			CreatedAt: comment.CreatedAt.String(),
 		}
-		if _, err = l.svcCtx.MongoClient.Collection(constant.COMMENT_IMAGES).InsertOne(l.ctx, commentImages); err != nil {
+
+		newCollection := collection.MustNewCollection[types.CommentImages](l.svcCtx, constant.COMMENT_IMAGES)
+		_, err = newCollection.Creator().InsertOne(l.ctx, commentImages)
+		if err != nil {
 			return nil, err
 		}
 	}
diff --git a/app/core/api/internal/logic/comment/submit_reply_comment_logic.go b/app/core/api/internal/logic/comment/submit_reply_comment_logic.go
index ef31e27..0dc04af 100644
--- a/app/core/api/internal/logic/comment/submit_reply_comment_logic.go
+++ b/app/core/api/internal/logic/comment/submit_reply_comment_logic.go
@@ -16,6 +16,7 @@ import (
 	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mongodb/collection"
 	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 )
 
@@ -99,7 +100,7 @@ func (l *SubmitReplyCommentLogic) SubmitReplyComment(r *http.Request, req *types
 		return nil, err
 	}
 	commentReply := l.svcCtx.DB.ScaCommentReply
-	update, err := tx.ScaCommentReply.Updates(commentReply.ReplyCount.Add(1))
+	update, err := tx.ScaCommentReply.Where(commentReply.ID.Eq(req.ReplyId)).Update(commentReply.ReplyCount, commentReply.ReplyCount.Add(1))
 	if err != nil {
 		return nil, err
 	}
@@ -113,14 +114,16 @@ func (l *SubmitReplyCommentLogic) SubmitReplyComment(r *http.Request, req *types
 			return nil, err
 		}
 
-		commentImages := types.CommentImages{
+		commentImages := &types.CommentImages{
 			UserId:    uid,
 			TopicId:   req.TopicId,
 			CommentId: reply.ID,
 			Images:    imagesData,
-			CreatedAt: reply.CreatedAt.String(),
 		}
-		if _, err = l.svcCtx.MongoClient.Collection(constant.COMMENT_IMAGES).InsertOne(l.ctx, commentImages); err != nil {
+
+		newCollection := collection.MustNewCollection[types.CommentImages](l.svcCtx, constant.COMMENT_IMAGES)
+		_, err = newCollection.Creator().InsertOne(l.ctx, commentImages)
+		if err != nil {
 			return nil, err
 		}
 	}
diff --git a/app/core/api/internal/logic/comment/submit_reply_reply_logic.go b/app/core/api/internal/logic/comment/submit_reply_reply_logic.go
index 58022df..e9c167c 100644
--- a/app/core/api/internal/logic/comment/submit_reply_reply_logic.go
+++ b/app/core/api/internal/logic/comment/submit_reply_reply_logic.go
@@ -16,6 +16,7 @@ import (
 	"schisandra-album-cloud-microservices/app/core/api/common/utils"
 	"schisandra-album-cloud-microservices/app/core/api/internal/svc"
 	"schisandra-album-cloud-microservices/app/core/api/internal/types"
+	"schisandra-album-cloud-microservices/app/core/api/repository/mongodb/collection"
 	"schisandra-album-cloud-microservices/app/core/api/repository/mysql/model"
 )
 
@@ -110,7 +111,7 @@ func (l *SubmitReplyReplyLogic) SubmitReplyReply(r *http.Request, req *types.Rep
 		return nil, err
 	}
 	commentReply := l.svcCtx.DB.ScaCommentReply
-	update, err := tx.ScaCommentReply.Updates(commentReply.ReplyCount.Add(1))
+	update, err := tx.ScaCommentReply.Where(commentReply.ID.Eq(req.ReplyId)).Update(commentReply.ReplyCount, commentReply.ReplyCount.Add(1))
 	if err != nil {
 		return nil, err
 	}
@@ -124,14 +125,16 @@ func (l *SubmitReplyReplyLogic) SubmitReplyReply(r *http.Request, req *types.Rep
 		if err != nil {
 			return nil, err
 		}
-		commentImages := types.CommentImages{
+		commentImages := &types.CommentImages{
 			UserId:    uid,
 			TopicId:   req.TopicId,
 			CommentId: replyReply.ID,
 			Images:    imagesData,
-			CreatedAt: replyReply.CreatedAt.String(),
 		}
-		if _, err = l.svcCtx.MongoClient.Collection(constant.COMMENT_IMAGES).InsertOne(l.ctx, commentImages); err != nil {
+
+		newCollection := collection.MustNewCollection[types.CommentImages](l.svcCtx, constant.COMMENT_IMAGES)
+		_, err = newCollection.Creator().InsertOne(l.ctx, commentImages)
+		if err != nil {
 			return nil, err
 		}
 	}
diff --git a/app/core/api/internal/logic/oauth/gitee_callback_logic.go b/app/core/api/internal/logic/oauth/gitee_callback_logic.go
index 855df99..0325531 100644
--- a/app/core/api/internal/logic/oauth/gitee_callback_logic.go
+++ b/app/core/api/internal/logic/oauth/gitee_callback_logic.go
@@ -107,7 +107,7 @@ func (l *GiteeCallbackLogic) GiteeCallback(w http.ResponseWriter, r *http.Reques
 	tx := l.svcCtx.DB.Begin()
 
 	userSocial := l.svcCtx.DB.ScaAuthUserSocial
-	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(Id), userSocial.Source.Eq(constant.OAuthSourceGitee), userSocial.Deleted.Eq(constant.NotDeleted)).First()
+	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(Id), userSocial.Source.Eq(constant.OAuthSourceGitee)).First()
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return err
 	}
@@ -123,7 +123,6 @@ func (l *GiteeCallbackLogic) GiteeCallback(w http.ResponseWriter, r *http.Reques
 			Nickname: giteeUser.Name,
 			Blog:     giteeUser.Blog,
 			Email:    giteeUser.Email,
-			Deleted:  constant.NotDeleted,
 			Gender:   constant.Male,
 		}
 		err = tx.ScaAuthUser.Create(addUser)
@@ -154,7 +153,7 @@ func (l *GiteeCallbackLogic) GiteeCallback(w http.ResponseWriter, r *http.Reques
 	} else {
 		authUser := l.svcCtx.DB.ScaAuthUser
 
-		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID), authUser.Deleted.Eq(constant.NotDeleted)).First()
+		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID)).First()
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			_ = tx.Rollback()
 			return err
diff --git a/app/core/api/internal/logic/oauth/github_callback_logic.go b/app/core/api/internal/logic/oauth/github_callback_logic.go
index 4e481b8..5a0cac5 100644
--- a/app/core/api/internal/logic/oauth/github_callback_logic.go
+++ b/app/core/api/internal/logic/oauth/github_callback_logic.go
@@ -106,7 +106,7 @@ func (l *GithubCallbackLogic) GithubCallback(w http.ResponseWriter, r *http.Requ
 	tx := l.svcCtx.DB.Begin()
 
 	userSocial := l.svcCtx.DB.ScaAuthUserSocial
-	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(Id), userSocial.Source.Eq(constant.OAuthSourceGithub), userSocial.Deleted.Eq(constant.NotDeleted)).First()
+	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(Id), userSocial.Source.Eq(constant.OAuthSourceGithub)).First()
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return err
 	}
@@ -116,7 +116,6 @@ func (l *GithubCallbackLogic) GithubCallback(w http.ResponseWriter, r *http.Requ
 		uid := idgen.NextId()
 		uidStr := strconv.FormatInt(uid, 10)
 
-		notDeleted := constant.NotDeleted
 		male := constant.Male
 		addUser := &model.ScaAuthUser{
 			UID:      uidStr,
@@ -125,8 +124,8 @@ func (l *GithubCallbackLogic) GithubCallback(w http.ResponseWriter, r *http.Requ
 			Nickname: gitHubUser.Name,
 			Blog:     gitHubUser.Blog,
 			Email:    gitHubUser.Email,
-			Deleted:  notDeleted,
-			Gender:   male,
+
+			Gender: male,
 		}
 		err = tx.ScaAuthUser.Create(addUser)
 		if err != nil {
@@ -157,7 +156,7 @@ func (l *GithubCallbackLogic) GithubCallback(w http.ResponseWriter, r *http.Requ
 	} else {
 		authUser := l.svcCtx.DB.ScaAuthUser
 
-		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID), authUser.Deleted.Eq(constant.NotDeleted)).First()
+		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID)).First()
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			_ = tx.Rollback()
 			return err
diff --git a/app/core/api/internal/logic/oauth/qq_callback_logic.go b/app/core/api/internal/logic/oauth/qq_callback_logic.go
index b909d62..f678b58 100644
--- a/app/core/api/internal/logic/oauth/qq_callback_logic.go
+++ b/app/core/api/internal/logic/oauth/qq_callback_logic.go
@@ -103,7 +103,7 @@ func (l *QqCallbackLogic) QqCallback(w http.ResponseWriter, r *http.Request, req
 	tx := l.svcCtx.DB.Begin()
 
 	userSocial := l.svcCtx.DB.ScaAuthUserSocial
-	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(authQQme.OpenID), userSocial.Source.Eq(constant.OAuthSourceQQ), userSocial.Deleted.Eq(constant.NotDeleted)).First()
+	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(authQQme.OpenID), userSocial.Source.Eq(constant.OAuthSourceQQ)).First()
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return err
 	}
@@ -113,14 +113,12 @@ func (l *QqCallbackLogic) QqCallback(w http.ResponseWriter, r *http.Request, req
 		uid := idgen.NextId()
 		uidStr := strconv.FormatInt(uid, 10)
 
-		notDeleted := constant.NotDeleted
 		male := constant.Male
 		addUser := &model.ScaAuthUser{
 			UID:      uidStr,
 			Avatar:   qqUserInfo.FigureurlQq1,
 			Username: authQQme.OpenID,
 			Nickname: qqUserInfo.Nickname,
-			Deleted:  notDeleted,
 			Gender:   male,
 		}
 		err = tx.ScaAuthUser.Create(addUser)
@@ -153,7 +151,7 @@ func (l *QqCallbackLogic) QqCallback(w http.ResponseWriter, r *http.Request, req
 	} else {
 		authUser := l.svcCtx.DB.ScaAuthUser
 
-		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID), authUser.Deleted.Eq(constant.NotDeleted)).First()
+		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID)).First()
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			_ = tx.Rollback()
 			return err
diff --git a/app/core/api/internal/logic/oauth/wechat_callback_logic.go b/app/core/api/internal/logic/oauth/wechat_callback_logic.go
index 1bfc590..7850c78 100644
--- a/app/core/api/internal/logic/oauth/wechat_callback_logic.go
+++ b/app/core/api/internal/logic/oauth/wechat_callback_logic.go
@@ -117,7 +117,7 @@ func (l *WechatCallbackLogic) HandlerWechatLogin(openId string, clientId string,
 	tx := l.svcCtx.DB.Begin()
 
 	userSocial := l.svcCtx.DB.ScaAuthUserSocial
-	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(openId), userSocial.Source.Eq(constant.OAuthSourceWechat), userSocial.Deleted.Eq(constant.NotDeleted)).First()
+	socialUser, err := tx.ScaAuthUserSocial.Where(userSocial.OpenID.Eq(openId), userSocial.Source.Eq(constant.OAuthSourceWechat)).First()
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return err
 	}
@@ -129,14 +129,12 @@ func (l *WechatCallbackLogic) HandlerWechatLogin(openId string, clientId string,
 		avatar := utils.GenerateAvatar(uidStr)
 		name := randomname.GenerateName()
 
-		notDeleted := constant.NotDeleted
 		male := constant.Male
 		addUser := &model.ScaAuthUser{
 			UID:      uidStr,
 			Avatar:   avatar,
 			Username: openId,
 			Nickname: name,
-			Deleted:  notDeleted,
 			Gender:   male,
 		}
 		err = tx.ScaAuthUser.Create(addUser)
@@ -181,7 +179,7 @@ func (l *WechatCallbackLogic) HandlerWechatLogin(openId string, clientId string,
 	} else {
 		authUser := l.svcCtx.DB.ScaAuthUser
 
-		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID), authUser.Deleted.Eq(constant.NotDeleted)).First()
+		authUserInfo, err := tx.ScaAuthUser.Where(authUser.UID.Eq(socialUser.UserID)).First()
 		if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 			_ = tx.Rollback()
 			return err
diff --git a/app/core/api/internal/logic/user/account_login_logic.go b/app/core/api/internal/logic/user/account_login_logic.go
index 908b5d0..c679b5b 100644
--- a/app/core/api/internal/logic/user/account_login_logic.go
+++ b/app/core/api/internal/logic/user/account_login_logic.go
@@ -45,11 +45,11 @@ func (l *AccountLoginLogic) AccountLogin(w http.ResponseWriter, r *http.Request,
 
 	switch {
 	case utils.IsPhone(req.Account):
-		selectedUser = user.Where(user.Phone.Eq(req.Account), user.Deleted.Eq(constant.NotDeleted))
+		selectedUser = user.Where(user.Phone.Eq(req.Account))
 	case utils.IsEmail(req.Account):
-		selectedUser = user.Where(user.Email.Eq(req.Account), user.Deleted.Eq(constant.NotDeleted))
+		selectedUser = user.Where(user.Email.Eq(req.Account))
 	case utils.IsUsername(req.Account):
-		selectedUser = user.Where(user.Username.Eq(req.Account), user.Deleted.Eq(constant.NotDeleted))
+		selectedUser = user.Where(user.Username.Eq(req.Account))
 	default:
 		return response.ErrorWithI18n(l.ctx, "login.invalidAccount"), nil
 	}
diff --git a/app/core/api/internal/logic/user/phone_login_logic.go b/app/core/api/internal/logic/user/phone_login_logic.go
index 48ea7a3..3676575 100644
--- a/app/core/api/internal/logic/user/phone_login_logic.go
+++ b/app/core/api/internal/logic/user/phone_login_logic.go
@@ -45,7 +45,7 @@ func (l *PhoneLoginLogic) PhoneLogin(r *http.Request, w http.ResponseWriter, req
 		return response.ErrorWithI18n(l.ctx, "login.captchaError"), nil
 	}
 	authUser := l.svcCtx.DB.ScaAuthUser
-	userInfo, err := authUser.Where(authUser.Phone.Eq(req.Phone), authUser.Deleted.Eq(constant.NotDeleted)).First()
+	userInfo, err := authUser.Where(authUser.Phone.Eq(req.Phone)).First()
 	if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
 		return nil, err
 	}
@@ -61,14 +61,12 @@ func (l *PhoneLoginLogic) PhoneLogin(r *http.Request, w http.ResponseWriter, req
 		uidStr := strconv.FormatInt(uid, 10)
 		avatar := utils.GenerateAvatar(uidStr)
 		name := randomname.GenerateName()
-		notDeleted := constant.NotDeleted
 		male := constant.Male
 		user := &model.ScaAuthUser{
 			UID:      uidStr,
 			Phone:    req.Phone,
 			Avatar:   avatar,
 			Nickname: name,
-			Deleted:  notDeleted,
 			Gender:   male,
 		}
 		err := tx.ScaAuthUser.Create(user)
diff --git a/app/core/api/internal/types/comment_types.go b/app/core/api/internal/types/comment_types.go
index bf6b968..b78e20a 100644
--- a/app/core/api/internal/types/comment_types.go
+++ b/app/core/api/internal/types/comment_types.go
@@ -1,6 +1,19 @@
 package types
 
-import "time"
+import (
+	"time"
+
+	"github.com/chenmingyong0423/go-mongox/v2"
+)
+
+// CommentImages 评论 图片
+type CommentImages struct {
+	mongox.Model `bson:",inline"`
+	TopicId      string   `json:"topic_id" bson:"topic_id"`
+	CommentId    int64    `json:"comment_id" bson:"comment_id"`
+	UserId       string   `json:"user_id" bson:"user_id"`
+	Images       [][]byte `json:"images" bson:"images"`
+}
 
 // CommentResponse 评论响应
 type CommentResponse struct {
@@ -18,11 +31,72 @@ type CommentResponse struct {
 	ReplyTo         int64     `json:"reply_to,omitempty"`
 }
 
-// CommentImages 评论图片
-type CommentImages struct {
-	TopicId   string   `json:"topic_id" bson:"topic_id"`
-	CommentId int64    `json:"comment_id" bson:"comment_id"`
-	UserId    string   `json:"user_id" bson:"user_id"`
-	Images    [][]byte `json:"images" bson:"images"`
-	CreatedAt string   `json:"created_at" bson:"created_at"`
+// CommentContent 评论内容
+type CommentContent struct {
+	NickName        string    `json:"nickname"`
+	Avatar          string    `json:"avatar"`
+	Level           int64     `json:"level,omitempty" default:"0"`
+	Id              int64     `json:"id"`
+	UserId          string    `json:"user_id"`
+	TopicId         string    `json:"topic_id"`
+	Content         string    `json:"content"`
+	ReplyTo         int64     `json:"reply_to,omitempty"`
+	ReplyId         int64     `json:"reply_id,omitempty"`
+	ReplyUser       string    `json:"reply_user,omitempty"`
+	ReplyNickname   string    `json:"reply_nickname,omitempty"`
+	IsAuthor        int64     `json:"is_author"`
+	Likes           int64     `json:"likes"`
+	ReplyCount      int64     `json:"reply_count"`
+	CreatedTime     time.Time `json:"created_time"`
+	Location        string    `json:"location"`
+	Browser         string    `json:"browser"`
+	OperatingSystem string    `json:"operating_system"`
+	IsLiked         bool      `json:"is_liked" default:"false"`
+	Images          []string  `json:"images,omitempty"`
+}
+
+// CommentListPageResponse 评论返回值
+type CommentListPageResponse struct {
+	Size     int              `json:"size"`
+	Total    int64            `json:"total"`
+	Current  int              `json:"current"`
+	Comments []CommentContent `json:"comments"`
+}
+
+// CommentListQueryResult 评论列表查询结果
+type CommentListQueryResult struct {
+	ID              int64     `json:"id"`
+	UserID          string    `json:"user_id"`
+	TopicID         string    `json:"topic_id"`
+	Content         string    `json:"content"`
+	CreatedAt       time.Time `json:"created_at"`
+	Author          int64     `json:"author"`
+	Likes           int64     `json:"likes"`
+	ReplyCount      int64     `json:"reply_count"`
+	Browser         string    `json:"browser"`
+	OperatingSystem string    `json:"operating_system"`
+	Location        string    `json:"location"`
+	Avatar          string    `json:"avatar"`
+	Nickname        string    `json:"nickname"`
+}
+
+// ReplyListQueryResult 回复列表查询结果
+type ReplyListQueryResult struct {
+	ID              int64     `json:"id"`
+	UserID          string    `json:"user_id"`
+	TopicID         string    `json:"topic_id"`
+	Content         string    `json:"content"`
+	CreatedAt       time.Time `json:"created_at"`
+	Author          int64     `json:"author"`
+	Likes           int64     `json:"likes"`
+	ReplyCount      int64     `json:"reply_count"`
+	Browser         string    `json:"browser"`
+	OperatingSystem string    `json:"operating_system"`
+	Location        string    `json:"location"`
+	Avatar          string    `json:"avatar"`
+	Nickname        string    `json:"nickname"`
+	ReplyUser       string    `json:"reply_user"`
+	ReplyId         int64     `json:"reply_id"`
+	ReplyTo         int64     `json:"reply_to"`
+	ReplyNickname   string    `json:"reply_nickname"`
 }
diff --git a/app/core/api/internal/types/types.go b/app/core/api/internal/types/types.go
index 4370e30..4461821 100644
--- a/app/core/api/internal/types/types.go
+++ b/app/core/api/internal/types/types.go
@@ -23,8 +23,8 @@ type CommentLikeRequest struct {
 
 type CommentListRequest struct {
 	TopicId string `json:"topic_id"`
-	Page    int64  `json:"page,default=1,optional"`
-	Size    int64  `json:"size,default=5,optional"`
+	Page    int    `json:"page,default=1,optional"`
+	Size    int    `json:"size,default=5,optional"`
 	IsHot   bool   `json:"is_hot,default=true,optional"`
 }
 
@@ -78,8 +78,8 @@ type ReplyCommentRequest struct {
 type ReplyListRequest struct {
 	TopicId   string `json:"topic_id"`
 	CommentId int64  `json:"comment_id"`
-	Page      int64  `json:"page,default=1,optional"`
-	Size      int64  `json:"size,default=5,optional"`
+	Page      int    `json:"page,default=1,optional"`
+	Size      int    `json:"size,default=5,optional"`
 }
 
 type ReplyReplyRequest struct {
diff --git a/app/core/api/repository/mongodb/types/comment_image.go b/app/core/api/repository/mongodb/types/comment_image.go
deleted file mode 100644
index f98103c..0000000
--- a/app/core/api/repository/mongodb/types/comment_image.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package types
-
-import "github.com/chenmingyong0423/go-mongox/v2"
-
-type CommentImage struct {
-	mongox.Model `bson:",inline"`
-	TopicID      string   `bson:"topic_id"`
-	CommentID    string   `bson:"comment_id"`
-	UserID       string   `bson:"user_id"`
-	Images       []string `bson:"images"`
-}
diff --git a/app/core/api/repository/mysql/generate/generate.go b/app/core/api/repository/mysql/generate/generate.go
index 6f14680..aadebd6 100644
--- a/app/core/api/repository/mysql/generate/generate.go
+++ b/app/core/api/repository/mysql/generate/generate.go
@@ -91,8 +91,9 @@ func main() {
 		return tag.Append("autoCreateTime")
 	})
 	softDeleteField := gen.FieldType("delete_at", "gorm.DeletedAt")
+	versionField := gen.FieldType("version", "optimisticlock.Version")
 	// 模型自定义选项组
-	fieldOpts := []gen.ModelOpt{jsonField, autoUpdateTimeField, autoCreateTimeField, softDeleteField}
+	fieldOpts := []gen.ModelOpt{jsonField, autoUpdateTimeField, autoCreateTimeField, softDeleteField, versionField}
 
 	// 创建全部模型文件, 并覆盖前面创建的同名模型
 	allModel := g.GenerateAllTable(fieldOpts...)
diff --git a/app/core/api/repository/mysql/model/sca_auth_menu.gen.go b/app/core/api/repository/mysql/model/sca_auth_menu.gen.go
index 9b4cd20..93a2f6d 100644
--- a/app/core/api/repository/mysql/model/sca_auth_menu.gen.go
+++ b/app/core/api/repository/mysql/model/sca_auth_menu.gen.go
@@ -25,7 +25,6 @@ type ScaAuthMenu struct {
 	Order_    int64          `gorm:"column:order;type:int;comment:排序" json:"order"`                                     // 排序
 	CreatedAt time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`    // 创建时间
 	UpdatedAt time.Time      `gorm:"column:updated_at;type:timestamp;autoUpdateTime;comment:更新时间" json:"updated_at"`    // 更新时间
-	Deleted   int64          `gorm:"column:deleted;type:int;comment:是否删除" json:"deleted"`                               // 是否删除
 	Remark    string         `gorm:"column:remark;type:varchar(255);comment:备注 描述" json:"remark"`                       // 备注 描述
 	DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"`                   // 删除时间
 }
diff --git a/app/core/api/repository/mysql/model/sca_auth_role.gen.go b/app/core/api/repository/mysql/model/sca_auth_role.gen.go
index dc8127e..61dc5f5 100644
--- a/app/core/api/repository/mysql/model/sca_auth_role.gen.go
+++ b/app/core/api/repository/mysql/model/sca_auth_role.gen.go
@@ -18,7 +18,6 @@ type ScaAuthRole struct {
 	RoleName  string         `gorm:"column:role_name;type:varchar(32);not null;comment:角色名称" json:"role_name"`          // 角色名称
 	RoleKey   string         `gorm:"column:role_key;type:varchar(64);not null;comment:角色关键字" json:"role_key"`           // 角色关键字
 	CreatedAt time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`    // 创建时间
-	Deleted   int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0 未删除 1 已删除" json:"deleted"`               // 是否删除 0 未删除 1 已删除
 	UpdatedAt time.Time      `gorm:"column:updated_at;type:timestamp;autoUpdateTime;comment:更新时间" json:"updated_at"`    // 更新时间
 	DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"`                   // 删除时间
 }
diff --git a/app/core/api/repository/mysql/model/sca_auth_user.gen.go b/app/core/api/repository/mysql/model/sca_auth_user.gen.go
index 29ad0e9..58ebd8f 100644
--- a/app/core/api/repository/mysql/model/sca_auth_user.gen.go
+++ b/app/core/api/repository/mysql/model/sca_auth_user.gen.go
@@ -26,7 +26,6 @@ type ScaAuthUser struct {
 	Status    int64          `gorm:"column:status;type:tinyint;comment:状态 0 正常 1 封禁" json:"status"`                                               // 状态 0 正常 1 封禁
 	Introduce string         `gorm:"column:introduce;type:varchar(255);comment:介绍" json:"introduce"`                                              // 介绍
 	CreatedAt time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`                              // 创建时间
-	Deleted   int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0 未删除 1 已删除" json:"deleted"`                                         // 是否删除 0 未删除 1 已删除
 	Blog      string         `gorm:"column:blog;type:varchar(30);comment:博客" json:"blog"`                                                         // 博客
 	Location  string         `gorm:"column:location;type:varchar(50);comment:地址" json:"location"`                                                 // 地址
 	Company   string         `gorm:"column:company;type:varchar(50);comment:公司" json:"company"`                                                   // 公司
diff --git a/app/core/api/repository/mysql/model/sca_auth_user_device.gen.go b/app/core/api/repository/mysql/model/sca_auth_user_device.gen.go
index 746b13f..0d377c0 100644
--- a/app/core/api/repository/mysql/model/sca_auth_user_device.gen.go
+++ b/app/core/api/repository/mysql/model/sca_auth_user_device.gen.go
@@ -20,7 +20,6 @@ type ScaAuthUserDevice struct {
 	Location        string         `gorm:"column:location;type:varchar(20);comment:地址" json:"location"`                       // 地址
 	Agent           string         `gorm:"column:agent;type:varchar(255);comment:设备信息" json:"agent"`                          // 设备信息
 	CreatedAt       time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`    // 创建时间
-	Deleted         int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0 未删除 1 已删除" json:"deleted"`               // 是否删除 0 未删除 1 已删除
 	Browser         string         `gorm:"column:browser;type:varchar(20);comment:浏览器" json:"browser"`                        // 浏览器
 	OperatingSystem string         `gorm:"column:operating_system;type:varchar(20);comment:操作系统" json:"operating_system"`     // 操作系统
 	BrowserVersion  string         `gorm:"column:browser_version;type:varchar(20);comment:浏览器版本" json:"browser_version"`      // 浏览器版本
diff --git a/app/core/api/repository/mysql/model/sca_auth_user_social.gen.go b/app/core/api/repository/mysql/model/sca_auth_user_social.gen.go
index 180be93..2b89ee5 100644
--- a/app/core/api/repository/mysql/model/sca_auth_user_social.gen.go
+++ b/app/core/api/repository/mysql/model/sca_auth_user_social.gen.go
@@ -20,7 +20,6 @@ type ScaAuthUserSocial struct {
 	Source    string         `gorm:"column:source;type:varchar(10);comment:第三方用户来源" json:"source"`                      // 第三方用户来源
 	Status    int64          `gorm:"column:status;type:bigint;comment:状态 0正常 1 封禁" json:"status"`                       // 状态 0正常 1 封禁
 	CreatedAt time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`    // 创建时间
-	Deleted   int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0 未删除 1 已删除" json:"deleted"`               // 是否删除 0 未删除 1 已删除
 	UpdatedAt time.Time      `gorm:"column:updated_at;type:timestamp;autoUpdateTime;comment:更新时间" json:"updated_at"`    // 更新时间
 	DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"`                   // 删除时间
 }
diff --git a/app/core/api/repository/mysql/model/sca_comment_reply.gen.go b/app/core/api/repository/mysql/model/sca_comment_reply.gen.go
index c078f79..4cd370d 100644
--- a/app/core/api/repository/mysql/model/sca_comment_reply.gen.go
+++ b/app/core/api/repository/mysql/model/sca_comment_reply.gen.go
@@ -8,34 +8,34 @@ import (
 	"time"
 
 	"gorm.io/gorm"
+	"gorm.io/plugin/optimisticlock"
 )
 
 const TableNameScaCommentReply = "sca_comment_reply"
 
 // ScaCommentReply mapped from table <sca_comment_reply>
 type ScaCommentReply struct {
-	ID              int64          `gorm:"column:id;type:bigint;primaryKey;autoIncrement:true;uniqueIndex:id,priority:1;comment:主键id" json:"id,string"` // 主键id
-	UserID          string         `gorm:"column:user_id;type:varchar(50);not null;comment:评论用户id" json:"user_id"`                                      // 评论用户id
-	TopicID         string         `gorm:"column:topic_id;type:varchar(50);comment:评论话题id" json:"topic_id"`                                             // 评论话题id
-	TopicType       int64          `gorm:"column:topic_type;type:tinyint;comment:话题类型" json:"topic_type"`                                               // 话题类型
-	Content         string         `gorm:"column:content;type:text;comment:评论内容" json:"content"`                                                        // 评论内容
-	CommentType     int64          `gorm:"column:comment_type;type:bigint;comment:评论类型 0评论 1 回复" json:"comment_type"`                                   // 评论类型 0评论 1 回复
-	ReplyTo         int64          `gorm:"column:reply_to;type:bigint;comment:回复子评论ID" json:"reply_to"`                                                 // 回复子评论ID
-	ReplyID         int64          `gorm:"column:reply_id;type:bigint;comment:回复父评论Id" json:"reply_id"`                                                 // 回复父评论Id
-	ReplyUser       string         `gorm:"column:reply_user;type:varchar(50);comment:回复人id" json:"reply_user"`                                          // 回复人id
-	Author          int64          `gorm:"column:author;type:tinyint;comment:评论回复是否作者  0否 1是" json:"author"`                                            // 评论回复是否作者  0否 1是
-	Likes           int64          `gorm:"column:likes;type:bigint;comment:点赞数" json:"likes"`                                                           // 点赞数
-	ReplyCount      int64          `gorm:"column:reply_count;type:bigint;comment:回复数量" json:"reply_count"`                                              // 回复数量
-	Deleted         int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0 未删除 1 已删除" json:"deleted"`                                         // 是否删除 0 未删除 1 已删除
-	Browser         string         `gorm:"column:browser;type:varchar(50);comment:浏览器" json:"browser"`                                                  // 浏览器
-	OperatingSystem string         `gorm:"column:operating_system;type:varchar(50);comment:操作系统" json:"operating_system"`                               // 操作系统
-	CommentIP       string         `gorm:"column:comment_ip;type:varchar(50);comment:IP地址" json:"comment_ip"`                                           // IP地址
-	Location        string         `gorm:"column:location;type:varchar(50);comment:地址" json:"location"`                                                 // 地址
-	Agent           string         `gorm:"column:agent;type:varchar(255);comment:设备信息" json:"agent"`                                                    // 设备信息
-	CreatedAt       time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`                              // 创建时间
-	UpdatedAt       time.Time      `gorm:"column:updated_at;type:timestamp;autoUpdateTime;comment:更新时间" json:"updated_at"`                              // 更新时间
-	Version         int64          `gorm:"column:version;type:bigint;comment:版本" json:"version"`                                                        // 版本
-	DeletedAt       gorm.DeletedAt `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                                              // 删除时间
+	ID              int64                  `gorm:"column:id;type:bigint;primaryKey;autoIncrement:true;uniqueIndex:id,priority:1;comment:主键id" json:"id,string"` // 主键id
+	UserID          string                 `gorm:"column:user_id;type:varchar(50);not null;comment:评论用户id" json:"user_id"`                                      // 评论用户id
+	TopicID         string                 `gorm:"column:topic_id;type:varchar(50);comment:评论话题id" json:"topic_id"`                                             // 评论话题id
+	TopicType       int64                  `gorm:"column:topic_type;type:tinyint;comment:话题类型" json:"topic_type"`                                               // 话题类型
+	Content         string                 `gorm:"column:content;type:text;comment:评论内容" json:"content"`                                                        // 评论内容
+	CommentType     int64                  `gorm:"column:comment_type;type:bigint;comment:评论类型 0评论 1 回复" json:"comment_type"`                                   // 评论类型 0评论 1 回复
+	ReplyTo         int64                  `gorm:"column:reply_to;type:bigint;comment:回复子评论ID" json:"reply_to"`                                                 // 回复子评论ID
+	ReplyID         int64                  `gorm:"column:reply_id;type:bigint;comment:回复父评论Id" json:"reply_id"`                                                 // 回复父评论Id
+	ReplyUser       string                 `gorm:"column:reply_user;type:varchar(50);comment:回复人id" json:"reply_user"`                                          // 回复人id
+	Author          int64                  `gorm:"column:author;type:tinyint;comment:评论回复是否作者  0否 1是" json:"author"`                                            // 评论回复是否作者  0否 1是
+	Likes           int64                  `gorm:"column:likes;type:bigint;comment:点赞数" json:"likes"`                                                           // 点赞数
+	ReplyCount      int64                  `gorm:"column:reply_count;type:bigint;comment:回复数量" json:"reply_count"`                                              // 回复数量
+	Browser         string                 `gorm:"column:browser;type:varchar(50);comment:浏览器" json:"browser"`                                                  // 浏览器
+	OperatingSystem string                 `gorm:"column:operating_system;type:varchar(50);comment:操作系统" json:"operating_system"`                               // 操作系统
+	CommentIP       string                 `gorm:"column:comment_ip;type:varchar(50);comment:IP地址" json:"comment_ip"`                                           // IP地址
+	Location        string                 `gorm:"column:location;type:varchar(50);comment:地址" json:"location"`                                                 // 地址
+	Agent           string                 `gorm:"column:agent;type:varchar(255);comment:设备信息" json:"agent"`                                                    // 设备信息
+	CreatedAt       time.Time              `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`                              // 创建时间
+	UpdatedAt       time.Time              `gorm:"column:updated_at;type:timestamp;autoUpdateTime;comment:更新时间" json:"updated_at"`                              // 更新时间
+	Version         optimisticlock.Version `gorm:"column:version;type:bigint;comment:版本" json:"version"`                                                        // 版本
+	DeletedAt       gorm.DeletedAt         `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                                              // 删除时间
 }
 
 // TableName ScaCommentReply's table name
diff --git a/app/core/api/repository/mysql/model/sca_file_folder.gen.go b/app/core/api/repository/mysql/model/sca_file_folder.gen.go
index 8427e2d..ab9fb3e 100644
--- a/app/core/api/repository/mysql/model/sca_file_folder.gen.go
+++ b/app/core/api/repository/mysql/model/sca_file_folder.gen.go
@@ -14,16 +14,15 @@ const TableNameScaFileFolder = "sca_file_folder"
 
 // ScaFileFolder mapped from table <sca_file_folder>
 type ScaFileFolder struct {
-	ID             int64          `gorm:"column:id;type:bigint;primaryKey;autoIncrement:true;comment:主键" json:"id,string"`              // 主键
-	FolderName     string         `gorm:"column:folder_name;type:varchar(512);comment:文件夹名称" json:"folder_name"`                        // 文件夹名称
-	ParentFolderID int64          `gorm:"column:parent_folder_id;type:bigint;comment:父文件夹编号" json:"parent_folder_id"`                   // 父文件夹编号
-	FolderAddr     string         `gorm:"column:folder_addr;type:varchar(1024);comment:文件夹名称" json:"folder_addr"`                       // 文件夹名称
-	UserID         string         `gorm:"column:user_id;type:varchar(20);comment:用户编号" json:"user_id"`                                  // 用户编号
-	FolderSource   int64          `gorm:"column:folder_source;type:int;comment:文件夹来源 0相册 1 评论" json:"folder_source"`                    // 文件夹来源 0相册 1 评论
-	CreatedTime    *time.Time     `gorm:"column:created_time;type:datetime;default:CURRENT_TIMESTAMP;comment:创建时间" json:"created_time"` // 创建时间
-	UpdateTime     *time.Time     `gorm:"column:update_time;type:datetime;default:CURRENT_TIMESTAMP;comment:更新时间" json:"update_time"`   // 更新时间
-	Deleted        int64          `gorm:"column:deleted;type:int;comment:是否删除 0 未删除 1 已删除" json:"deleted"`                              // 是否删除 0 未删除 1 已删除
-	DeletedAt      gorm.DeletedAt `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                               // 删除时间
+	ID             int64          `gorm:"column:id;type:bigint;primaryKey;autoIncrement:true;comment:主键" json:"id,string"`                         // 主键
+	FolderName     string         `gorm:"column:folder_name;type:varchar(512);comment:文件夹名称" json:"folder_name"`                                   // 文件夹名称
+	ParentFolderID int64          `gorm:"column:parent_folder_id;type:bigint;comment:父文件夹编号" json:"parent_folder_id"`                              // 父文件夹编号
+	FolderAddr     string         `gorm:"column:folder_addr;type:varchar(1024);comment:文件夹名称" json:"folder_addr"`                                  // 文件夹名称
+	UserID         string         `gorm:"column:user_id;type:varchar(20);comment:用户编号" json:"user_id"`                                             // 用户编号
+	FolderSource   int64          `gorm:"column:folder_source;type:int;comment:文件夹来源 0相册 1 评论" json:"folder_source"`                               // 文件夹来源 0相册 1 评论
+	CreatedAt      *time.Time     `gorm:"column:created_at;type:datetime;default:CURRENT_TIMESTAMP;autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
+	UpdatedAt      *time.Time     `gorm:"column:updated_at;type:datetime;default:CURRENT_TIMESTAMP;autoUpdateTime;comment:更新时间" json:"updated_at"` // 更新时间
+	DeletedAt      gorm.DeletedAt `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                                          // 删除时间
 }
 
 // TableName ScaFileFolder's table name
diff --git a/app/core/api/repository/mysql/model/sca_file_info.gen.go b/app/core/api/repository/mysql/model/sca_file_info.gen.go
index a84faa8..4959454 100644
--- a/app/core/api/repository/mysql/model/sca_file_info.gen.go
+++ b/app/core/api/repository/mysql/model/sca_file_info.gen.go
@@ -25,7 +25,6 @@ type ScaFileInfo struct {
 	Status     int64          `gorm:"column:status;type:int;comment:文件状态" json:"status"`                                                       // 文件状态
 	CreatedAt  *time.Time     `gorm:"column:created_at;type:datetime;default:CURRENT_TIMESTAMP;autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
 	UpdatedAt  *time.Time     `gorm:"column:updated_at;type:datetime;default:CURRENT_TIMESTAMP;autoUpdateTime;comment:更新时间" json:"updated_at"` // 更新时间
-	Deleted    int64          `gorm:"column:deleted;type:int;comment:是否删除 0 未删除 1 已删除" json:"deleted"`                                         // 是否删除 0 未删除 1 已删除
 	DeletedAt  gorm.DeletedAt `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                                          // 删除时间
 }
 
diff --git a/app/core/api/repository/mysql/model/sca_file_recycle.gen.go b/app/core/api/repository/mysql/model/sca_file_recycle.gen.go
index 530b91b..377f424 100644
--- a/app/core/api/repository/mysql/model/sca_file_recycle.gen.go
+++ b/app/core/api/repository/mysql/model/sca_file_recycle.gen.go
@@ -19,7 +19,6 @@ type ScaFileRecycle struct {
 	UserID       string         `gorm:"column:user_id;type:varchar(20);comment:用户编号" json:"user_id"`                     // 用户编号
 	DeletedAt    gorm.DeletedAt `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                  // 删除时间
 	OriginalPath string         `gorm:"column:original_path;type:varchar(1024);comment:原始路径" json:"original_path"`       // 原始路径
-	Deleted      int64          `gorm:"column:deleted;type:int;comment:是否被永久删除 0否 1是" json:"deleted"`                    // 是否被永久删除 0否 1是
 	FileSource   int64          `gorm:"column:file_source;type:int;comment:文件来源 0 相册 1 评论" json:"file_source"`           // 文件来源 0 相册 1 评论
 }
 
diff --git a/app/core/api/repository/mysql/model/sca_file_type.gen.go b/app/core/api/repository/mysql/model/sca_file_type.gen.go
index 36ad3f5..2d855f3 100644
--- a/app/core/api/repository/mysql/model/sca_file_type.gen.go
+++ b/app/core/api/repository/mysql/model/sca_file_type.gen.go
@@ -20,7 +20,6 @@ type ScaFileType struct {
 	Status    int64          `gorm:"column:status;type:int;comment:类型状态" json:"status"`                                                       // 类型状态
 	CreatedAt *time.Time     `gorm:"column:created_at;type:datetime;default:CURRENT_TIMESTAMP;autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
 	UpdatedAt *time.Time     `gorm:"column:updated_at;type:datetime;default:CURRENT_TIMESTAMP;autoUpdateTime;comment:更新时间" json:"updated_at"` // 更新时间
-	Deleted   int64          `gorm:"column:deleted;type:int;comment:是否删除 0 未删除 1 已删除" json:"deleted"`                                         // 是否删除 0 未删除 1 已删除
 	DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:datetime;comment:删除时间" json:"deleted_at"`                                          // 删除时间
 }
 
diff --git a/app/core/api/repository/mysql/model/sca_message_report.gen.go b/app/core/api/repository/mysql/model/sca_message_report.gen.go
index df2466e..3c0a7e3 100644
--- a/app/core/api/repository/mysql/model/sca_message_report.gen.go
+++ b/app/core/api/repository/mysql/model/sca_message_report.gen.go
@@ -24,9 +24,7 @@ type ScaMessageReport struct {
 	ReportTag     string         `gorm:"column:report_tag;type:varchar(255);comment:举报标签" json:"report_tag"`                                       // 举报标签
 	Status        int64          `gorm:"column:status;type:tinyint;comment:状态（0 未处理 1 已处理）" json:"status"`                                         // 状态（0 未处理 1 已处理）
 	CreatedAt     *time.Time     `gorm:"column:created_at;type:timestamp;default:CURRENT_TIMESTAMP;autoCreateTime;comment:创建时间" json:"created_at"` // 创建时间
-	UpdateBy      string         `gorm:"column:update_by;type:varchar(32);comment:更新人" json:"update_by"`                                           // 更新人
 	UpdatedAt     *time.Time     `gorm:"column:updated_at;type:timestamp;default:CURRENT_TIMESTAMP;autoUpdateTime;comment:更新时间" json:"updated_at"` // 更新时间
-	Deleted       int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0否 1是" json:"deleted"`                                            // 是否删除 0否 1是
 	DeletedAt     gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"`                                          // 删除时间
 }
 
diff --git a/app/core/api/repository/mysql/model/sca_user_message.gen.go b/app/core/api/repository/mysql/model/sca_user_message.gen.go
index 7d3cf32..0927a63 100644
--- a/app/core/api/repository/mysql/model/sca_user_message.gen.go
+++ b/app/core/api/repository/mysql/model/sca_user_message.gen.go
@@ -20,7 +20,6 @@ type ScaUserMessage struct {
 	ToID      string         `gorm:"column:to_id;type:varchar(50);comment:送达人" json:"to_id"`                          // 送达人
 	Content   string         `gorm:"column:content;type:text;comment:消息内容" json:"content"`                            // 消息内容
 	IsRead    int64          `gorm:"column:is_read;type:tinyint;comment:是否已读" json:"is_read"`                         // 是否已读
-	Deleted   int64          `gorm:"column:deleted;type:tinyint;comment:是否删除 0 未删除 1 已删除" json:"deleted"`             // 是否删除 0 未删除 1 已删除
 	CreatedAt time.Time      `gorm:"column:created_at;type:timestamp;autoCreateTime;comment:创建时间" json:"created_at"`  // 创建时间
 	UpdatedAt time.Time      `gorm:"column:updated_at;type:timestamp;autoUpdateTime;comment:更新时间" json:"updated_at"`  // 更新时间
 	DeletedAt gorm.DeletedAt `gorm:"column:deleted_at;type:timestamp;comment:删除时间" json:"deleted_at"`                 // 删除时间
diff --git a/app/core/api/repository/mysql/query/sca_auth_menu.gen.go b/app/core/api/repository/mysql/query/sca_auth_menu.gen.go
index 6a25c17..134d9db 100644
--- a/app/core/api/repository/mysql/query/sca_auth_menu.gen.go
+++ b/app/core/api/repository/mysql/query/sca_auth_menu.gen.go
@@ -38,7 +38,6 @@ func newScaAuthMenu(db *gorm.DB, opts ...gen.DOOption) scaAuthMenu {
 	_scaAuthMenu.Order_ = field.NewInt64(tableName, "order")
 	_scaAuthMenu.CreatedAt = field.NewTime(tableName, "created_at")
 	_scaAuthMenu.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_scaAuthMenu.Deleted = field.NewInt64(tableName, "deleted")
 	_scaAuthMenu.Remark = field.NewString(tableName, "remark")
 	_scaAuthMenu.DeletedAt = field.NewField(tableName, "deleted_at")
 
@@ -62,7 +61,6 @@ type scaAuthMenu struct {
 	Order_    field.Int64  // 排序
 	CreatedAt field.Time   // 创建时间
 	UpdatedAt field.Time   // 更新时间
-	Deleted   field.Int64  // 是否删除
 	Remark    field.String // 备注 描述
 	DeletedAt field.Field  // 删除时间
 
@@ -92,7 +90,6 @@ func (s *scaAuthMenu) updateTableName(table string) *scaAuthMenu {
 	s.Order_ = field.NewInt64(table, "order")
 	s.CreatedAt = field.NewTime(table, "created_at")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.Remark = field.NewString(table, "remark")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
@@ -111,7 +108,7 @@ func (s *scaAuthMenu) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (s *scaAuthMenu) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 14)
+	s.fieldMap = make(map[string]field.Expr, 13)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["menu_name"] = s.MenuName
 	s.fieldMap["parent_id"] = s.ParentID
@@ -123,7 +120,6 @@ func (s *scaAuthMenu) fillFieldMap() {
 	s.fieldMap["order"] = s.Order_
 	s.fieldMap["created_at"] = s.CreatedAt
 	s.fieldMap["updated_at"] = s.UpdatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["remark"] = s.Remark
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
diff --git a/app/core/api/repository/mysql/query/sca_auth_role.gen.go b/app/core/api/repository/mysql/query/sca_auth_role.gen.go
index f2b39a9..1caaa34 100644
--- a/app/core/api/repository/mysql/query/sca_auth_role.gen.go
+++ b/app/core/api/repository/mysql/query/sca_auth_role.gen.go
@@ -31,7 +31,6 @@ func newScaAuthRole(db *gorm.DB, opts ...gen.DOOption) scaAuthRole {
 	_scaAuthRole.RoleName = field.NewString(tableName, "role_name")
 	_scaAuthRole.RoleKey = field.NewString(tableName, "role_key")
 	_scaAuthRole.CreatedAt = field.NewTime(tableName, "created_at")
-	_scaAuthRole.Deleted = field.NewInt64(tableName, "deleted")
 	_scaAuthRole.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_scaAuthRole.DeletedAt = field.NewField(tableName, "deleted_at")
 
@@ -48,7 +47,6 @@ type scaAuthRole struct {
 	RoleName  field.String // 角色名称
 	RoleKey   field.String // 角色关键字
 	CreatedAt field.Time   // 创建时间
-	Deleted   field.Int64  // 是否删除 0 未删除 1 已删除
 	UpdatedAt field.Time   // 更新时间
 	DeletedAt field.Field  // 删除时间
 
@@ -71,7 +69,6 @@ func (s *scaAuthRole) updateTableName(table string) *scaAuthRole {
 	s.RoleName = field.NewString(table, "role_name")
 	s.RoleKey = field.NewString(table, "role_key")
 	s.CreatedAt = field.NewTime(table, "created_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
@@ -90,12 +87,11 @@ func (s *scaAuthRole) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (s *scaAuthRole) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 7)
+	s.fieldMap = make(map[string]field.Expr, 6)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["role_name"] = s.RoleName
 	s.fieldMap["role_key"] = s.RoleKey
 	s.fieldMap["created_at"] = s.CreatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["updated_at"] = s.UpdatedAt
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
diff --git a/app/core/api/repository/mysql/query/sca_auth_user.gen.go b/app/core/api/repository/mysql/query/sca_auth_user.gen.go
index 4d0777f..bf2a398 100644
--- a/app/core/api/repository/mysql/query/sca_auth_user.gen.go
+++ b/app/core/api/repository/mysql/query/sca_auth_user.gen.go
@@ -39,7 +39,6 @@ func newScaAuthUser(db *gorm.DB, opts ...gen.DOOption) scaAuthUser {
 	_scaAuthUser.Status = field.NewInt64(tableName, "status")
 	_scaAuthUser.Introduce = field.NewString(tableName, "introduce")
 	_scaAuthUser.CreatedAt = field.NewTime(tableName, "created_at")
-	_scaAuthUser.Deleted = field.NewInt64(tableName, "deleted")
 	_scaAuthUser.Blog = field.NewString(tableName, "blog")
 	_scaAuthUser.Location = field.NewString(tableName, "location")
 	_scaAuthUser.Company = field.NewString(tableName, "company")
@@ -67,7 +66,6 @@ type scaAuthUser struct {
 	Status    field.Int64  // 状态 0 正常 1 封禁
 	Introduce field.String // 介绍
 	CreatedAt field.Time   // 创建时间
-	Deleted   field.Int64  // 是否删除 0 未删除 1 已删除
 	Blog      field.String // 博客
 	Location  field.String // 地址
 	Company   field.String // 公司
@@ -101,7 +99,6 @@ func (s *scaAuthUser) updateTableName(table string) *scaAuthUser {
 	s.Status = field.NewInt64(table, "status")
 	s.Introduce = field.NewString(table, "introduce")
 	s.CreatedAt = field.NewTime(table, "created_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.Blog = field.NewString(table, "blog")
 	s.Location = field.NewString(table, "location")
 	s.Company = field.NewString(table, "company")
@@ -123,7 +120,7 @@ func (s *scaAuthUser) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (s *scaAuthUser) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 18)
+	s.fieldMap = make(map[string]field.Expr, 17)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["uid"] = s.UID
 	s.fieldMap["username"] = s.Username
@@ -136,7 +133,6 @@ func (s *scaAuthUser) fillFieldMap() {
 	s.fieldMap["status"] = s.Status
 	s.fieldMap["introduce"] = s.Introduce
 	s.fieldMap["created_at"] = s.CreatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["blog"] = s.Blog
 	s.fieldMap["location"] = s.Location
 	s.fieldMap["company"] = s.Company
diff --git a/app/core/api/repository/mysql/query/sca_auth_user_device.gen.go b/app/core/api/repository/mysql/query/sca_auth_user_device.gen.go
index 574c971..6ba626b 100644
--- a/app/core/api/repository/mysql/query/sca_auth_user_device.gen.go
+++ b/app/core/api/repository/mysql/query/sca_auth_user_device.gen.go
@@ -33,7 +33,6 @@ func newScaAuthUserDevice(db *gorm.DB, opts ...gen.DOOption) scaAuthUserDevice {
 	_scaAuthUserDevice.Location = field.NewString(tableName, "location")
 	_scaAuthUserDevice.Agent = field.NewString(tableName, "agent")
 	_scaAuthUserDevice.CreatedAt = field.NewTime(tableName, "created_at")
-	_scaAuthUserDevice.Deleted = field.NewInt64(tableName, "deleted")
 	_scaAuthUserDevice.Browser = field.NewString(tableName, "browser")
 	_scaAuthUserDevice.OperatingSystem = field.NewString(tableName, "operating_system")
 	_scaAuthUserDevice.BrowserVersion = field.NewString(tableName, "browser_version")
@@ -61,7 +60,6 @@ type scaAuthUserDevice struct {
 	Location        field.String // 地址
 	Agent           field.String // 设备信息
 	CreatedAt       field.Time   // 创建时间
-	Deleted         field.Int64  // 是否删除 0 未删除 1 已删除
 	Browser         field.String // 浏览器
 	OperatingSystem field.String // 操作系统
 	BrowserVersion  field.String // 浏览器版本
@@ -95,7 +93,6 @@ func (s *scaAuthUserDevice) updateTableName(table string) *scaAuthUserDevice {
 	s.Location = field.NewString(table, "location")
 	s.Agent = field.NewString(table, "agent")
 	s.CreatedAt = field.NewTime(table, "created_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.Browser = field.NewString(table, "browser")
 	s.OperatingSystem = field.NewString(table, "operating_system")
 	s.BrowserVersion = field.NewString(table, "browser_version")
@@ -123,14 +120,13 @@ func (s *scaAuthUserDevice) GetFieldByName(fieldName string) (field.OrderExpr, b
 }
 
 func (s *scaAuthUserDevice) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 18)
+	s.fieldMap = make(map[string]field.Expr, 17)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["user_id"] = s.UserID
 	s.fieldMap["ip"] = s.IP
 	s.fieldMap["location"] = s.Location
 	s.fieldMap["agent"] = s.Agent
 	s.fieldMap["created_at"] = s.CreatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["browser"] = s.Browser
 	s.fieldMap["operating_system"] = s.OperatingSystem
 	s.fieldMap["browser_version"] = s.BrowserVersion
diff --git a/app/core/api/repository/mysql/query/sca_auth_user_social.gen.go b/app/core/api/repository/mysql/query/sca_auth_user_social.gen.go
index 24191b4..65555e6 100644
--- a/app/core/api/repository/mysql/query/sca_auth_user_social.gen.go
+++ b/app/core/api/repository/mysql/query/sca_auth_user_social.gen.go
@@ -33,7 +33,6 @@ func newScaAuthUserSocial(db *gorm.DB, opts ...gen.DOOption) scaAuthUserSocial {
 	_scaAuthUserSocial.Source = field.NewString(tableName, "source")
 	_scaAuthUserSocial.Status = field.NewInt64(tableName, "status")
 	_scaAuthUserSocial.CreatedAt = field.NewTime(tableName, "created_at")
-	_scaAuthUserSocial.Deleted = field.NewInt64(tableName, "deleted")
 	_scaAuthUserSocial.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_scaAuthUserSocial.DeletedAt = field.NewField(tableName, "deleted_at")
 
@@ -52,7 +51,6 @@ type scaAuthUserSocial struct {
 	Source    field.String // 第三方用户来源
 	Status    field.Int64  // 状态 0正常 1 封禁
 	CreatedAt field.Time   // 创建时间
-	Deleted   field.Int64  // 是否删除 0 未删除 1 已删除
 	UpdatedAt field.Time   // 更新时间
 	DeletedAt field.Field  // 删除时间
 
@@ -77,7 +75,6 @@ func (s *scaAuthUserSocial) updateTableName(table string) *scaAuthUserSocial {
 	s.Source = field.NewString(table, "source")
 	s.Status = field.NewInt64(table, "status")
 	s.CreatedAt = field.NewTime(table, "created_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
@@ -96,14 +93,13 @@ func (s *scaAuthUserSocial) GetFieldByName(fieldName string) (field.OrderExpr, b
 }
 
 func (s *scaAuthUserSocial) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 9)
+	s.fieldMap = make(map[string]field.Expr, 8)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["user_id"] = s.UserID
 	s.fieldMap["open_id"] = s.OpenID
 	s.fieldMap["source"] = s.Source
 	s.fieldMap["status"] = s.Status
 	s.fieldMap["created_at"] = s.CreatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["updated_at"] = s.UpdatedAt
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
diff --git a/app/core/api/repository/mysql/query/sca_comment_reply.gen.go b/app/core/api/repository/mysql/query/sca_comment_reply.gen.go
index 1c9a37e..75fb340 100644
--- a/app/core/api/repository/mysql/query/sca_comment_reply.gen.go
+++ b/app/core/api/repository/mysql/query/sca_comment_reply.gen.go
@@ -39,7 +39,6 @@ func newScaCommentReply(db *gorm.DB, opts ...gen.DOOption) scaCommentReply {
 	_scaCommentReply.Author = field.NewInt64(tableName, "author")
 	_scaCommentReply.Likes = field.NewInt64(tableName, "likes")
 	_scaCommentReply.ReplyCount = field.NewInt64(tableName, "reply_count")
-	_scaCommentReply.Deleted = field.NewInt64(tableName, "deleted")
 	_scaCommentReply.Browser = field.NewString(tableName, "browser")
 	_scaCommentReply.OperatingSystem = field.NewString(tableName, "operating_system")
 	_scaCommentReply.CommentIP = field.NewString(tableName, "comment_ip")
@@ -47,7 +46,7 @@ func newScaCommentReply(db *gorm.DB, opts ...gen.DOOption) scaCommentReply {
 	_scaCommentReply.Agent = field.NewString(tableName, "agent")
 	_scaCommentReply.CreatedAt = field.NewTime(tableName, "created_at")
 	_scaCommentReply.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_scaCommentReply.Version = field.NewInt64(tableName, "version")
+	_scaCommentReply.Version = field.NewField(tableName, "version")
 	_scaCommentReply.DeletedAt = field.NewField(tableName, "deleted_at")
 
 	_scaCommentReply.fillFieldMap()
@@ -71,7 +70,6 @@ type scaCommentReply struct {
 	Author          field.Int64  // 评论回复是否作者  0否 1是
 	Likes           field.Int64  // 点赞数
 	ReplyCount      field.Int64  // 回复数量
-	Deleted         field.Int64  // 是否删除 0 未删除 1 已删除
 	Browser         field.String // 浏览器
 	OperatingSystem field.String // 操作系统
 	CommentIP       field.String // IP地址
@@ -79,7 +77,7 @@ type scaCommentReply struct {
 	Agent           field.String // 设备信息
 	CreatedAt       field.Time   // 创建时间
 	UpdatedAt       field.Time   // 更新时间
-	Version         field.Int64  // 版本
+	Version         field.Field  // 版本
 	DeletedAt       field.Field  // 删除时间
 
 	fieldMap map[string]field.Expr
@@ -109,7 +107,6 @@ func (s *scaCommentReply) updateTableName(table string) *scaCommentReply {
 	s.Author = field.NewInt64(table, "author")
 	s.Likes = field.NewInt64(table, "likes")
 	s.ReplyCount = field.NewInt64(table, "reply_count")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.Browser = field.NewString(table, "browser")
 	s.OperatingSystem = field.NewString(table, "operating_system")
 	s.CommentIP = field.NewString(table, "comment_ip")
@@ -117,7 +114,7 @@ func (s *scaCommentReply) updateTableName(table string) *scaCommentReply {
 	s.Agent = field.NewString(table, "agent")
 	s.CreatedAt = field.NewTime(table, "created_at")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
-	s.Version = field.NewInt64(table, "version")
+	s.Version = field.NewField(table, "version")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
 	s.fillFieldMap()
@@ -135,7 +132,7 @@ func (s *scaCommentReply) GetFieldByName(fieldName string) (field.OrderExpr, boo
 }
 
 func (s *scaCommentReply) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 22)
+	s.fieldMap = make(map[string]field.Expr, 21)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["user_id"] = s.UserID
 	s.fieldMap["topic_id"] = s.TopicID
@@ -148,7 +145,6 @@ func (s *scaCommentReply) fillFieldMap() {
 	s.fieldMap["author"] = s.Author
 	s.fieldMap["likes"] = s.Likes
 	s.fieldMap["reply_count"] = s.ReplyCount
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["browser"] = s.Browser
 	s.fieldMap["operating_system"] = s.OperatingSystem
 	s.fieldMap["comment_ip"] = s.CommentIP
diff --git a/app/core/api/repository/mysql/query/sca_file_folder.gen.go b/app/core/api/repository/mysql/query/sca_file_folder.gen.go
index d2b42d4..45e9725 100644
--- a/app/core/api/repository/mysql/query/sca_file_folder.gen.go
+++ b/app/core/api/repository/mysql/query/sca_file_folder.gen.go
@@ -33,9 +33,8 @@ func newScaFileFolder(db *gorm.DB, opts ...gen.DOOption) scaFileFolder {
 	_scaFileFolder.FolderAddr = field.NewString(tableName, "folder_addr")
 	_scaFileFolder.UserID = field.NewString(tableName, "user_id")
 	_scaFileFolder.FolderSource = field.NewInt64(tableName, "folder_source")
-	_scaFileFolder.CreatedTime = field.NewTime(tableName, "created_time")
-	_scaFileFolder.UpdateTime = field.NewTime(tableName, "update_time")
-	_scaFileFolder.Deleted = field.NewInt64(tableName, "deleted")
+	_scaFileFolder.CreatedAt = field.NewTime(tableName, "created_at")
+	_scaFileFolder.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_scaFileFolder.DeletedAt = field.NewField(tableName, "deleted_at")
 
 	_scaFileFolder.fillFieldMap()
@@ -53,9 +52,8 @@ type scaFileFolder struct {
 	FolderAddr     field.String // 文件夹名称
 	UserID         field.String // 用户编号
 	FolderSource   field.Int64  // 文件夹来源 0相册 1 评论
-	CreatedTime    field.Time   // 创建时间
-	UpdateTime     field.Time   // 更新时间
-	Deleted        field.Int64  // 是否删除 0 未删除 1 已删除
+	CreatedAt      field.Time   // 创建时间
+	UpdatedAt      field.Time   // 更新时间
 	DeletedAt      field.Field  // 删除时间
 
 	fieldMap map[string]field.Expr
@@ -79,9 +77,8 @@ func (s *scaFileFolder) updateTableName(table string) *scaFileFolder {
 	s.FolderAddr = field.NewString(table, "folder_addr")
 	s.UserID = field.NewString(table, "user_id")
 	s.FolderSource = field.NewInt64(table, "folder_source")
-	s.CreatedTime = field.NewTime(table, "created_time")
-	s.UpdateTime = field.NewTime(table, "update_time")
-	s.Deleted = field.NewInt64(table, "deleted")
+	s.CreatedAt = field.NewTime(table, "created_at")
+	s.UpdatedAt = field.NewTime(table, "updated_at")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
 	s.fillFieldMap()
@@ -99,16 +96,15 @@ func (s *scaFileFolder) GetFieldByName(fieldName string) (field.OrderExpr, bool)
 }
 
 func (s *scaFileFolder) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 10)
+	s.fieldMap = make(map[string]field.Expr, 9)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["folder_name"] = s.FolderName
 	s.fieldMap["parent_folder_id"] = s.ParentFolderID
 	s.fieldMap["folder_addr"] = s.FolderAddr
 	s.fieldMap["user_id"] = s.UserID
 	s.fieldMap["folder_source"] = s.FolderSource
-	s.fieldMap["created_time"] = s.CreatedTime
-	s.fieldMap["update_time"] = s.UpdateTime
-	s.fieldMap["deleted"] = s.Deleted
+	s.fieldMap["created_at"] = s.CreatedAt
+	s.fieldMap["updated_at"] = s.UpdatedAt
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
 
diff --git a/app/core/api/repository/mysql/query/sca_file_info.gen.go b/app/core/api/repository/mysql/query/sca_file_info.gen.go
index 3e12e48..8a454f4 100644
--- a/app/core/api/repository/mysql/query/sca_file_info.gen.go
+++ b/app/core/api/repository/mysql/query/sca_file_info.gen.go
@@ -38,7 +38,6 @@ func newScaFileInfo(db *gorm.DB, opts ...gen.DOOption) scaFileInfo {
 	_scaFileInfo.Status = field.NewInt64(tableName, "status")
 	_scaFileInfo.CreatedAt = field.NewTime(tableName, "created_at")
 	_scaFileInfo.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_scaFileInfo.Deleted = field.NewInt64(tableName, "deleted")
 	_scaFileInfo.DeletedAt = field.NewField(tableName, "deleted_at")
 
 	_scaFileInfo.fillFieldMap()
@@ -61,7 +60,6 @@ type scaFileInfo struct {
 	Status     field.Int64   // 文件状态
 	CreatedAt  field.Time    // 创建时间
 	UpdatedAt  field.Time    // 更新时间
-	Deleted    field.Int64   // 是否删除 0 未删除 1 已删除
 	DeletedAt  field.Field   // 删除时间
 
 	fieldMap map[string]field.Expr
@@ -90,7 +88,6 @@ func (s *scaFileInfo) updateTableName(table string) *scaFileInfo {
 	s.Status = field.NewInt64(table, "status")
 	s.CreatedAt = field.NewTime(table, "created_at")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
 	s.fillFieldMap()
@@ -108,7 +105,7 @@ func (s *scaFileInfo) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (s *scaFileInfo) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 13)
+	s.fieldMap = make(map[string]field.Expr, 12)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["file_name"] = s.FileName
 	s.fieldMap["file_size"] = s.FileSize
@@ -120,7 +117,6 @@ func (s *scaFileInfo) fillFieldMap() {
 	s.fieldMap["status"] = s.Status
 	s.fieldMap["created_at"] = s.CreatedAt
 	s.fieldMap["updated_at"] = s.UpdatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
 
diff --git a/app/core/api/repository/mysql/query/sca_file_recycle.gen.go b/app/core/api/repository/mysql/query/sca_file_recycle.gen.go
index 74041ed..fc29fe8 100644
--- a/app/core/api/repository/mysql/query/sca_file_recycle.gen.go
+++ b/app/core/api/repository/mysql/query/sca_file_recycle.gen.go
@@ -34,7 +34,6 @@ func newScaFileRecycle(db *gorm.DB, opts ...gen.DOOption) scaFileRecycle {
 	_scaFileRecycle.UserID = field.NewString(tableName, "user_id")
 	_scaFileRecycle.DeletedAt = field.NewField(tableName, "deleted_at")
 	_scaFileRecycle.OriginalPath = field.NewString(tableName, "original_path")
-	_scaFileRecycle.Deleted = field.NewInt64(tableName, "deleted")
 	_scaFileRecycle.FileSource = field.NewInt64(tableName, "file_source")
 
 	_scaFileRecycle.fillFieldMap()
@@ -53,7 +52,6 @@ type scaFileRecycle struct {
 	UserID       field.String // 用户编号
 	DeletedAt    field.Field  // 删除时间
 	OriginalPath field.String // 原始路径
-	Deleted      field.Int64  // 是否被永久删除 0否 1是
 	FileSource   field.Int64  // 文件来源 0 相册 1 评论
 
 	fieldMap map[string]field.Expr
@@ -78,7 +76,6 @@ func (s *scaFileRecycle) updateTableName(table string) *scaFileRecycle {
 	s.UserID = field.NewString(table, "user_id")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 	s.OriginalPath = field.NewString(table, "original_path")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.FileSource = field.NewInt64(table, "file_source")
 
 	s.fillFieldMap()
@@ -96,7 +93,7 @@ func (s *scaFileRecycle) GetFieldByName(fieldName string) (field.OrderExpr, bool
 }
 
 func (s *scaFileRecycle) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 9)
+	s.fieldMap = make(map[string]field.Expr, 8)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["file_id"] = s.FileID
 	s.fieldMap["folder_id"] = s.FolderID
@@ -104,7 +101,6 @@ func (s *scaFileRecycle) fillFieldMap() {
 	s.fieldMap["user_id"] = s.UserID
 	s.fieldMap["deleted_at"] = s.DeletedAt
 	s.fieldMap["original_path"] = s.OriginalPath
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["file_source"] = s.FileSource
 }
 
diff --git a/app/core/api/repository/mysql/query/sca_file_type.gen.go b/app/core/api/repository/mysql/query/sca_file_type.gen.go
index d19a3ed..9866c26 100644
--- a/app/core/api/repository/mysql/query/sca_file_type.gen.go
+++ b/app/core/api/repository/mysql/query/sca_file_type.gen.go
@@ -33,7 +33,6 @@ func newScaFileType(db *gorm.DB, opts ...gen.DOOption) scaFileType {
 	_scaFileType.Status = field.NewInt64(tableName, "status")
 	_scaFileType.CreatedAt = field.NewTime(tableName, "created_at")
 	_scaFileType.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_scaFileType.Deleted = field.NewInt64(tableName, "deleted")
 	_scaFileType.DeletedAt = field.NewField(tableName, "deleted_at")
 
 	_scaFileType.fillFieldMap()
@@ -51,7 +50,6 @@ type scaFileType struct {
 	Status    field.Int64  // 类型状态
 	CreatedAt field.Time   // 创建时间
 	UpdatedAt field.Time   // 更新时间
-	Deleted   field.Int64  // 是否删除 0 未删除 1 已删除
 	DeletedAt field.Field  // 删除时间
 
 	fieldMap map[string]field.Expr
@@ -75,7 +73,6 @@ func (s *scaFileType) updateTableName(table string) *scaFileType {
 	s.Status = field.NewInt64(table, "status")
 	s.CreatedAt = field.NewTime(table, "created_at")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
 	s.fillFieldMap()
@@ -93,14 +90,13 @@ func (s *scaFileType) GetFieldByName(fieldName string) (field.OrderExpr, bool) {
 }
 
 func (s *scaFileType) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 8)
+	s.fieldMap = make(map[string]field.Expr, 7)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["type_name"] = s.TypeName
 	s.fieldMap["mime_type"] = s.MimeType
 	s.fieldMap["status"] = s.Status
 	s.fieldMap["created_at"] = s.CreatedAt
 	s.fieldMap["updated_at"] = s.UpdatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
 
diff --git a/app/core/api/repository/mysql/query/sca_message_report.gen.go b/app/core/api/repository/mysql/query/sca_message_report.gen.go
index 82e1035..0892d54 100644
--- a/app/core/api/repository/mysql/query/sca_message_report.gen.go
+++ b/app/core/api/repository/mysql/query/sca_message_report.gen.go
@@ -37,9 +37,7 @@ func newScaMessageReport(db *gorm.DB, opts ...gen.DOOption) scaMessageReport {
 	_scaMessageReport.ReportTag = field.NewString(tableName, "report_tag")
 	_scaMessageReport.Status = field.NewInt64(tableName, "status")
 	_scaMessageReport.CreatedAt = field.NewTime(tableName, "created_at")
-	_scaMessageReport.UpdateBy = field.NewString(tableName, "update_by")
 	_scaMessageReport.UpdatedAt = field.NewTime(tableName, "updated_at")
-	_scaMessageReport.Deleted = field.NewInt64(tableName, "deleted")
 	_scaMessageReport.DeletedAt = field.NewField(tableName, "deleted_at")
 
 	_scaMessageReport.fillFieldMap()
@@ -61,9 +59,7 @@ type scaMessageReport struct {
 	ReportTag     field.String // 举报标签
 	Status        field.Int64  // 状态（0 未处理 1 已处理）
 	CreatedAt     field.Time   // 创建时间
-	UpdateBy      field.String // 更新人
 	UpdatedAt     field.Time   // 更新时间
-	Deleted       field.Int64  // 是否删除 0否 1是
 	DeletedAt     field.Field  // 删除时间
 
 	fieldMap map[string]field.Expr
@@ -91,9 +87,7 @@ func (s *scaMessageReport) updateTableName(table string) *scaMessageReport {
 	s.ReportTag = field.NewString(table, "report_tag")
 	s.Status = field.NewInt64(table, "status")
 	s.CreatedAt = field.NewTime(table, "created_at")
-	s.UpdateBy = field.NewString(table, "update_by")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.DeletedAt = field.NewField(table, "deleted_at")
 
 	s.fillFieldMap()
@@ -111,7 +105,7 @@ func (s *scaMessageReport) GetFieldByName(fieldName string) (field.OrderExpr, bo
 }
 
 func (s *scaMessageReport) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 14)
+	s.fieldMap = make(map[string]field.Expr, 12)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["user_id"] = s.UserID
 	s.fieldMap["type"] = s.Type
@@ -122,9 +116,7 @@ func (s *scaMessageReport) fillFieldMap() {
 	s.fieldMap["report_tag"] = s.ReportTag
 	s.fieldMap["status"] = s.Status
 	s.fieldMap["created_at"] = s.CreatedAt
-	s.fieldMap["update_by"] = s.UpdateBy
 	s.fieldMap["updated_at"] = s.UpdatedAt
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["deleted_at"] = s.DeletedAt
 }
 
diff --git a/app/core/api/repository/mysql/query/sca_user_message.gen.go b/app/core/api/repository/mysql/query/sca_user_message.gen.go
index 58f0792..0343ec8 100644
--- a/app/core/api/repository/mysql/query/sca_user_message.gen.go
+++ b/app/core/api/repository/mysql/query/sca_user_message.gen.go
@@ -33,7 +33,6 @@ func newScaUserMessage(db *gorm.DB, opts ...gen.DOOption) scaUserMessage {
 	_scaUserMessage.ToID = field.NewString(tableName, "to_id")
 	_scaUserMessage.Content = field.NewString(tableName, "content")
 	_scaUserMessage.IsRead = field.NewInt64(tableName, "is_read")
-	_scaUserMessage.Deleted = field.NewInt64(tableName, "deleted")
 	_scaUserMessage.CreatedAt = field.NewTime(tableName, "created_at")
 	_scaUserMessage.UpdatedAt = field.NewTime(tableName, "updated_at")
 	_scaUserMessage.DeletedAt = field.NewField(tableName, "deleted_at")
@@ -53,7 +52,6 @@ type scaUserMessage struct {
 	ToID      field.String // 送达人
 	Content   field.String // 消息内容
 	IsRead    field.Int64  // 是否已读
-	Deleted   field.Int64  // 是否删除 0 未删除 1 已删除
 	CreatedAt field.Time   // 创建时间
 	UpdatedAt field.Time   // 更新时间
 	DeletedAt field.Field  // 删除时间
@@ -79,7 +77,6 @@ func (s *scaUserMessage) updateTableName(table string) *scaUserMessage {
 	s.ToID = field.NewString(table, "to_id")
 	s.Content = field.NewString(table, "content")
 	s.IsRead = field.NewInt64(table, "is_read")
-	s.Deleted = field.NewInt64(table, "deleted")
 	s.CreatedAt = field.NewTime(table, "created_at")
 	s.UpdatedAt = field.NewTime(table, "updated_at")
 	s.DeletedAt = field.NewField(table, "deleted_at")
@@ -99,14 +96,13 @@ func (s *scaUserMessage) GetFieldByName(fieldName string) (field.OrderExpr, bool
 }
 
 func (s *scaUserMessage) fillFieldMap() {
-	s.fieldMap = make(map[string]field.Expr, 10)
+	s.fieldMap = make(map[string]field.Expr, 9)
 	s.fieldMap["id"] = s.ID
 	s.fieldMap["topic_id"] = s.TopicID
 	s.fieldMap["from_id"] = s.FromID
 	s.fieldMap["to_id"] = s.ToID
 	s.fieldMap["content"] = s.Content
 	s.fieldMap["is_read"] = s.IsRead
-	s.fieldMap["deleted"] = s.Deleted
 	s.fieldMap["created_at"] = s.CreatedAt
 	s.fieldMap["updated_at"] = s.UpdatedAt
 	s.fieldMap["deleted_at"] = s.DeletedAt
diff --git a/app/core/api/resources/language/active.en.toml b/app/core/api/resources/language/active.en.toml
index 347ff73..e41f11b 100644
--- a/app/core/api/resources/language/active.en.toml
+++ b/app/core/api/resources/language/active.en.toml
@@ -23,4 +23,6 @@ smsSendFailed = "sms send failed！"
 smsSendSuccess = "sms send success！"
 [comment]
 tooManyImages = "too many images！"
-commentError = "comment error！"
\ No newline at end of file
+commentError = "comment error！"
+LikeError = "like error！"
+CancelLikeError = "cancel like error！"
\ No newline at end of file
diff --git a/app/core/api/resources/language/active.zh.toml b/app/core/api/resources/language/active.zh.toml
index ea50f65..0286aa5 100644
--- a/app/core/api/resources/language/active.zh.toml
+++ b/app/core/api/resources/language/active.zh.toml
@@ -24,3 +24,5 @@ smsSendSuccess = "短信发送成功！"
 [comment]
 tooManyImages = "图片数量过多，请上传不超过3张！"
 commentError = "评论失败！"
+LikeError = "点赞失败！"
+CancelLikeError = "取消点赞失败！"
diff --git a/go.mod b/go.mod
index 18b50fb..bd89aa6 100644
--- a/go.mod
+++ b/go.mod
@@ -5,35 +5,36 @@ go 1.23.3
 require (
 	github.com/ArtisanCloud/PowerLibs/v3 v3.2.6
 	github.com/ArtisanCloud/PowerWeChat/v3 v3.2.55
-	github.com/casbin/casbin/v2 v2.100.0
+	github.com/casbin/casbin/v2 v2.101.0
 	github.com/casbin/gorm-adapter/v3 v3.32.0
 	github.com/ccpwcn/kgo v1.2.3
 	github.com/chenmingyong0423/go-mongox/v2 v2.0.0-beta1
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/gorilla/sessions v1.2.1
+	github.com/gorilla/sessions v1.4.0
 	github.com/lionsoul2014/ip2region/binding/golang v0.0.0-20240510055607-89e20ab7b6c6
 	github.com/lxzan/gws v1.8.8
 	github.com/microcosm-cc/bluemonday v1.0.27
 	github.com/mssola/useragent v1.0.0
 	github.com/nicksnyder/go-i18n/v2 v2.4.1
-	github.com/pelletier/go-toml/v2 v2.2.2
+	github.com/pelletier/go-toml/v2 v2.2.3
 	github.com/pkg6/go-sms v0.1.2
 	github.com/rbcervilla/redisstore/v9 v9.0.0
 	github.com/redis/go-redis/v9 v9.7.0
 	github.com/wenlng/go-captcha-assets v1.0.1
 	github.com/wenlng/go-captcha/v2 v2.0.1
-	github.com/yitter/idgenerator-go v1.3.1
+	github.com/yitter/idgenerator-go v1.3.3
 	github.com/zeromicro/go-zero v1.7.3
 	github.com/zmexing/go-sensitive-word v1.3.0
 	go.mongodb.org/mongo-driver/v2 v2.0.0-beta2
 	golang.org/x/crypto v0.29.0
 	golang.org/x/text v0.20.0
-	google.golang.org/grpc v1.65.0
+	google.golang.org/grpc v1.68.0
 	gorm.io/driver/mysql v1.5.7
 	gorm.io/gen v0.3.26
 	gorm.io/gorm v1.25.12
 	gorm.io/plugin/dbresolver v1.5.3
+	gorm.io/plugin/optimisticlock v1.1.3
 )
 
 require (
@@ -42,7 +43,7 @@ require (
 	github.com/andybalholm/brotli v1.1.1 // indirect
 	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bmatcuk/doublestar/v4 v4.6.1 // indirect
+	github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
 	github.com/casbin/govaluate v1.2.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -51,33 +52,33 @@ require (
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/dolthub/maphash v0.1.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/fatih/color v1.17.0 // indirect
-	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
-	github.com/glebarez/go-sqlite v1.20.3 // indirect
-	github.com/glebarez/sqlite v1.7.0 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.7 // indirect
+	github.com/glebarez/go-sqlite v1.22.0 // indirect
+	github.com/glebarez/sqlite v1.11.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-playground/validator/v10 v10.20.0 // indirect
+	github.com/go-playground/validator/v10 v10.23.0 // indirect
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
 	github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
 	github.com/golang-sql/sqlexp v0.1.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/css v1.0.1 // indirect
-	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
+	github.com/gorilla/securecookie v1.1.2 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
 	github.com/imroc/req/v3 v3.48.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgx/v5 v5.6.0 // indirect
-	github.com/jackc/puddle/v2 v2.2.1 // indirect
+	github.com/jackc/pgx/v5 v5.7.1 // indirect
+	github.com/jackc/puddle/v2 v2.2.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
@@ -85,22 +86,23 @@ require (
 	github.com/lib/pq v1.10.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/microsoft/go-mssqldb v1.6.0 // indirect
+	github.com/microsoft/go-mssqldb v1.7.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/onsi/ginkgo/v2 v2.21.0 // indirect
+	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/onsi/ginkgo/v2 v2.22.0 // indirect
 	github.com/openzipkin/zipkin-go v0.4.3 // indirect
 	github.com/orcaman/concurrent-map/v2 v2.0.1 // indirect
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
-	github.com/pkg6/go-requests v0.2.2 // indirect
+	github.com/pkg6/go-requests v0.2.3 // indirect
 	github.com/prometheus/client_golang v1.20.5 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.55.0 // indirect
+	github.com/prometheus/common v0.60.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/quic-go/qpack v0.5.1 // indirect
 	github.com/quic-go/quic-go v0.48.1 // indirect
 	github.com/refraction-networking/utls v1.6.7 // indirect
-	github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 // indirect
+	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
@@ -108,11 +110,11 @@ require (
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
 	go.opentelemetry.io/otel v1.32.0 // indirect
 	go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
-	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 // indirect
-	go.opentelemetry.io/otel/exporters/zipkin v1.24.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 // indirect
+	go.opentelemetry.io/otel/exporters/zipkin v1.32.0 // indirect
 	go.opentelemetry.io/otel/metric v1.32.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.32.0 // indirect
 	go.opentelemetry.io/otel/trace v1.32.0 // indirect
@@ -128,17 +130,17 @@ require (
 	golang.org/x/sync v0.9.0 // indirect
 	golang.org/x/sys v0.27.0 // indirect
 	golang.org/x/tools v0.27.0 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
-	google.golang.org/protobuf v1.35.1 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
+	google.golang.org/protobuf v1.35.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/datatypes v1.2.4 // indirect
-	gorm.io/driver/postgres v1.5.9 // indirect
-	gorm.io/driver/sqlserver v1.5.3 // indirect
+	gorm.io/driver/postgres v1.5.10 // indirect
+	gorm.io/driver/sqlserver v1.5.4 // indirect
 	gorm.io/hints v1.1.2 // indirect
-	modernc.org/libc v1.22.2 // indirect
-	modernc.org/mathutil v1.5.0 // indirect
-	modernc.org/memory v1.5.0 // indirect
-	modernc.org/sqlite v1.20.4 // indirect
+	modernc.org/libc v1.61.2 // indirect
+	modernc.org/mathutil v1.6.0 // indirect
+	modernc.org/memory v1.8.0 // indirect
+	modernc.org/sqlite v1.34.1 // indirect
 )
diff --git a/go.sum b/go.sum
index ef875eb..2e66939 100644
--- a/go.sum
+++ b/go.sum
@@ -9,21 +9,30 @@ github.com/ArtisanCloud/PowerWeChat/v3 v3.2.55/go.mod h1:D2cB1wtwC1YgzYT1Ni8NWS5
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.4.0/go.mod h1:ON4tFdPTwRcgWEaVDrN3584Ef+b7GgSJaXxe5fW9t4M=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.0/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1 h1:/iHxaJhsFr0+xVFfbMr5vxz848jyiWuIEDhYq3y5odY=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.7.1/go.mod h1:bjGvMhVMb+EEm3VRNQawDMUyMMjo+S5ewNjflkep/0Q=
+github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1/go.mod h1:RKUqNu35KJYcVG/fqTRqmuXJZYNhYkBrnC/hX7yGbTA=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 h1:vcYCAze6p19qBW7MhZybIsqD8sMV8js0NyQM8JDnVtg=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0/go.mod h1:OQeznEEkTZ9OrhHJoDD8ZDq51FHgXjqtP9z6bEwBq9U=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.1/go.mod h1:uE9zaUfEQT/nbQjVi2IblCG9iaLtZsuYZ8ne+PuQ02M=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1/go.mod h1:h8hyGFDsU5HMivxiS2iYFZsgDbU9OnnJ163x5UGVKYo=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.2.0/go.mod h1:eWRD7oawr1Mu1sLCawqVc0CUiF43ia3qQMxLscsKQ9w=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 h1:sXr+ck84g/ZlZUOZiNELInmMgOsuGwdjjVkEIde0OtY=
 github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0/go.mod h1:okt5dMMTOFjX/aovMlrjvvXoPMBVSPzk9185BT0+eZM=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.1/go.mod h1:s4kgfzA0covAXNicZHDMN58jExvcng2mC/DepXiF1EI=
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0 h1:yfJe15aSwEQ6Oo6J+gdfdulPNoZ3TEhmbhLIoxZcA+U=
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.0/go.mod h1:Q28U+75mpCaSCDowNEmhIo/rmgdkqmkmzI7N6TGR4UY=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.0.1/go.mod h1:GpPjLhVR9dnUoJMyHWSPy71xY9/lcmpzIPZXmF0FCVY=
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0 h1:T028gtTPiYt/RMUfs8nVsAL7FDQrfLlrm/NnRG/zcC4=
 github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v0.8.0/go.mod h1:cw4zVQgBby0Z5f2v0itn6se2dDP17nTjbZFXW5uPyHA=
+github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0/go.mod h1:kgDmCTgBzIEPFElEF+FK0SdjAor06dRq2Go927dnQ6o=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0 h1:HCc0+LpPfpCKs6LGGLAhwBARt9632unrVcI6i8s/8os=
 github.com/AzureAD/microsoft-authentication-library-for-go v1.1.0/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.1.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0=
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/andybalholm/brotli v1.1.1 h1:PR2pgnyFznKEugtsUo0xLdDop5SKXd5Qf5ysW+7XdTA=
@@ -34,12 +43,16 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bmatcuk/doublestar/v4 v4.6.1 h1:FH9SifrbvJhnlQpztAx++wlkk70QBf0iBWDwNy7PA4I=
 github.com/bmatcuk/doublestar/v4 v4.6.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
+github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
 github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
 github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
 github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/casbin/casbin/v2 v2.100.0 h1:aeugSNjjHfCrgA22nHkVvw2xsscboHv5r0a13ljQKGQ=
 github.com/casbin/casbin/v2 v2.100.0/go.mod h1:LO7YPez4dX3LgoTCqSQAleQDo0S0BeZBDxYnPUl95Ng=
+github.com/casbin/casbin/v2 v2.101.0 h1:y8qZRXcgv5omd3k/7kpaP03Hov82sXzCC5FAfm17lkw=
+github.com/casbin/casbin/v2 v2.101.0/go.mod h1:LO7YPez4dX3LgoTCqSQAleQDo0S0BeZBDxYnPUl95Ng=
 github.com/casbin/gorm-adapter/v3 v3.32.0 h1:Au+IOILBIE9clox5BJhI2nA3p9t7Ep1ePlupdGbGfus=
 github.com/casbin/gorm-adapter/v3 v3.32.0/go.mod h1:Zre/H8p17mpv5U3EaWgPoxLILLdXO3gHW5aoQQpUDZI=
 github.com/casbin/govaluate v1.2.0 h1:wXCXFmqyY+1RwiKfYo3jMKyrtZmOL3kHwaqDyCPOYak=
@@ -69,12 +82,20 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
 github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
+github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA=
+github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU=
 github.com/glebarez/go-sqlite v1.20.3 h1:89BkqGOXR9oRmG58ZrzgoY/Fhy5x0M+/WV48U5zVrZ4=
 github.com/glebarez/go-sqlite v1.20.3/go.mod h1:u3N6D/wftiAzIOJtZl6BmedqxmmkDfH3q+ihjqxC9u0=
+github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec+ruQ=
+github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc=
 github.com/glebarez/sqlite v1.7.0 h1:A7Xj/KN2Lvie4Z4rrgQHY8MsbebX3NyWsL3n2i82MVI=
 github.com/glebarez/sqlite v1.7.0/go.mod h1:PkeevrRlF/1BhQBCnzcMWzgrIk7IOop+qS2jUYLfHhk=
+github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw=
+github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ=
 github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
@@ -89,15 +110,21 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8=
 github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
+github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o=
+github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
 github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
 github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
+github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
+github.com/golang-jwt/jwt/v5 v5.2.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
 github.com/golang-jwt/jwt/v5 v5.2.1/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA=
@@ -116,16 +143,23 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
 github.com/google/pprof v0.0.0-20241101162523-b92577c0c142 h1:sAGdeJj0bnMgUNVeUpp6AYlVdCt3/GdI3pGRqsNSQLs=
 github.com/google/pprof v0.0.0-20241101162523-b92577c0c142/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.5.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
 github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
+github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
+github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
+github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzqQ=
+github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0=
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0 h1:ad0vkEBuk23VJzZR9nkLVG0YAoN9coASF1GusYX6AlU=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.23.0/go.mod h1:igFoXX2ELCW06bol23DWPB5BEWfZISOzSP5K2sbLea0=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 h1:2VTzZjLZBgl62/EtslCrtky5vbi9dd7HrQPQIx6wqiw=
 github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542/go.mod h1:Ow0tF8D4Kplbc8s8sSb3V2oUCygFHVp8gC3Dn6U4MNI=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -143,8 +177,12 @@ github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7Ulw
 github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY=
 github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw=
+github.com/jackc/pgx/v5 v5.7.1 h1:x7SYsPBYDkHDksogeSmZZ5xzThcTgRz++I5E+ePFUcs=
+github.com/jackc/pgx/v5 v5.7.1/go.mod h1:e7O26IywZZ+naJtWWos6i6fvWK+29etgITqrqHLfoZA=
 github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
 github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
+github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo=
+github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs=
 github.com/jcmturner/dnsutils/v2 v2.0.0/go.mod h1:b0TnjGOvI/n42bZa+hmXL+kFJZsFT7G4t3HTlQ184QM=
 github.com/jcmturner/gofork v1.7.6/go.mod h1:1622LH6i/EZqLloHfE7IeZ0uEJwMSUyQ/nDd82IeqRo=
@@ -183,16 +221,22 @@ github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwX
 github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/microsoft/go-mssqldb v1.6.0 h1:mM3gYdVwEPFrlg/Dvr2DNVEgYFG7L42l+dGc67NNNpc=
 github.com/microsoft/go-mssqldb v1.6.0/go.mod h1:00mDtPbeQCRGC1HwOOR5K/gr30P1NcEG0vx6Kbv2aJU=
+github.com/microsoft/go-mssqldb v1.7.2 h1:CHkFJiObW7ItKTJfHo1QX7QBBD1iV+mn1eOyRP3b/PA=
+github.com/microsoft/go-mssqldb v1.7.2/go.mod h1:kOvZKUdrhhFQmxLZqbwUV0rHkNkZpthMITIb2Ko1IoA=
 github.com/modocache/gover v0.0.0-20171022184752-b58185e213c5/go.mod h1:caMODM3PzxT8aQXRPkAt8xlV/e7d7w8GM5g0fa5F0D8=
 github.com/montanaflynn/stats v0.7.0/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 github.com/mssola/useragent v1.0.0 h1:WRlDpXyxHDNfvZaPEut5Biveq86Ze4o4EMffyMxmH5o=
 github.com/mssola/useragent v1.0.0/go.mod h1:hz9Cqz4RXusgg1EdI4Al0INR62kP7aPSRNHnpU+b85Y=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
+github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
 github.com/nicksnyder/go-i18n/v2 v2.4.1 h1:zwzjtX4uYyiaU02K5Ia3zSkpJZrByARkRB4V3YPrr0g=
 github.com/nicksnyder/go-i18n/v2 v2.4.1/go.mod h1:++Pl70FR6Cki7hdzZRnEEqdc2dJt+SAGotyFg/SvZMk=
 github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
 github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
+github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg=
+github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
 github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
 github.com/openzipkin/zipkin-go v0.4.3 h1:9EGwpqkgnwdEIJ+Od7QVSEIH+ocmm5nPat0G7sjsSdg=
@@ -203,12 +247,17 @@ github.com/patrickmn/go-cache v2.1.0+incompatible h1:HRMgzkcYKYpi3C8ajMPV8OFXaaR
 github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
+github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg6/go-requests v0.2.2 h1:wL0aFmyybM/Wuqj8xQa3sNL5ioAL97hQZ78TJovltbM=
 github.com/pkg6/go-requests v0.2.2/go.mod h1:/rcVm8Itd2djtxDVxjRnHURChV86TB4ooZnP+IBZBmg=
+github.com/pkg6/go-requests v0.2.3 h1:IwlH6D1DlIKnBaLccz4dJR75CCoPEw4HD7BST9sD5ko=
+github.com/pkg6/go-requests v0.2.3/go.mod h1:/rcVm8Itd2djtxDVxjRnHURChV86TB4ooZnP+IBZBmg=
 github.com/pkg6/go-sms v0.1.2 h1:HZQlBkRVF9xQHhyCMB3kXY/kltfvuNgMTKuN/DoSg7w=
 github.com/pkg6/go-sms v0.1.2/go.mod h1:PwFBEssnkYXw+mfSmQ+6fwgXgrcUB9NK5dLUglx+ZW4=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -221,6 +270,8 @@ github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=
 github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8=
+github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
+github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
 github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
 github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI=
@@ -236,8 +287,11 @@ github.com/refraction-networking/utls v1.6.7/go.mod h1:BC3O4vQzye5hqpmDTWUqi4P5D
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578 h1:VstopitMQi3hZP0fzvnsLmzXZdQGc4bEcgu24cp+d4M=
 github.com/remyoudompheng/bigfft v0.0.0-20230126093431-47fa9a501578/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
+github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
 github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -269,6 +323,8 @@ github.com/xyproto/randomstring v1.0.5 h1:YtlWPoRdgMu3NZtP45drfy1GKoojuR7hmRcnhZ
 github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3iGxZ18UQApw/E=
 github.com/yitter/idgenerator-go v1.3.1 h1:GjVi2BupiDb1IXaXqrkOJE4p6qKdj3NaM3GdAjWok14=
 github.com/yitter/idgenerator-go v1.3.1/go.mod h1:VVjbqFjGUsIkaXVkXEdmx1LiXUL3K1NvyxWPJBPbBpE=
+github.com/yitter/idgenerator-go v1.3.3 h1:i6rzmpbCL0vlmr/tuW5+lSQzNuDG9vYBjIYRvnRcHE8=
+github.com/yitter/idgenerator-go v1.3.3/go.mod h1:VVjbqFjGUsIkaXVkXEdmx1LiXUL3K1NvyxWPJBPbBpE=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 h1:ilQV1hzziu+LLM3zUTJ0trRztfwgjqKnBWNtSRkbmwM=
 github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78/go.mod h1:aL8wCCfTfSfmXjznFBSZNN13rSJjlIOI1fUNAtF7rmI=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
@@ -276,6 +332,7 @@ github.com/zeromicro/go-zero v1.7.3 h1:yDUQF2DXDhUHc77/NZF6mzsoRPMBfldjPmG2O/ZSz
 github.com/zeromicro/go-zero v1.7.3/go.mod h1:9JIW3gHBGuc9LzvjZnNwINIq9QdiKu3AigajLtkJamQ=
 github.com/zmexing/go-sensitive-word v1.3.0 h1:dB9S9kNklksOODGLLAov0RaVCwC2w9Kwxz6NZMdM6rk=
 github.com/zmexing/go-sensitive-word v1.3.0/go.mod h1:wkNIpkq1iPOe3l7l83zvnnV5mm20jfj2x8V8kjOTsUM=
+go.mongodb.org/mongo-driver v1.17.1 h1:Wic5cJIwJgSpBhe3lx3+/RybR5PiYRMpVFgO7cOHyIM=
 go.mongodb.org/mongo-driver/v2 v2.0.0-beta2 h1:PRtbRKwblE8ZfI8qOhofcjn9y8CmKZI7trS5vDMeJX0=
 go.mongodb.org/mongo-driver/v2 v2.0.0-beta2/go.mod h1:UGLb3ZgEzaY0cCbJpH9UFt9B6gEXiTPzsnJS38nBeoU=
 go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
@@ -284,14 +341,24 @@ go.opentelemetry.io/otel/exporters/jaeger v1.17.0 h1:D7UpUy2Xc2wsi1Ras6V40q806WM
 go.opentelemetry.io/otel/exporters/jaeger v1.17.0/go.mod h1:nPCqOnEH9rNLKqH/+rrUjiMzHJdV1BlpKcTwRTyKkKI=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0 h1:IJFEoHiytixx8cMiVAO+GmHR6Frwu+u5Ur8njpFO6Ac=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.32.0/go.mod h1:3rHrKNtLIoS0oZwkY2vxi+oJcwFRWdtUyRII+so45p8=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 h1:Mw5xcxMwlqoJd97vwPxA8isEaIoxsta9/Q51+TTJLGE=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0/go.mod h1:CQNu9bj7o7mC6U7+CA/schKEYakYXWr79ucDHTMGhCM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0 h1:9kV11HXBHZAvuPUZxmMWrH8hZn/6UnHX4K0mu36vNsU=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.32.0/go.mod h1:JyA0FHXe22E1NeNiHmVp7kFHglnexDQ7uRWDiiJ1hKQ=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 h1:Xw8U6u2f8DK2XAkGRFV7BBLENgnTGX9i4rQRxJf+/vs=
 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0/go.mod h1:6KW1Fm6R/s6Z3PGXwSJN2K4eT6wQB3vXX6CVnYX9NmM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0 h1:cMyu9O88joYEaI47CnQkxO1XZdpoTF9fEnW2duIddhw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.32.0/go.mod h1:6Am3rn7P9TVVeXYG+wtcGE7IE1tsQ+bP3AuWcKt/gOI=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0 h1:s0PHtIkN+3xrbDOpt2M8OTG92cWqUESvzh2MxiR5xY8=
 go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.24.0/go.mod h1:hZlFbDbRt++MMPCCfSJfmhkGIWnX1h3XjkfxZUjLrIA=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0 h1:cC2yDI3IQd0Udsux7Qmq8ToKAx1XCilTQECZ0KDZyTw=
+go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.32.0/go.mod h1:2PD5Ex6z8CFzDbTdOlwyNIUywRr1DN0ospafJM1wJ+s=
 go.opentelemetry.io/otel/exporters/zipkin v1.24.0 h1:3evrL5poBuh1KF51D9gO/S+N/1msnm4DaBqs/rpXUqY=
 go.opentelemetry.io/otel/exporters/zipkin v1.24.0/go.mod h1:0EHgD8R0+8yRhUYJOGR8Hfg2dpiJQxDOszd5smVO9wM=
+go.opentelemetry.io/otel/exporters/zipkin v1.32.0 h1:6O8HgLHPXtXE9QEKEWkBImL9mEKCGEl+m+OncVO53go=
+go.opentelemetry.io/otel/exporters/zipkin v1.32.0/go.mod h1:+MFvorlowjy0iWnsKaNxC1kzczSxe71mw85h4p8yEvg=
 go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
 go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
 go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
@@ -316,7 +383,12 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
+golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
 golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=
 golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg=
 golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo=
@@ -339,7 +411,11 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.13.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
 golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -356,10 +432,15 @@ golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
 golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -367,7 +448,11 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
+golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -375,7 +460,9 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug=
@@ -392,12 +479,20 @@ golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d h1:kHjw/5UfflP/L5EbledDrcG4C2597RtymmGRZvHiCuY=
 google.golang.org/genproto/googleapis/api v0.0.0-20240711142825-46eb208f015d/go.mod h1:mw8MG/Qz5wfgYr6VqVCiZcHe/GJEfI+oGGDCohaVgB0=
+google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 h1:pgr/4QbFyktUv9CtQ/Fq4gzEE6/Xs7iCXbktaGzLHbQ=
+google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697/go.mod h1:+D9ySVjN8nY8YCVjc5O7PZDIdZporIDY3KaGfJunh88=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU=
 google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
 google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
+google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=
+google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA=
 google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
 google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
+google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io=
+google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -417,10 +512,14 @@ gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
 gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
 gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8=
 gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
+gorm.io/driver/postgres v1.5.10 h1:7Lggqempgy496c0WfHXsYWxk3Th+ZcW66/21QhVFdeE=
+gorm.io/driver/postgres v1.5.10/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI=
 gorm.io/driver/sqlite v1.5.0 h1:zKYbzRCpBrT1bNijRnxLDJWPjVfImGEn0lSnUY5gZ+c=
 gorm.io/driver/sqlite v1.5.0/go.mod h1:kDMDfntV9u/vuMmz8APHtHF0b4nyBB7sfCieC6G8k8I=
 gorm.io/driver/sqlserver v1.5.3 h1:rjupPS4PVw+rjJkfvr8jn2lJ8BMhT4UW5FwuJY0P3Z0=
 gorm.io/driver/sqlserver v1.5.3/go.mod h1:B+CZ0/7oFJ6tAlefsKoyxdgDCXJKSgwS2bMOQZT0I00=
+gorm.io/driver/sqlserver v1.5.4 h1:xA+Y1KDNspv79q43bPyjDMUgHoYHLhXYmdFcYPobg8g=
+gorm.io/driver/sqlserver v1.5.4/go.mod h1:+frZ/qYmuna11zHPlh5oc2O6ZA/lS88Keb0XSH1Zh/g=
 gorm.io/gen v0.3.26 h1:sFf1j7vNStimPRRAtH4zz5NiHM+1dr6eA9aaRdplyhY=
 gorm.io/gen v0.3.26/go.mod h1:a5lq5y3w4g5LMxBcw0wnO6tYUCdNutWODq5LrIt75LE=
 gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
@@ -433,13 +532,23 @@ gorm.io/hints v1.1.2 h1:b5j0kwk5p4+3BtDtYqqfY+ATSxjj+6ptPgVveuynn9o=
 gorm.io/hints v1.1.2/go.mod h1:/ARdpUHAtyEMCh5NNi3tI7FsGh+Cj/MIUlvNxCNCFWg=
 gorm.io/plugin/dbresolver v1.5.3 h1:wFwINGZZmttuu9h7XpvbDHd8Lf9bb8GNzp/NpAMV2wU=
 gorm.io/plugin/dbresolver v1.5.3/go.mod h1:TSrVhaUg2DZAWP3PrHlDlITEJmNOkL0tFTjvTEsQ4XE=
+gorm.io/plugin/optimisticlock v1.1.3 h1:uFK8zz+Ln6ju3vGkTd1LY3xR2VBmMxjdU12KBb58PBA=
+gorm.io/plugin/optimisticlock v1.1.3/go.mod h1:S+MH7qnHGQHxDBc9phjgN+DpNPn/qESd1q69fA3dtkg=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 modernc.org/libc v1.22.2 h1:4U7v51GyhlWqQmwCHj28Rdq2Yzwk55ovjFrdPjs8Hb0=
 modernc.org/libc v1.22.2/go.mod h1:uvQavJ1pZ0hIoC/jfqNoMLURIMhKzINIWypNM17puug=
+modernc.org/libc v1.61.2 h1:dkO4DlowfClcJYsvf/RiK6fUwvzCQTmB34bJLt0CAGQ=
+modernc.org/libc v1.61.2/go.mod h1:4QGjNyX3h+rn7V5oHpJY2yH0QN6frt1X+5BkXzwLPCo=
 modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ=
 modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
+modernc.org/mathutil v1.6.0 h1:fRe9+AmYlaej+64JsEEhoWuAYBkOtQiMEU7n/XgfYi4=
+modernc.org/mathutil v1.6.0/go.mod h1:Ui5Q9q1TR2gFm0AQRqQUaBWFLAhQpCwNcuhBOSedWPo=
 modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds=
 modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU=
+modernc.org/memory v1.8.0 h1:IqGTL6eFMaDZZhEWwcREgeMXYwmW83LYW8cROZYkg+E=
+modernc.org/memory v1.8.0/go.mod h1:XPZ936zp5OMKGWPqbD3JShgd/ZoQ7899TUuQqxY+peU=
 modernc.org/sqlite v1.20.4 h1:J8+m2trkN+KKoE7jglyHYYYiaq5xmz2HoHJIiBlRzbE=
 modernc.org/sqlite v1.20.4/go.mod h1:zKcGyrICaxNTMEHSr1HQ2GUraP0j+845GYw37+EyT6A=
+modernc.org/sqlite v1.34.1 h1:u3Yi6M0N8t9yKRDwhXcyp1eS5/ErhPTBggxWFuR6Hfk=
+modernc.org/sqlite v1.34.1/go.mod h1:pXV2xHxhzXZsgT/RtTFAPY6JJDEvOTcTdwADQCCWD4k=