fanli-server.git

			@@ -264,7 +264,7 @@
			if ("1".equalsIgnoreCase(cid)) {// 大淘客数据
			List<Integer> cidList = new ArrayList<>();
			cidList.add(2);// 母婴
			result = DaTaoKeApiUtil.search("", null, null, null, page, pageSize, DaTaoKeApiUtil.SORT_DEFAULT);
			result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, DaTaoKeApiUtil.SORT_DEFAULT);
			List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
			long count = 0;
			if (result != null) {
			@@ -472,7 +472,7 @@
			cidList.add(7);
			cidList.add(13);
			int sort = getCommonSort(cid);
			result = DaTaoKeApiUtil.search("", null, null, null, page, pageSize, sort);
			result = DaTaoKeApiUtil.search("", cidList, null, null, page, pageSize, sort);
			DaTaoKeGoodsResult result1 = DaTaoKeApiUtil.search("运动男", cidList, null, null, page, pageSize, sort);
			List<TaoBaoGoodsBrief> goodsList = new ArrayList<>();
			long count = 0;

			@@ -250,7 +250,10 @@
			GoodsSubClassLabelMap map = new GoodsSubClassLabelMap();
			map.setGoodsSubClass(record);
			map.setLabel(new GoodsSubClassLabel(labelId));
			try {
			goodsSubClassLabelService.addSubClassLabelMap(map);
			} catch (Exception e) {
			}
			}

			goodsSubClassMapper.updateByPrimaryKey(record);

			@@ -199,3 +199,11 @@
			log4j.appender.requestTimeLog.layout=org.apache.log4j.PatternLayout
			log4j.appender.requestTimeLog.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} [%c]-[%p] %m%n

			log4j.appender.mongodb=org.apache.log4j.ConsoleAppender
			log4j.appender.mongodb.Target=System.out
			log4j.appender.mongodb.Threshold=DEBUG
			log4j.appender.mongodb.ImmediateFlush=true
			log4j.appender.mongodb.layout=org.apache.log4j.PatternLayout
			log4j.appender.mongodb.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %X{RequestId} - %m%n

			log4j.logger.org.springframework.data.mongodb.core= DEBUG

	fanli/src/main/java/com/yeshi/fanli/service/impl/goods/CommonTemplateContentServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/goods/GoodsSubClassServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/resource/log4j.properties	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史