From d146e7bca73c7605af6b718b5df0b757e0034f0e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期二, 18 十二月 2018 11:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
/dev/null | 51 -------------------------
fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java | 6 ++
fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java | 34 ++++++++--------
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java | 21 +++++-----
4 files changed, 33 insertions(+), 79 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
index 6a3fe4e..240026f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/LoginAspect.java
+++ b/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");
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
index 7021951..b38fd8a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/ShareController.java
+++ b/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")
@@ -125,12 +124,12 @@
shareText = text.replace("[鏍囬]", taoBaoLink.getGoods().getTitle())
.replace("[鍦ㄥ敭浠穄", "楼" + taoBaoLink.getGoods().getZkPrice())
.replace("[浼樻儬鍒搁噾棰漖",
- "楼"+BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
+ "楼" + BigDecimalUtil.getWithNoZera(taoBaoLink.getGoods().getCouponAmount()).toString())
.replace("[鍒稿悗浠穄", "楼" + TaoBaoUtil.getAfterUseCouplePrice(taoBaoLink.getGoods()));
}
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);
@@ -161,7 +160,7 @@
history.setUser(new UserInfo(uid));
history.setPostPicture(taoBaoLink.getGoods().getPictUrl());
- data.put("shareMoney","楼"+ history.getHongbao().toString());
+ data.put("shareMoney", "楼" + history.getHongbao().toString());
out.print(JsonUtil.loadTrueResult(data));
@@ -183,7 +182,7 @@
}
}
-
+
/**
* 鍒嗕韩璁板綍缁熻鍒楄〃
*
@@ -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)
@@ -309,10 +310,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鏇存柊鍒嗕韩璁板綍
+ *
* @param acceptData
* @param shareId
* @param out
@@ -322,7 +323,7 @@
if (shareId == null) {
out.print(JsonUtil.loadFalseResult("鍙傛暟涓嶆纭�"));
}
-
+
try {
userShareGoodsRecordService.updateShareRecord(shareId);
out.print(JsonUtil.loadTrueResult(""));
@@ -335,5 +336,4 @@
}
}
-
}
diff --git a/fanli/src/main/java/com/yeshi/fanli/dao/XingeInfoDao.java b/fanli/src/main/java/com/yeshi/fanli/dao/XingeInfoDao.java
deleted file mode 100644
index 5efe42f..0000000
--- a/fanli/src/main/java/com/yeshi/fanli/dao/XingeInfoDao.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.yeshi.fanli.dao;
-
-import org.springframework.stereotype.Repository;
-
-import com.yeshi.fanli.entity.xinge.XingeInfo;
-
-@Repository
-public class XingeInfoDao extends BaseDao<XingeInfo> {
-
-}
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BrowseHistory.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BrowseHistory.java
deleted file mode 100644
index a9a9c5c..0000000
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/BrowseHistory.java
+++ /dev/null
@@ -1,70 +0,0 @@
-package com.yeshi.fanli.entity.bus.user;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 娴忚璁板綍
- *
- * @author Administrator
- *
- */
-@Entity
-@Table(name = "yeshi_ec_browsehistory")
-public class BrowseHistory {
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private long id;
- @Column(name = "identifycode", length = 80)
- private String identifyCode;// 鐢ㄦ埛鍞竴鏍囪瘑
- @Column(name = "`type`")
- private int type;// 鍟嗗搧绫诲瀷 1-娣樺疂 ,澶╃尗 2-浜笢
- @Column(name = "goodsid", length = 50)
- private String goodsId;// 鍟嗗搧Id
- private long createtime;// 鍒涘缓鏃堕棿
-
- public int getType() {
- return type;
- }
-
- public void setType(int type) {
- this.type = type;
- }
-
- public String getGoodsId() {
- return goodsId;
- }
-
- public void setGoodsId(String goodsId) {
- this.goodsId = goodsId;
- }
-
- public long getId() {
- return id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public String getIdentifyCode() {
- return identifyCode;
- }
-
- public void setIdentifyCode(String identifyCode) {
- this.identifyCode = identifyCode;
- }
-
- public long getCreatetime() {
- return createtime;
- }
-
- public void setCreatetime(long createtime) {
- this.createtime = createtime;
- }
-}
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/xinge/XingeInfo.java b/fanli/src/main/java/com/yeshi/fanli/entity/xinge/XingeInfo.java
deleted file mode 100644
index a08bb19..0000000
--- a/fanli/src/main/java/com/yeshi/fanli/entity/xinge/XingeInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.yeshi.fanli.entity.xinge;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-@Entity
-@Table(name = "yeshi_ec_xinge_info")
-public class XingeInfo {
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
- @Column(name = "id")
- private long id;
-
- private int type; //1.瀹夊崜 2.IOS
-
- @Column(name = "`key`")
- private String key;
-
- private String value;
-
- public long getId() {
- return id;
- }
- public void setId(long id) {
- this.id = id;
- }
- public int getType() {
- return type;
- }
- public void setType(int type) {
- this.type = type;
- }
- public String getKey() {
- return key;
- }
- public void setKey(String key) {
- this.key = key;
- }
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
-
-
-}
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
index 3f5cc91..036d8ae 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoKeApiUtil.java
@@ -1044,16 +1044,17 @@
return list;
JSONArray array = data.optJSONObject("tbk_item_recommend_get_response").optJSONObject("results")
.optJSONArray("n_tbk_item");
- for (int i = 0; i < array.size(); i++) {
- JSONObject item = array.optJSONObject(i);
- TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
- goods.setAuctionId(item.optLong("num_iid"));
- goods.setTitle(item.optString("title"));
- goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
- goods.setAuctionUrl(item.optString("item_url"));
- goods.setPictUrl(item.optString("pict_url"));
- list.add(goods);
- }
+ if (array != null)
+ for (int i = 0; i < array.size(); i++) {
+ JSONObject item = array.optJSONObject(i);
+ TaoBaoGoodsBrief goods = new TaoBaoGoodsBrief();
+ goods.setAuctionId(item.optLong("num_iid"));
+ goods.setTitle(item.optString("title"));
+ goods.setZkPrice(new BigDecimal(item.optString("zk_final_price")));
+ goods.setAuctionUrl(item.optString("item_url"));
+ goods.setPictUrl(item.optString("pict_url"));
+ list.add(goods);
+ }
}
return list;
}
--
Gitblit v1.8.0