solve build.gradle conflict, merge dev to master

[MaggieNgWu]

No description provided.

[ghost]

Sider detected 5 warnings on analyzing the commit 8a0dfa3.

• ⚠️ Cppcheck
• ⚠️ cpplint
• ⚠️ Goodcheck
• ⚠️ Phinder
• ⚠️ SCSS-Lint

We recommend fixing them as possible by updating the dependencies, configuring the analysis tool, configuring sider.yml, turning off unused tools, and so on.

If you have problems or questions still, feel free to ask us via chat. 💬

---

You can turn off this notification if you don't want to receive it from now on.

[sonarqubecloud]

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities (and 0 Security Hotspots to review)
0 Code Smells

No Coverage information
0.0% Duplication

[codecov-io]

Codecov Report

Merging #183 into master will increase coverage by 0.03%.
The diff coverage is 10.40%.

@@             Coverage Diff              @@
##             master     #183      +/-   ##
============================================
+ Coverage     17.08%   17.12%   +0.03%     
- Complexity      655      662       +7     
============================================
  Files           411      413       +2     
  Lines         12267    12410     +143     
  Branches       1430     1443      +13     
============================================
+ Hits           2096     2125      +29     
- Misses         9946    10050     +104     
- Partials        225      235      +10     

Impacted Files	Coverage Δ	Complexity Δ
...op/src/main/java/org/fisco/bcos/sdk/amop/Amop.java	66.66% <ø> (ø)	1.00 <0.00> (ø)
...src/main/java/org/fisco/bcos/sdk/amop/AmopImp.java	0.00% <0.00%> (ø)	0.00 <0.00> (ø)
...ain/java/org/fisco/bcos/sdk/amop/AmopResponse.java	0.00% <0.00%> (ø)	0.00 <0.00> (?)
.../org/fisco/bcos/sdk/amop/AmopResponseCallback.java	0.00% <0.00%> (ø)	0.00 <0.00> (?)
.../org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java	56.66% <0.00%> (-1.96%)	17.00 <1.00> (+1.00)	⬇️
...va/org/fisco/bcos/sdk/amop/topic/TopicManager.java	82.52% <0.00%> (-1.64%)	26.00 <2.00> (ø)
...in/java/org/fisco/bcos/sdk/channel/ChannelImp.java	0.00% <0.00%> (ø)	0.00 <0.00> (ø)
.../org/fisco/bcos/sdk/network/ConnectionManager.java	0.00% <0.00%> (ø)	0.00 <0.00> (ø)
...va/org/fisco/bcos/sdk/crypto/keystore/KeyTool.java	71.65% <0.00%> (-4.82%)	18.00 <0.00> (-1.00)
...rg/fisco/bcos/sdk/crypto/keystore/P12KeyStore.java	70.90% <0.00%> (-2.68%)	5.00 <0.00> (ø)
... and 17 more

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 07beb27...8a0dfa3. Read the comment docs.