update

src/main/java/com/zhiqiyun/open/core/service/UserBaseInfoService.java

@@ -21,10 +21,9 @@ public interface UserBaseInfoService extends IService<UserBaseInfo> {
      * 查询用户单个的登录账号
      *
      * @param loginAccount
-     * @param accountType
      * @return
      */
-    UserLoginAccount findLoginAccount(String loginAccount, AccountType accountType);
+    UserLoginAccount findLoginAccount(String loginAccount);
 
     /**
      * 查询用户登录密码

src/main/java/com/zhiqiyun/open/core/service/impl/UserBaseInfoServiceImpl.java

@@ -49,15 +49,12 @@ public class UserBaseInfoServiceImpl extends ServiceImpl<UserBaseInfoMapper, Use
     private Ip2RegionService ip2RegionService;
 
     @Override
-    public UserLoginAccount findLoginAccount(String loginAccount, AccountType accountType) {
+    public UserLoginAccount findLoginAccount(String loginAccount) {
         QueryWrapper<UserLoginAccount> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isBlank(loginAccount)) {
             return null;
         }
         queryWrapper.eq("login_account", loginAccount);
-        if (accountType != null) {
-            queryWrapper.eq("account_type", accountType);
-        }
         queryWrapper.last("limit 1");
         return this.userLoginAccountMapper.selectOne(queryWrapper);
     }

src/main/java/com/zhiqiyun/open/mvc/controller/OauthController.java

@@ -71,15 +71,14 @@ public class OauthController {
     public Result login(@Valid @RequestBody LoginParam loginParam) {
         UserLoginLog userLoginLog = new UserLoginLog();
         try {
-            AccountType accountType = null;
-            if (PatternUtils.validExpression(loginParam.getLoginAccount(), PatternUtils.MOBILE_EXPRESSION)) {
-                accountType = AccountType.mp;
-            }
-            if (PatternUtils.validExpression(loginParam.getLoginAccount(), PatternUtils.EMAIL_EXPRESSION)) {
-                accountType = AccountType.email;
-            }
+//            AccountType accountType = null;
+//            if (PatternUtils.validExpression(loginParam.getLoginAccount(), PatternUtils.MOBILE_EXPRESSION)) {
+//                accountType = AccountType.mp;
+//            }
+//            if (PatternUtils.validExpression(loginParam.getLoginAccount(), PatternUtils.EMAIL_EXPRESSION)) {
+//                accountType = AccountType.email;
+//            }
             userLoginLog.setLoginAccount(loginParam.getLoginAccount());
-            userLoginLog.setAccountType(accountType);
 
             boolean compareCaptchaResult = this.captchaService.compareCaptcha(loginParam.getCaptcha(), loginParam.getToken(), true);
             if (!compareCaptchaResult) {
@@ -87,11 +86,12 @@ public class OauthController {
                 return Result.instance("验证码错误，请重新输入");
             }
 
-            UserLoginAccount userLoginAccount = this.userBaseInfoService.findLoginAccount(loginParam.getLoginAccount(), accountType);
+            UserLoginAccount userLoginAccount = this.userBaseInfoService.findLoginAccount(loginParam.getLoginAccount());
             if (userLoginAccount == null) {
                 userLoginLog.setState(UserLoginLogState.ACCOUNT_NOT_EXIST);
                 return Result.instance("用户名或密码错误，请重新输入");
             } else {
+                userLoginLog.setAccountType(userLoginAccount.getAccountType());
                 UserBaseInfo userBaseInfo = this.userBaseInfoService.getById(userLoginAccount.getUid());
 
                 UserPassword userPassword = this.userBaseInfoService.findPassword(userBaseInfo.getId(), PasswordType.login);

src/main/java/com/zhiqiyun/open/mvc/controller/PlaceBaseInfoController.java

@@ -32,7 +32,7 @@ import java.util.Map;
 
 @Slf4j
 @RestController
-@RequestMapping("/bz/data/info")
+@RequestMapping("/place/info")
 public class PlaceBaseInfoController {
 
 	@Autowired

src/main/java/com/zhiqiyun/open/mvc/controller/PlaceCategoryController.java

@@ -26,7 +26,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/bz/data/type")
+@RequestMapping("/place/category")
 public class PlaceCategoryController {
 
     @Autowired

src/main/java/com/zhiqiyun/open/mvc/controller/PlaceCategoryExtendColumnController.java

@@ -22,7 +22,7 @@ import javax.validation.Valid;
 import java.util.List;
 
 @RestController
-@RequestMapping("/bz/data/type/extend/column")
+@RequestMapping("/place/category/extend/column")
 public class PlaceCategoryExtendColumnController {
 
     @Autowired
@@ -38,7 +38,7 @@ public class PlaceCategoryExtendColumnController {
         QueryWrapper<PlaceCategoryExtendColumn> wrapper = new QueryWrapper<>();
 
         wrapper.eq("category_id", param.getCategoryId());
-        
+
         if (StringUtils.isNotBlank(param.getFieldKey())) {
             wrapper.eq("field_key", param.getFieldKey());
         }

src/main/java/com/zhiqiyun/open/mvc/controller/UserInfoController.java

@@ -130,7 +130,7 @@ public class UserInfoController {
         List<UserLoginAccount> loginAccounts = new ArrayList<>();
 
         if (StringUtils.isNotBlank(param.getMp())) {
-            UserLoginAccount mpAccount = this.userBaseInfoService.findLoginAccount(param.getMp(), AccountType.mp);
+            UserLoginAccount mpAccount = this.userBaseInfoService.findLoginAccount(param.getMp());
             if (mpAccount != null && !mpAccount.getUid().equals(uid)) {
                 return Result.instance("手机号已被其他用户使用，请使更换手机号");
             }
@@ -138,7 +138,7 @@ public class UserInfoController {
         }
 
         if (StringUtils.isNotBlank(param.getEmail())) {
-            UserLoginAccount emailAccount = this.userBaseInfoService.findLoginAccount(param.getEmail(), AccountType.email);
+            UserLoginAccount emailAccount = this.userBaseInfoService.findLoginAccount(param.getEmail());
             if (emailAccount != null && !emailAccount.getUid().equals(uid)) {
                 return Result.instance("邮箱已被其他用户使用，请使更换邮箱");
             }

src/main/java/com/zhiqiyun/open/router/apis/PlaceApi.java

@@ -0,0 +1,4 @@
+package com.zhiqiyun.open.router.apis;
+
+public class PlaceApi {
+}