Skip to content

X
xyqb-user2
Commit 437c6479 authored by Java—红包—徐 然's avatar Java—红包—徐 然
Browse files
Options

暂时注释掉

parent b306d9b7
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
src/main/java/cn/quantgroup/xyqb/controller/internal/user/UserController.java
View file @ 437c6479
...@@ -90,20 +90,20 @@ public class UserController implements IBaseController { ...@@ -90,20 +90,20 @@ public class UserController implements IBaseController {
return loginWithHttpBasic(channelId, appChannel, createdFrom, merchant, request, openId,dimension); return loginWithHttpBasic(channelId, appChannel, createdFrom, merchant, request, openId,dimension);
} }
} }
@LogHttpCaller //@LogHttpCaller
@RequestMapping("/login2") //@RequestMapping("/login2")
public JsonResult login2( //public JsonResult login2(
@RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel, // @RequestParam(required = false, defaultValue = "1") Long channelId, String appChannel,
@RequestParam(required = false, defaultValue = "1") Long createdFrom, // @RequestParam(required = false, defaultValue = "1") Long createdFrom,
@RequestParam(required = false, defaultValue = "") String userId, HttpServletRequest request, @RequestParam(required = false) String openId,@RequestParam(required = false) String dimension) { // @RequestParam(required = false, defaultValue = "") String userId, HttpServletRequest request, @RequestParam(required = false) String openId,@RequestParam(required = false) String dimension) {
//
if (!StringUtils.isEmpty(userId) && userId.length() > 10) { // if (!StringUtils.isEmpty(userId) && userId.length() > 10) {
//
return loginWithUserId(channelId, appChannel, createdFrom, userId, null, dimension); // return loginWithUserId(channelId, appChannel, createdFrom, userId, null, dimension);
} else { // } else {
return loginWithHttpBasic(channelId, appChannel, createdFrom, null, request, null,dimension); // return loginWithHttpBasic(channelId, appChannel, createdFrom, null, request, null,dimension);
} // }
} //}
@RequestMapping("/test") @RequestMapping("/test")
public JsonResult test() { public JsonResult test() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment