diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 040203ff68..84193153a7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,7 +72,6 @@ android_build:
   only:
     - dev
     - release
-    - feat/GHZSCY-6578
 
 # 代码检查
 sonarqube_analysis:
@@ -157,5 +156,4 @@ oss-upload&send-email:
         - /usr/local/bin/python /ci-android-mail-jira-comment.py
     only:
         - dev
-        - release
-        - feat/GHZSCY-6578
\ No newline at end of file
+        - release
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java
index 476af1e3f7..9ce765d725 100644
--- a/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/collection/AnswerAdapter.java
@@ -137,7 +137,7 @@ public class AnswerAdapter extends ListAdapter<AnswerEntity> implements ISyncAda
                 holder.itemView.setOnClickListener(v -> {
                     if (mCurrentOption == ManageOption.OPTION_MANAGER) {
                         if (entity.getActive()) {
-                            mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext, entity.getQuestions().getId(), entity.getId(), mEntrance, path));
+                            mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext, entity.getQuestions().getId(), entity.getId(), mEntrance, path, ""));
                         } else {
                             showDeleteDialog(entity.getId());
                         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt
index 28868aea9c..50a7c2c7c2 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/detail/ForumArticleAskListAdapter.kt
@@ -117,7 +117,7 @@ class ForumArticleAskListAdapter(
                 answerViewHolder.itemView.setOnClickListener {
                     val entrance = BaseActivity.mergeEntranceAndPath(entrance, path)
                     val userId = answer.user.id ?: ""
-                    val contentId = answer.id ?: ""
+                    val contentId = answer.id
                     val sequence = articlePosition + 1
                     val bbsType = if (answer.bbs.type == "official_bbs") "综合论坛" else "游戏论坛"
                     when (answer.type) {
@@ -164,7 +164,7 @@ class ForumArticleAskListAdapter(
                                 holder.getKey(entrance),
                                 "${answer.title}（${answer.id}）"
                             )
-                            mContext.startActivity(ForumVideoDetailActivity.getIntent(mContext, answer.id ?: "", bbsId, "论坛详情-信息流"))
+                            mContext.startActivity(ForumVideoDetailActivity.getIntent(mContext, answer.id, bbsId, "论坛详情-信息流"))
                         }
                         "question" -> {
                             NewLogUtils.logForumDetailFeedContentClick(
@@ -206,7 +206,12 @@ class ForumArticleAskListAdapter(
                             )
                             mContext.startActivity(
                                 NewQuestionDetailActivity.getCommentIntent(
-                                    mContext, answer.questions.id, answer.id, entrance, path
+                                    mContext,
+                                    answer.questions.id,
+                                    answer.id,
+                                    entrance,
+                                    path,
+                                    sourceEntrance = "论坛详情-信息流"
                                 )
                             )
                         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
index 2b2f30c40d..6c0f7da1ac 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleAskItemViewHolder.kt
@@ -486,7 +486,7 @@ class ForumArticleAskItemViewHolder(
                     val intent = ArticleDetailActivity.getCommentIntent(
                         itemView.context,
                         CommunityEntity(communityId, entity.communityName ?: ""),
-                        entity.id ?: "",
+                        entity.id,
                         entrance, ""
                     )
                     itemView.context.startActivity(intent)
@@ -497,8 +497,7 @@ class ForumArticleAskItemViewHolder(
                     val communityId = entity.community.id
                     itemView.context.startActivity(
                         ForumVideoDetailActivity.getIntent(
-                            itemView.context, entity.id
-                                ?: "", communityId, true
+                            itemView.context, entity.id, communityId, true
                         )
                     )
                 }
@@ -522,8 +521,9 @@ class ForumArticleAskItemViewHolder(
                         NewQuestionDetailActivity.getCommentIntent(
                             it.context,
                             entity.questions.id,
-                            entity.id ?: "",
+                            entity.id,
                             entrance,
+                            "",
                             ""
                         )
                     )
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt
index afabc50940..c965772d55 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/ForumArticleListAdapter.kt
@@ -199,7 +199,8 @@ class ForumArticleListAdapter(
                                     articleEntity.recommendId,
                                     mEntrance,
                                     path,
-                                    true
+                                    true,
+                                    sourceEntrance = "社区-推荐信息流"
                                 )
                             )
                         }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/follow/FollowActivityResultLauncher.kt b/app/src/main/java/com/gh/gamecenter/forum/home/follow/FollowActivityResultLauncher.kt
index e2d786f882..f45ce44644 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/follow/FollowActivityResultLauncher.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/follow/FollowActivityResultLauncher.kt
@@ -128,7 +128,8 @@ class FollowActivityResultLauncher(
                             context,
                             input.historyEntity.id,
                             "",
-                            UserHistoryFragment.PATH_USER_QUESTION_ANSWER
+                            UserHistoryFragment.PATH_USER_QUESTION_ANSWER,
+                            sourceEntrance = "关注-论坛动态"
                         )
                     } else {
                         if (input.answerEntity?.type == "question") {
@@ -144,7 +145,8 @@ class FollowActivityResultLauncher(
                                 input.answerEntity?.questions?.id ?: "",
                                 input.answerEntity?.answerId ?: "",
                                 "",
-                                ""
+                                "",
+                                sourceEntrance = "关注-论坛动态",
                             )
                         }
 
diff --git a/app/src/main/java/com/gh/gamecenter/forum/home/follow/viewholder/FollowPostCardViewHolder.kt b/app/src/main/java/com/gh/gamecenter/forum/home/follow/viewholder/FollowPostCardViewHolder.kt
index 5f308f0f63..fa9bb67401 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/home/follow/viewholder/FollowPostCardViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/home/follow/viewholder/FollowPostCardViewHolder.kt
@@ -113,7 +113,8 @@ class FollowPostCardViewHolder(
                             articleEntity.recommendId,
                             "",
                             path,
-                            true
+                            true,
+                            sourceEntrance = "社区-关注"
                         )
                     )
                 }
diff --git a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
index 4ef583a762..5d7a91db6b 100644
--- a/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/forum/search/ForumContentSearchListAdapter.kt
@@ -201,7 +201,7 @@ class ForumContentSearchListAdapter(
                                 mContext.startActivity(
                                     ForumVideoDetailActivity.getIntent(
                                         mContext,
-                                        answer.id ?: "",
+                                        answer.id,
                                         answer.bbs.id,
                                         sourceEntrance = "社区-搜索-内容榜单"
                                     )
@@ -309,8 +309,9 @@ class ForumContentSearchListAdapter(
                                 mContext.startActivity(
                                     ForumVideoDetailActivity.getIntent(
                                         mContext,
-                                        answer.id ?: "",
-                                        answer.bbs.id
+                                        answer.id,
+                                        answer.bbs.id,
+                                        sourceEntrance = "社区-搜索-内容榜单"
                                     )
                                 )
                             }
@@ -406,8 +407,9 @@ class ForumContentSearchListAdapter(
                                     mContext.startActivity(
                                         ForumVideoDetailActivity.getIntent(
                                             mContext,
-                                            answer.id ?: "",
-                                            answer.bbs.id
+                                            answer.id,
+                                            answer.bbs.id,
+                                            sourceEntrance = "社区-搜索-内容榜单"
                                         )
                                     )
                                 }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt
index 9d36184498..1ab78caac5 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/answer/BaseAnswerOrArticleItemViewHolder.kt
@@ -71,7 +71,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH
                     val intent = ArticleDetailActivity.getCommentIntent(
                         itemView.context,
                         CommunityEntity(communityId, entity.communityName ?: ""),
-                        entity.id ?: "", entrance, ""
+                        entity.id, entrance, ""
                     )
                     itemView.context.startActivity(intent)
                 }
@@ -250,6 +250,7 @@ open class BaseAnswerOrArticleItemViewHolder(itemView: View) : BaseRecyclerViewH
                         entity.questions.id,
                         entity.id,
                         entrance,
+                        "",
                         ""
                     )
                     itemView.context.startActivity(intent)
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
index 5a046c855c..109d3aa708 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailActivity.kt
@@ -65,7 +65,8 @@ class ArticleDetailActivity : ToolBarActivity() {
             community: CommunityEntity,
             articleId: String,
             entrance: String,
-            path: String
+            path: String,
+            sourceEntrance: String = "",
         ): Intent {
             val intent = Intent(context, ArticleDetailActivity::class.java)
             intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
@@ -73,6 +74,7 @@ class ArticleDetailActivity : ToolBarActivity() {
             intent.putExtra(EntranceConsts.KEY_COMMUNITY_DATA, community)
             intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
             intent.putExtra(EntranceConsts.KEY_PATH, path)
+            intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
             return intent
         }
 
@@ -106,7 +108,8 @@ class ArticleDetailActivity : ToolBarActivity() {
             articleId: String,
             topCommentId: String,
             entrance: String,
-            path: String
+            path: String,
+            sourceEntrance: String = "",
         ): Intent {
             val intent = Intent(context, ArticleDetailActivity::class.java)
             intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
@@ -115,6 +118,7 @@ class ArticleDetailActivity : ToolBarActivity() {
             intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
             intent.putExtra(EntranceConsts.KEY_TOP_COMMENT_ID, topCommentId)
             intent.putExtra(EntranceConsts.KEY_PATH, path)
+            intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
             return intent
         }
     }
diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailRelatedContentListAdapter.kt b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailRelatedContentListAdapter.kt
index 68f280ea9a..76cf4a3c7c 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailRelatedContentListAdapter.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/article/detail/ArticleDetailRelatedContentListAdapter.kt
@@ -85,6 +85,7 @@ class ArticleDetailRelatedContentListAdapter(
                                 item.questions.id,
                                 item.id,
                                 entrance,
+                                "",
                                 ""
                             )
                             it.context.startActivity(intent)
diff --git a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java
index 48f3b534d7..c4c44e57c1 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java
+++ b/app/src/main/java/com/gh/gamecenter/qa/myqa/MyAnswerAdapter.java
@@ -85,7 +85,7 @@ class MyAnswerAdapter extends ListAdapter<AnswerEntity> implements ISyncAdapterH
                         NewFlatLogUtils.logHaloSelfPublishContent("回答", "卡片内容");
                     }
                     mContext.startActivity(NewQuestionDetailActivity.getCommentIntent(mContext,
-                            entity.getQuestions().getId(), entity.getId() != null ? entity.getId() : "", mEntrance, "我的光环-我的问答-我的回答"));
+                            entity.getQuestions().getId(), entity.getId() != null ? entity.getId() : "", mEntrance, "我的光环-我的问答-我的回答", ""));
                 });
                 answerViewHolder.getCommentCount().setVisibility(View.INVISIBLE);
 
diff --git a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
index 77eeb3c5a4..34231b7950 100644
--- a/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
+++ b/app/src/main/java/com/gh/gamecenter/qa/questions/newdetail/NewQuestionDetailActivity.kt
@@ -58,13 +58,15 @@ class NewQuestionDetailActivity : ToolBarActivity() {
             context: Context,
             questionId: String,
             entrance: String,
-            path: String
+            path: String,
+            sourceEntrance: String = ""
         ): Intent {
             val intent = Intent(context, NewQuestionDetailActivity::class.java)
             intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
             intent.putExtra(EntranceConsts.KEY_QUESTIONS_ID, questionId)
             intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
             intent.putExtra(EntranceConsts.KEY_PATH, path)
+            intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
             return intent
         }
 
@@ -74,7 +76,8 @@ class NewQuestionDetailActivity : ToolBarActivity() {
             questionId: String,
             answerId: String,
             entrance: String,
-            path: String
+            path: String,
+            sourceEntrance: String = ""
         ): Intent {
             val intent = Intent(context, NewQuestionDetailActivity::class.java)
             intent.putExtra(EntranceConsts.KEY_ENTRANCE, mergeEntranceAndPath(entrance, path))
@@ -82,6 +85,7 @@ class NewQuestionDetailActivity : ToolBarActivity() {
             intent.putExtra(EntranceConsts.KEY_ANSWER_ID, answerId)
             intent.putExtra(EntranceConsts.KEY_SCROLL_TO_COMMENT_AREA, true)
             intent.putExtra(EntranceConsts.KEY_PATH, path)
+            intent.putExtra(EntranceConsts.KEY_SOURCE_ENTRANCE, sourceEntrance)
             return intent
         }