fix 去除杭州ip设备限制

netflix-dao/src/main/resources/mapper/CmsMenuMapper.xml

@@ -71,29 +71,17 @@
     </select>
 
     <select id="getCmsMenusByAccount" resultType="com.cyksj.model.entity.CmsMenu">
-        select distinct s.*
-        from (select m.id,
-                     m.title,
-                     m.menu_name,
-                     m.perms,
-                     m.type,
-                     m.order_by,
-                     m.parent_id
-              from `cms_menu` m
-                       inner join `cms_role_menu` um on m.id = um.menu_id
-                       inner join `cms_user_role` cur on cur.role_id = um.role_id
-                       inner join `cms_user` u on u.id = cur.user_id
-              where u.id = #{account}
-              union all
-              select distinct m.id,
-                              m.title,
-                              m.menu_name,
-                              m.perms,
-                              m.type,
-                              m.order_by,
-                              m.parent_id
-              from user_perms up
-                       inner join `cms_menu` m on up.menu_id = m.id
-              where up.user_id = #{account}) s
+        select distinct m.id,
+                        m.title,
+                        m.menu_name,
+                        m.perms,
+                        m.type,
+                        m.order_by,
+                        m.parent_id
+        from `cms_menu` m
+                 inner join `cms_role_menu` um on m.id = um.menu_id
+                 inner join `cms_user_role` cur on cur.role_id = um.role_id
+                 inner join `cms_user` u on u.id = cur.user_id
+        where u.id = #{account}
     </select>
 </mapper>

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -540,10 +540,10 @@ public class GoodsDonController {
 //		List<Long> filter_goodsIds = getFilterGoodsIds();
 		List<Long> filter_goodsIds = null;
 		AtomicBoolean isRemoveRg = new AtomicBoolean(false);
-		if (isHzIp()) {
-			key += ":hz-ip";
-			isRemoveRg.set(true);
-		}
+//		if (isHzIp()) {
+//			key += ":hz-ip";
+//			isRemoveRg.set(true);
+//		}
 		Long fUid = StpUserUtil.getUserIdAfterLogin();
 		Object o = redisService.get(key);
 		if (o == null) {
@@ -1092,10 +1092,10 @@ public class GoodsDonController {
 		String key = RedisService.key.YH_HOME_PAGHE_CACHE.getEnvName() + "pc:homeManage";
 		//移除奈飞客厅 临时
 		Long filterConfigId = null;
-		if (isHzIp()) {
-			key += ":hz_ip";
-			filterConfigId = 55l;
-		}
+//		if (isHzIp()) {
+//			key += ":hz_ip";
+//			filterConfigId = 55l;
+//		}
 		Object o = redisService.get(key);
 		if (o == null) {
 			MapBuilder builder = MapUtils.builder()