环境配置
Merge branch 'master' of https://github.com/fwb7014/first.git

Conflicts:
	spring-test/.classpath
	spring-test/.settings/org.eclipse.jdt.core.prefs
提交代码
修改了宝付的加密方式