cherry pick https://github.com/apache/incubator-devlake/pull/8298/ and https://github.com/apache/incubator-devlake/pull/8300 to v1.0

cherry pick https://github.com/apache/incubator-devlake/pull/8298/ and https://github.com/apache/incubator-devlake/pull/8300 to v1.0 #13316