Merge branch 'master' into applet-dev

ch-dao/src/main/resources/com/wwdz/ch/db/mapper/FavoritesItemsRelationMapper.xml

@@ -132,6 +132,14 @@
     values (#{favoritesId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{itemId,jdbcType=BIGINT}, 
       #{addTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
   </insert>
+  <insert id="batchInsert" parameterType="com.wwdz.ch.db.domain.FavoritesItemsRelation">
+    insert into favorites_items_relation (favorites_id, user_id, item_id,
+    add_time, update_time)
+  values
+  <foreach collection="list" item="item" separator=",">
+    (#{item.favoritesId,jdbcType=BIGINT}, #{item.userId,jdbcType=BIGINT}, #{item.itemId,jdbcType=BIGINT}, #{item.addTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP})
+  </foreach>
+  </insert>
   <insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.FavoritesItemsRelation">
     insert into favorites_items_relation
     <trim prefix="(" suffix=")" suffixOverrides=",">

ch-wx-api/src/main/java/com/wwdz/ch/wx/config/WebMvcConfiguration.java

@@ -30,7 +30,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
 		registry.addInterceptor(loginInterceptor())
 				.addPathPatterns("/**")
 				.excludePathPatterns("/*.html", "/**/*.html", "/**/*.css", "/**/*.js"
-						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login");
+						, "/wx/user/loginByWx", "/wx/user/loginByMobile", "/wx/user/loginRegCaptcha", "/wx/user/updateRegCaptcha", "/wx/user/login", "/wx/user/fillCode");
 //						, "/wx/item/page", "/wx/item/info", "/wx/item/findNames"
 //						, "/wx/favorites/info", "/wx/favorites/itemList"
 //						, "/wx/keyword/recommend", "/wx/queryPrice/**");

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

@@ -68,9 +68,6 @@ public class LoginInterceptor implements HandlerInterceptor {
                 loginType = 2;
             } else {
                 if (userTokenManager.checkLogin(token)) {
-                    if (StringUtils.equals(url, "/wx/user/fillCode")) {
-                        return true;
-                    }
                     User user = userDao.queryById(userTokenManager.getUserId(token));
                     if (!(Boolean) inviteRecordService.isExisted(user.getMobile()).getData()) {
                         loginType = 3;