冲突解决

nafmii-app/src/main/java/org/nafmii/controller/UserController.java

@@ -27,9 +27,9 @@ public class UserController {
     private UserService userService;
     private UserService userService;
 
 
     @ApiOperation( value = "模拟用户登陆",notes = "模拟用户登陆")
     @ApiOperation( value = "模拟用户登陆",notes = "模拟用户登陆")
-    @PostMapping("/login")
+    @PostMapping("/loginTest")
     @ResponseBody
     @ResponseBody
-    public ApiResponse<UserVO> login (){
+    public ApiResponse<UserVO> loginTest (){
         ApiResponse<UserVO> login =  userService.login();
         ApiResponse<UserVO> login =  userService.login();
         return login;
         return login;
     }
     }

nafmii-app/src/main/resources/mapper/AppUserMapper.xml

@@ -126,13 +126,13 @@
     delete from APP_USER
     delete from APP_USER
     where ID = #{id,jdbcType=BIGINT}
     where ID = #{id,jdbcType=BIGINT}
   </delete>
   </delete>
-  <delete id="deleteByExample" parameterType="org.nafmii.nafmiimbg.model.AppUserExample">
+  <delete id="deleteByExample" parameterType="org.nafmii.entity.user.AppUserExample">
     delete from APP_USER
     delete from APP_USER
     <if test="_parameter != null">
     <if test="_parameter != null">
       <include refid="Example_Where_Clause" />
       <include refid="Example_Where_Clause" />
     </if>
     </if>
   </delete>
   </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, 
     insert into APP_USER (ID, USER_NAME, LOGIN_PWD, 
       REAL_NAME, PHONE, BIRTHDAY, 
       REAL_NAME, PHONE, BIRTHDAY, 
       EMAIL, HEAD_PICTURE, NATIONALITY, 
       EMAIL, HEAD_PICTURE, NATIONALITY, 
@@ -384,7 +384,7 @@
     </set>
     </set>
     where ID = #{id,jdbcType=BIGINT}
     where ID = #{id,jdbcType=BIGINT}
   </update>
   </update>
-  <update id="updateByPrimaryKey" parameterType="org.nafmii.nafmiimbg.model.AppUser">
+  <update id="updateByPrimaryKey" parameterType="org.nafmii.entity.user.AppUser">
     update APP_USER
     update APP_USER
     set USER_NAME = #{userName,jdbcType=VARCHAR},
     set USER_NAME = #{userName,jdbcType=VARCHAR},
       LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},
       LOGIN_PWD = #{loginPwd,jdbcType=VARCHAR},

nafmii-gateway/src/main/java/org/nafmii/config/AccessFilter.java

@@ -32,7 +32,7 @@ public class AccessFilter implements GlobalFilter, Ordered {
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
     public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
         String url = exchange.getRequest().getURI().getPath();
         String url = exchange.getRequest().getURI().getPath();
         //相关不需要的接口地址
         //相关不需要的接口地址
-        String skip ="/auth/login";
+        String skip ="/nafmii-app/app/nafmii/user/loginTest";
         //跳过不需要验证的url
         //跳过不需要验证的url
             if (antPathMatcher.match(skip, url)){
             if (antPathMatcher.match(skip, url)){
                 return chain.filter(exchange);
                 return chain.filter(exchange);