清单，用户信息
RSA私钥公钥替换
RSA测试
Merge branch 'master' of https://github.com/zipn/zipn.git

Conflicts:
	src/main/java/cn/bmwm/modules/shop/controller/app/CartController.java
	src/main/java/cn/bmwm/modules/shop/controller/app/UserController.java
	src/main/java/cn/bmwm/modules/sys/interceptor/AppLoginInterceptor.java
	src/main/resources/application.xml
	src/test/java/lbs/baidu/test/RSATest.java