@@ -1,7 +1,7 @@ | |||
Server端 项目 | |||
第一步:登录授权获取code: | |||
http://127.0.0.1:8090/oauth2/authorize? | |||
client_id=tuoheng-dsp | |||
client_id=tuoheng-dsp-web | |||
&response_type=code | |||
&scope=openid+profile | |||
&redirect_uri=http://192.168.11.11:8086/home |
@@ -1,15 +1,17 @@ | |||
package com.tuoheng.controller; | |||
import com.tuoheng.model.param.CreateClientUserDto; | |||
import com.tuoheng.model.param.GetUserInfoDto; | |||
import com.tuoheng.model.param.UpdateUserClientRoleDto; | |||
import com.tuoheng.model.param.UpdateUserPassDto; | |||
import com.tuoheng.service.ClientUserSevice; | |||
import com.tuoheng.until.JsonResult; | |||
import org.springframework.beans.factory.annotation.Autowired; | |||
import org.springframework.validation.annotation.Validated; | |||
import org.springframework.web.bind.annotation.*; | |||
/** | |||
* @author chenjiandong | |||
* @description: TODO | |||
* @description: 同步业务端 user 数据 | |||
* @date 2022/10/24 11:12 | |||
*/ | |||
@RestController | |||
@@ -29,4 +31,14 @@ public class UserController { | |||
return clientUserSevice.createClientUser(createClientUserDto); | |||
} | |||
@PostMapping("/updatePass") | |||
public JsonResult updateUserPassword(@RequestBody @Validated UpdateUserPassDto updateUserPassDto){ | |||
return clientUserSevice.updateUserPassword(updateUserPassDto); | |||
} | |||
@PostMapping("/updateRole") | |||
public JsonResult updateUserClientRole(@RequestBody @Validated UpdateUserClientRoleDto updateUserClientRoleDto){ | |||
return clientUserSevice.updateUserClientRole(updateUserClientRoleDto); | |||
} | |||
} |
@@ -1,6 +1,5 @@ | |||
package com.tuoheng.mapper; | |||
import com.tuoheng.model.dto.UserBaseInfoDto; | |||
import com.tuoheng.model.po.UserPo; | |||
import org.apache.ibatis.annotations.Mapper; | |||
@@ -16,4 +15,8 @@ public interface ClientUserMapper { | |||
int judgeCreateByUserName(String username); | |||
UserPo getUserByUserName(String userName); | |||
int updatePass(UserPo userPo); | |||
} |
@@ -16,4 +16,6 @@ public interface ClientUserRoleMapper { | |||
int batchInsert(List<ClientUserRolePo> list); | |||
int updateUserClientRole(ClientUserRolePo clientUserRolePo); | |||
} |
@@ -0,0 +1,25 @@ | |||
package com.tuoheng.model.param; | |||
import lombok.Data; | |||
import javax.validation.constraints.NotEmpty; | |||
import javax.validation.constraints.NotNull; | |||
/** | |||
* @author chenjiandong | |||
* @description: TODO | |||
* @date 2022/10/8 11:30 | |||
*/ | |||
@Data | |||
public class UpdateUserClientRoleDto { | |||
@NotEmpty(message = "username can not be empty!") | |||
private String username; | |||
@NotEmpty(message = "clientId can not be empty!") | |||
private String clientId; | |||
@NotNull(message = "roleId can not be null!") | |||
private Integer roleId; | |||
} |
@@ -0,0 +1,23 @@ | |||
package com.tuoheng.model.param; | |||
import lombok.Data; | |||
import javax.validation.constraints.NotEmpty; | |||
import javax.validation.constraints.NotNull; | |||
import java.util.List; | |||
/** | |||
* @author chenjiandong | |||
* @description: TODO | |||
* @date 2022/10/8 11:30 | |||
*/ | |||
@Data | |||
public class UpdateUserPassDto { | |||
@NotEmpty(message = "username can not be empty!") | |||
private String username; | |||
@NotEmpty(message = "password can not be empty!") | |||
private String password; | |||
} |
@@ -1,6 +1,8 @@ | |||
package com.tuoheng.service; | |||
import com.tuoheng.model.param.CreateClientUserDto; | |||
import com.tuoheng.model.param.UpdateUserClientRoleDto; | |||
import com.tuoheng.model.param.UpdateUserPassDto; | |||
import com.tuoheng.until.JsonResult; | |||
/** | |||
@@ -14,4 +16,9 @@ public interface ClientUserSevice { | |||
JsonResult createClientUser(CreateClientUserDto createClientUserDto); | |||
JsonResult updateUserPassword(UpdateUserPassDto updateUserPassDto); | |||
JsonResult updateUserClientRole(UpdateUserClientRoleDto updateUserClientRoleDto); | |||
} |
@@ -3,10 +3,10 @@ package com.tuoheng.service.impl; | |||
import com.tuoheng.mapper.AuthoritiesMapper; | |||
import com.tuoheng.mapper.ClientUserMapper; | |||
import com.tuoheng.mapper.ClientUserRoleMapper; | |||
import com.tuoheng.model.dto.UserBaseInfoDto; | |||
import com.tuoheng.model.param.ClientRoleDto; | |||
import com.tuoheng.model.param.CreateClientUserDto; | |||
import com.tuoheng.model.param.GetUserInfoDto; | |||
import com.tuoheng.model.param.UpdateUserClientRoleDto; | |||
import com.tuoheng.model.param.UpdateUserPassDto; | |||
import com.tuoheng.model.po.AuthoritiesPo; | |||
import com.tuoheng.model.po.ClientUserRolePo; | |||
import com.tuoheng.model.po.UserPo; | |||
@@ -78,4 +78,33 @@ public class ClientUserServiceImpl implements ClientUserSevice { | |||
return JsonResult.success(userPo.getId()); | |||
} | |||
@Transactional(rollbackFor = Exception.class) | |||
public JsonResult updateUserPassword(UpdateUserPassDto updateUserPassDto){ | |||
if(clientUserMapper.getUserByUserName(updateUserPassDto.getUsername()) == null){ | |||
return JsonResult.error("该用户不存在!"); | |||
} | |||
UserPo userPo = new UserPo() | |||
.setUsername(updateUserPassDto.getUsername()) | |||
.setPassword("{bcrypt}" + new BCryptPasswordEncoder().encode(updateUserPassDto.getPassword())); | |||
clientUserMapper.updatePass(userPo); | |||
return JsonResult.success(true); | |||
} | |||
@Transactional(rollbackFor = Exception.class) | |||
public JsonResult updateUserClientRole(UpdateUserClientRoleDto updateUserClientRoleDto){ | |||
UserPo userPo = clientUserMapper.getUserByUserName(updateUserClientRoleDto.getUsername()); | |||
if(userPo == null){ | |||
return JsonResult.error("该用户不存在!"); | |||
} | |||
ClientUserRolePo clientUserRolePo = new ClientUserRolePo() | |||
.setUserId(userPo.getId()) | |||
.setClientId(updateUserClientRoleDto.getClientId()) | |||
.setRoleId(updateUserClientRoleDto.getRoleId()); | |||
clientUserRoleMapper.updateUserClientRole(clientUserRolePo); | |||
return JsonResult.success(true); | |||
} | |||
} |
@@ -11,4 +11,19 @@ | |||
select count(1) from users where username = #{username} | |||
</select> | |||
<select id="getUserByUserName" parameterType="java.lang.String" resultType="com.tuoheng.model.po.UserPo"> | |||
select * from users where username = #{username} | |||
</select> | |||
<update id="updatePass" parameterType="com.tuoheng.model.po.UserPo"> | |||
update users | |||
<set> | |||
<if test="password != null and password != ''" > | |||
password = #{password}, | |||
</if> | |||
</set> | |||
where username = #{username,jdbcType=VARCHAR} | |||
</update> | |||
</mapper> |
@@ -10,4 +10,14 @@ | |||
</foreach > | |||
</insert> | |||
<update id="updateUserClientRole" parameterType="com.tuoheng.model.po.ClientUserRolePo"> | |||
update t_client_user_role | |||
<set> | |||
<if test="roleId != null" > | |||
role_id = #{roleId}, | |||
</if> | |||
</set> | |||
where user_id = #{userId} and client_id = #{clientId} | |||
</update> | |||
</mapper> |