diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java index f733edca..abdfb89f 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/LoginController.java @@ -106,14 +106,6 @@ public class LoginController extends BaseControllerImpl { return geTuiPushService.pushMessageToCid("d4df466ea274314ec1025bafa0043f8b", title, paramsJSON.getStr("message"), clickType, clinkContent); } - @RequestMapping(value = "/testcase", method = RequestMethod.GET) - public Object testcase() { - Map arg = new HashMap(); - arg.put("password", "HzMk23"); - - return accountUserBaseService.sendSmsMessage("", "SMS_481085172", arg); - } - @ApiOperation(value = "登录以后返回token") @ApiImplicitParams({ @ApiImplicitParam(name = "user_account", value = "账号", paramType = "query", required = false, dataType = "String"), diff --git a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java index cd3ba870..39838857 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java +++ b/mall-account/src/main/java/com/suisung/mall/account/controller/admin/AccountUserBaseController.java @@ -193,7 +193,7 @@ public class AccountUserBaseController extends BaseControllerImpl { params.put("password", ""); params.put("user_mobile", userMobile); params.put("is_merch", "1"); // 是否为商家入驻 1-是;其他-否 - params.put("user_is_admin", "2"); // //user_is_admin 用户类型:0-普通用户;1-管理员;2-入驻商户;默认是普通用户 + params.put("user_is_admin", CommonConstant.USER_TYPE_MCH.toString()); // //user_is_admin 用户类型:0-普通用户;1-管理员;2-入驻商户;默认是普通用户 if (StrUtil.isNotBlank(cid)) { params.put("cid", cid); // 个推客户端Id diff --git a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java index 95a0e1c3..2f516df1 100644 --- a/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java +++ b/mall-account/src/main/java/com/suisung/mall/account/service/impl/AccountUserBaseServiceImpl.java @@ -218,7 +218,7 @@ public class AccountUserBaseServiceImpl extends BaseServiceImpl