删除冗余代码，初步优化首页的推荐专题，3.8.7之后在我的里面添加VIP分类

admin

2021-03-10 f7b2baec57a19039ca85880bbba4e17fe27f0511

 src/main/java/com/yeshi/buwan/util/Utils.java

@@ -12,20 +12,19 @@
import javax.servlet.http.HttpSession;

import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.system.DetailSystem;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.springframework.context.ApplicationContext;
import org.springframework.context.support.FileSystemXmlApplicationContext;

import com.yeshi.buwan.domain.entity.NewVideoDetail;
import com.yeshi.buwan.domain.entity.NewVideoInfo;
import com.yeshi.buwan.domain.entity.VideoResourceVideo;
import com.yeshi.buwan.service.imp.ConfigService;
import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.service.imp.UserService;
import com.yeshi.buwan.zhibo.entity.Live;

@Entity
public class Utils {
@@ -193,7 +192,7 @@
        de.setWatchCount(info.getWatchCount());
        de.setYear(info.getYear());
        de.setShare(info.getShare());
        de.setCanSave(info.isCanSave());
        de.setCanSave(info.getCanSave());
        de.setResourceList(info.getResourceList());
        de.setPlayPicture(info.getPlayPicture());
        de.setShowType(info.getShowType());
@@ -212,7 +211,7 @@
        ni.setArea(vi.getArea());
        ni.setBaseurl(vi.getBaseurl());
        ni.setBeizhu(vi.getBeizhu());
        ni.setCanSave(vi.isCanSave());
        ni.setCanSave(vi.getCanSave());
        ni.setCommentCount(vi.getCommentCount());
        ni.setCreatetime(vi.getCreatetime() + "");
        ni.setDay(vi.getDay());
@@ -323,20 +322,20 @@
    public static int getType(HttpServletRequest request, UserInfo user, String detailSystemId) {
        String ip = getIP(request);
        if (!(ip + "").equalsIgnoreCase(user.getIp())) {
            Map<String, String> map = IPUtil.getIPInfo(ip);
            IPUtil.IPInfo ipInfo = IPUtil.getIPInfo(ip);
            user.setIp(ip);

            if (!StringUtil.isNullOrEmpty(map.get("city"))) {
                user.setCity(map.get("city"));
            if (ipInfo != null && !StringUtil.isNullOrEmpty(ipInfo.getCity())) {
                user.setCity(ipInfo.getCity());
            }

            if (!StringUtil.isNullOrEmpty(map.get("country"))) {
                user.setCountry(map.get("country"));
            if (ipInfo != null && !StringUtil.isNullOrEmpty(ipInfo.getCountry())) {
                user.setCountry(ipInfo.getCountry());
            }
            new UserService().updateUserInfo(user);
        }

        Map<String, String> map = new ConfigService().getConfigAsMap(new DetailSystem(SystemUtil.getDetailSystemId() + ""), SystemUtil.getDefaultVersion());
        Map<String, String> map = new DetailSystemConfigService().getConfigAsMap(new DetailSystem(SystemUtil.getDetailSystemId() + ""), SystemUtil.getDefaultVersion());
        String[] detailsystemIds = new String[]{"1", "2", "3", "4", "5", "6", "14", "12", "20", "11"};
        for (String d : detailsystemIds) {
            if (detailSystemId.equalsIgnoreCase(d)) {