Merge remote-tracking branch 'origin/master'

Administrator

2018-12-18 d146e7bca73c7605af6b718b5df0b757e0034f0e

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java

@@ -19,6 +19,7 @@
import org.yeshi.utils.JsonUtil;



import com.yeshi.fanli.entity.common.AdminUser;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.util.AESUtil;

import com.yeshi.fanli.util.Constant;

@@ -54,9 +55,12 @@
            // 邮件H5来源的不判断是否登录

            if ("emailh5".equalsIgnoreCase(from)) {

                String callback = request.getParameter("callback");

                String signAES = URLDecoder.decode(request.getParameter("sign"),"UTF-8");

                String signAES = request.getParameter("sign");

                if (signAES != null && signAES.contains("%"))

                    signAES = URLDecoder.decode(request.getParameter("sign"), "UTF-8");

                String sign = AESUtil.decrypt(signAES, Constant.ADMINH5_AESKEY);

                if (!StringUtil.isNullOrEmpty(sign)) {

                    LogHelper.error("H5审核签名:" + sign);

                    JSONObject json = JSONObject.fromObject(sign);

                    long time = json.optLong("timeStamp");

                    long adminId = json.optLong("adminId");


 fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java

@@ -9,9 +9,6 @@
import javax.annotation.Resource;

import javax.servlet.http.HttpServletRequest;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RequestMethod;

@@ -24,7 +21,6 @@
import com.yeshi.fanli.entity.bus.share.UserShareGoodsGroup;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsHistory;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord;

import com.yeshi.fanli.entity.bus.share.UserShareGoodsRecord.ShareSourceTypeEnum;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.taobao.TaoBaoLink;

import com.yeshi.fanli.exception.ShareGoodsException;

@@ -40,6 +36,9 @@
import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.MonitorFactory;

import com.yeshi.fanli.util.taobao.TaoBaoUtil;



import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@Controller(value = "ShareController1")

@RequestMapping("api/v1/share")

@@ -130,7 +129,7 @@
            }

            shareText = shareText.replace("[价格类型]", shopType);

            data.put("shareText", shareText);

            String descText = shareText.replace(taoBaoLink.getGoods().getTitle() + "\r\n", "");

            String descText = shareText.replace(taoBaoLink.getGoods().getTitle(), "").trim();

            if (descText.startsWith("\\r\\n"))

                descText = descText.substring(0);

            data.put("descText", descText);

@@ -286,14 +285,16 @@
        }

    }



	
	
    /**

     * 商品详情分享

     * 
     * @param acceptData

     * @param uid  用户id

     * @param auctionId  商品id

     * @param type 图片分享类型  单图single 多图many 
     * @param uid

     *            用户id

     * @param auctionId

     *            商品id

     * @param type

     *            图片分享类型 单图single 多图many

     * @param out

     */

    @RequestMapping(value = "sharedetail", method = RequestMethod.POST)

@@ -310,9 +311,9 @@
        }

    }

    

	
    /**

     * 更新分享记录

     * 
     * @param acceptData

     * @param shareId

     * @param out

@@ -334,6 +335,5 @@
            e.printStackTrace();

        }

    }



    

}


 fanli/src/main/java/com/yeshi/fanli/dao/XingeInfoDao.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BrowseHistory.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/entity/xinge/XingeInfo.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java

@@ -1044,6 +1044,7 @@
                return list;

            JSONArray array = data.optJSONObject("tbk_item_recommend_get_response").optJSONObject("results")

                    .optJSONArray("n_tbk_item");

            if (array != null)

            for (int i = 0; i < array.size(); i++) {

                JSONObject item = array.optJSONObject(i);

                TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();