Commit a6caa6da by ypenglv

冲突解决

1 parent e4d09c3d
......@@ -27,9 +27,9 @@ public class UserController {
private UserService userService;
@ApiOperation( value = "模拟用户登陆",notes = "模拟用户登陆")
@PostMapping("/login")
@PostMapping("/loginTest")
@ResponseBody
public ApiResponse<UserVO> login (){
public ApiResponse<UserVO> loginTest (){
ApiResponse<UserVO> login = userService.login();
return login;
}
......
......@@ -126,13 +126,13 @@
delete from APP_USER
where ID = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="org.nafmii.nafmiimbg.model.AppUserExample">
<delete id="deleteByExample" parameterType="org.nafmii.entity.user.AppUserExample">
delete from APP_USER
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="org.nafmii.nafmiimbg.model.AppUser">
<insert id="insert" parameterType="org.nafmii.entity.user.AppUser">
insert into APP_USER (ID, USER_NAME, LOGIN_PWD,
REAL_NAME, PHONE, BIRTHDAY,
EMAIL, HEAD_PICTURE, NATIONALITY,
......@@ -384,7 +384,7 @@
</set>
where ID = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="org.nafmii.nafmiimbg.model.AppUser">
<update id="updateByPrimaryKey" parameterType="org.nafmii.entity.user.AppUser">
update APP_USER
set USER_NAME = #{userName,jdbcType=VARCHAR},
LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},
......
......@@ -32,7 +32,7 @@ public class AccessFilter implements GlobalFilter, Ordered {
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
String url = exchange.getRequest().getURI().getPath();
//相关不需要的接口地址
String skip ="/auth/login";
String skip ="/nafmii-app/app/nafmii/user/loginTest";
//跳过不需要验证的url
if (antPathMatcher.match(skip, url)){
return chain.filter(exchange);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!