From 0879c9d257840e5e9858a2a724d219728120b2fa Mon Sep 17 00:00:00 2001
From: landaiqing <landaiqing@126.com>
Date: Wed, 27 Nov 2024 18:57:16 +0800
Subject: [PATCH] :bug: fixed comment reply list bug

---
 .idea/GOHCache.xml                                        | 8 ++++----
 .../api/internal/logic/comment/get_reply_list_logic.go    | 2 +-
 .../api/internal/middleware/casbinverify_middleware.go    | 4 ++--
 app/core/api/internal/svc/service_context.go              | 2 +-
 app/core/api/repository/casbinx/casbin.go                 | 5 ++---
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/.idea/GOHCache.xml b/.idea/GOHCache.xml
index ef57825..3059282 100644
--- a/.idea/GOHCache.xml
+++ b/.idea/GOHCache.xml
@@ -1751,7 +1751,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/middleware/casbinverify_middleware.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1731933523737" />
+              <option name="lastModified" value="1732502377314" />
               <option name="schema">
                 <list>
                   <option value="CasbinVerifyMiddleware" />
@@ -1775,7 +1775,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/internal/svc/service_context.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732275098629" />
+              <option name="lastModified" value="1732502377305" />
               <option name="schema">
                 <list>
                   <option value="ServiceContext" />
@@ -1878,7 +1878,7 @@
         <entry key="file://$PROJECT_DIR$/app/core/api/repository/casbinx/casbin.go">
           <value>
             <ScannedPath>
-              <option name="lastModified" value="1732159281356" />
+              <option name="lastModified" value="1732502718747" />
             </ScannedPath>
           </value>
         </entry>
@@ -2477,6 +2477,6 @@
         <entry key="wechat_callback_logic" value="WechatCallbackLogic" />
       </map>
     </option>
-    <option name="lastTimeChecked" value="1732450867228" />
+    <option name="lastTimeChecked" value="1732555132343" />
   </component>
 </project>
\ No newline at end of file
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 f223e6d..b5b816c 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
@@ -66,7 +66,7 @@ func (l *GetReplyListLogic) GetReplyList(req *types.ReplyListRequest) (resp *typ
 		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)).
+		Where(reply.TopicID.Eq(req.TopicId), reply.ReplyID.Eq(req.CommentId), reply.CommentType.Eq(constant.REPLY)).
 		Order(reply.Likes.Desc(), reply.CreatedAt.Desc()).
 		ScanByPage(&replyQueryList, (req.Page-1)*req.Size, req.Size)
 	if err != nil {
diff --git a/app/core/api/internal/middleware/casbinverify_middleware.go b/app/core/api/internal/middleware/casbinverify_middleware.go
index 3fa6fd9..635a9ee 100644
--- a/app/core/api/internal/middleware/casbinverify_middleware.go
+++ b/app/core/api/internal/middleware/casbinverify_middleware.go
@@ -10,11 +10,11 @@ import (
 )
 
 type CasbinVerifyMiddleware struct {
-	casbin  *casbin.CachedEnforcer
+	casbin  *casbin.SyncedCachedEnforcer
 	session *redisstore.RedisStore
 }
 
-func NewCasbinVerifyMiddleware(casbin *casbin.CachedEnforcer, session *redisstore.RedisStore) *CasbinVerifyMiddleware {
+func NewCasbinVerifyMiddleware(casbin *casbin.SyncedCachedEnforcer, session *redisstore.RedisStore) *CasbinVerifyMiddleware {
 	return &CasbinVerifyMiddleware{
 		casbin:  casbin,
 		session: session,
diff --git a/app/core/api/internal/svc/service_context.go b/app/core/api/internal/svc/service_context.go
index a49f8d0..f1c9b81 100644
--- a/app/core/api/internal/svc/service_context.go
+++ b/app/core/api/internal/svc/service_context.go
@@ -35,7 +35,7 @@ type ServiceContext struct {
 	MongoClient               *mongo.Database
 	Session                   *redisstore.RedisStore
 	Ip2Region                 *xdb.Searcher
-	CasbinEnforcer            *casbin.CachedEnforcer
+	CasbinEnforcer            *casbin.SyncedCachedEnforcer
 	WechatPublic              *officialAccount.OfficialAccount
 	Sensitive                 *sensitive.Manager
 	RotateCaptcha             rotate.Captcha
diff --git a/app/core/api/repository/casbinx/casbin.go b/app/core/api/repository/casbinx/casbin.go
index df35850..42e71d0 100644
--- a/app/core/api/repository/casbinx/casbin.go
+++ b/app/core/api/repository/casbinx/casbin.go
@@ -11,7 +11,7 @@ import (
 )
 
 // NewCasbin creates a new casbinx enforcer with a mysql adapter and loads the policy from the file system.
-func NewCasbin(engine *gorm.DB) *casbin.CachedEnforcer {
+func NewCasbin(engine *gorm.DB) *casbin.SyncedCachedEnforcer {
 	a, err := gormadapter.NewAdapterByDBUseTableName(engine, "sca_auth_", "permission_rule")
 	if err != nil {
 		panic(err)
@@ -25,12 +25,11 @@ func NewCasbin(engine *gorm.DB) *casbin.CachedEnforcer {
 	if err != nil {
 		panic(err)
 	}
-	e, err := casbin.NewCachedEnforcer(modelFile, a)
+	e, err := casbin.NewSyncedCachedEnforcer(modelFile, a)
 	if err != nil {
 		panic(err)
 	}
 	e.EnableCache(true)
-	e.SetExpireTime(60 * 60)
 	err = e.LoadPolicy()
 	if err != nil {
 		panic(err)