From 2d12350faf338e2f9b642c535822aa5082441719 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 10 十月 2022 11:12:19 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index ecb58f8..7be0118 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -50,7 +50,7 @@
SysUser user=null;
//管理员登录
- if(StringUtils.equals("zigonggaoadmin",account))
+ if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("ceshirenyuan",account) )
{
user= IUserService.getUserByAccount(account);
@@ -99,6 +99,7 @@
newSysUser.setAvatar(huaChengSysUser.getImageUrl());
newSysUser.setCreateTime(LocalDateTime.now());
newSysUser.setUpdateTime(LocalDateTime.now());
+ newSysUser.setOpenid(huaChengSysUser.getOpenid());
IUserService.insertConfig(newSysUser);
}
@@ -109,7 +110,6 @@
}
String token = tokenManager.getTokenByUserId(user.getUserId());
-// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
System.out.println("token "+token);
if (token == null) {
//生成一个token，保存用户登录状态
@@ -128,12 +128,14 @@
return ResultData.success(map);
}
+
@ApiOperation("发送登录短信验证码")
@PostMapping(value = "/sendSms", consumes = "application/json")
public ResultData smsSend(@RequestBody SysUser user) {
return IUserService.smsSend(user);
}
+
@ApiOperation("账号密码验证登录")
@GetMapping(value = "/loginByAccount")
public ResultData loginByAccount(@RequestParam String phonenumber,@RequestParam String code) {
--
Gitblit v1.7.1