Merge branch 'master-alipay-bug' into dev

# Conflicts:
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java
#	ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/constant/RedisKey.java

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/feign/IUserService.java

@@ -29,7 +29,7 @@ public interface IUserService {
     AppUserInfo AppValidate(@RequestBody JwtAuthenticationRequest authenticationRequest);
 
     @RequestMapping(value = "/api/app/user/sendsms", method = RequestMethod.POST)
-    public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList",defaultValue = "")String pointList);
+    public JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList", defaultValue = "")String pointList);
     @RequestMapping(value = "/api/app/user/register", method = RequestMethod.POST)
     public JSONObject register(   @RequestParam(value="username",defaultValue="")String  username,
                                   @RequestParam(value="mobilecode",defaultValue="")String mobilecode,

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserAlipayBiz.java

@@ -111,7 +111,7 @@ public class AppUserAlipayBiz extends BaseBiz<AppUserAlipayMapper, AppUserAlipay
 
     public void  save(AppUserAlipay appUserAlipay) {
         Example example=new Example(AppUserAlipay.class);
-        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0);
+        example.createCriteria().andEqualTo("userId", appUserAlipay.getUserId()).andEqualTo("isDel",0).andEqualTo("txAlipay", appUserAlipay.getTxAlipay());
         example.setOrderByClause("is_default desc");
         AppUserAlipay oldValue = mapper.selectOneByExample(example);
         if (oldValue != null) {

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -71,7 +71,7 @@ public class AppUserRest {
      */
     @RequestMapping(value = "/user/sendsms", method = RequestMethod.POST)
     public @ResponseBody
-    JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList")String pointList){
+    JSONObject sendsms(@RequestParam(value="username",defaultValue="")String  username, @RequestParam(value="type",defaultValue="0")Integer type, @RequestParam(value="pointList",defaultValue = "")String pointList){
         return appPermissionService.sendSMS(username,type, pointList);
     }