fanli-server.git

			@@ -33,7 +33,6 @@
			import com.yeshi.fanli.entity.bus.user.UserInfo;
			import com.yeshi.fanli.entity.common.JumpDetailV2;
			import com.yeshi.fanli.entity.dynamic.CommentInfo;
			import com.yeshi.fanli.entity.dynamic.CommentInfo.CommentInfoEnum;
			import com.yeshi.fanli.entity.dynamic.DynamicInfo;
			import com.yeshi.fanli.entity.dynamic.GoodsEvaluate;
			import com.yeshi.fanli.entity.dynamic.GoodsEvaluate.EvaluateEnum;
			@@ -43,6 +42,7 @@
			import com.yeshi.fanli.entity.system.ConfigKeyEnum;
			import com.yeshi.fanli.entity.taobao.TaoBaoLink;
			import com.yeshi.fanli.exception.share.ShareGoodsException;
			import com.yeshi.fanli.log.LogHelper;
			import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
			import com.yeshi.fanli.service.inter.config.ConfigService;
			import com.yeshi.fanli.service.inter.dynamic.ArticleOfficialService;
			@@ -589,6 +589,8 @@
			*/
			@RequestMapping(value = "getDynamicList", method = RequestMethod.POST)
			public void getDynamicListNew(AcceptData acceptData, Integer page, Long cid, String subId, PrintWriter out) {

			try {
			int type = 1;
			if (cid == TYPE_FAQUAN) {
			type = 1;
			@@ -601,17 +603,9 @@
			if (list == null) {
			list = new ArrayList<>();
			}

			GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();
			gsonBuilder.registerTypeAdapter(CommentInfoEnum.class, new JsonSerializer<CommentInfoEnum>() {
			@Override
			public JsonElement serialize(CommentInfoEnum value, Type theType, JsonSerializationContext context) {
			if (value == null) {
			return new JsonPrimitive(1);
			} else {
			return new JsonPrimitive(value.getDesc());
			}
			}
			}).registerTypeAdapter(ImgEnum.class, new JsonSerializer<ImgEnum>() {
			gsonBuilder.registerTypeAdapter(ImgEnum.class, new JsonSerializer<ImgEnum>() {
			@Override
			public JsonElement serialize(ImgEnum value, Type theType, JsonSerializationContext context) {
			if (value == null) {
			@@ -680,6 +674,11 @@
			data.put("count", count);
			data.put("list", gson.toJson(list));
			out.print(JsonUtil.loadTrueResult(data));
			} catch (Exception e) {
			out.print(JsonUtil.loadFalseResult(1, "查询信息失败"));
			LogHelper.errorDetailInfo(e);
			}

			}

			/**