[SD] modify api .
[SD] commit code .
solve conflict .