chore: optimize resolver logic#2178

ErKeLost wants to merge 2 commits intofarm-fe:v2-devfarm-fe/farm:v2-devfrom

ErKeLost:chore/optimize-resolverErKeLost/farm:chore/optimize-resolverCopy head branch name to clipboard