From dfe507c2c5e9178e0acf552d01c2e99c93b40da8 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Jul 2020 16:37:33 +0800 Subject: [PATCH 01/10] =?UTF-8?q?wx=5Fmall=E6=B7=BB=E5=8A=A0=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=94=AF=E6=8C=81=E7=9B=B4=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V202007131031__GROUP__ADD_001.sql | 6 +++++- .../src/main/java/com/iformall/domain/po/WxMall.java | 2 ++ mallinkService/src/main/resources/mapper/WxMallMapper.xml | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql index 5bf81edb6..f82d2e0cf 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql @@ -1,2 +1,6 @@ ALTER TABLE `wx_c_user_basic_info` -ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; \ No newline at end of file +ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + +ALTER TABLE `wx_mall` +ADD COLUMN `live_support` SMALLINT(1) DEFAULT '0' COMMENT '是否支持直播(0-不支持,1-支持)'; + diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index cb8e39ac3..5f47b3579 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -86,6 +86,8 @@ public class WxMall extends BaseEntity { private BigDecimal longitude; @io.swagger.annotations.ApiModelProperty(value="纬度",name="latitude") private BigDecimal latitude; + @io.swagger.annotations.ApiModelProperty(value="直播支持(0:不支持,1支持)",name="liveSupport") + private Integer liveSupport; @TableField(exist = false) protected List buildings; diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 05504be40..5b4caa833 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -35,6 +35,7 @@ + @@ -44,7 +45,7 @@ `img_url`,`img_url_h`, `weap_note`, `img_qrcode_weapp`, `img_qrcode_wemp`, `weapp_share_title`,`weapp_share_cover_img`, `pos_qrcode_rule`, `sale_type`, `valid_start`, `valid_end`,`business_hours`,`introduction`,`img`, - `group_support`,`latitude`,`longitude` + `group_support`,`latitude`,`longitude`,`live_support` From 0a1fe0936d9b244ff00bdee5ce33ebe6b3f82937 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Jul 2020 17:18:15 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=A4=84=E7=90=86=E9=9D=9Eweb=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E7=9A=84tenantId=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/NonWebRequestAttributes.java | 47 +++++++++++++++++++ .../iformall/common/TenantThreadLocal.java | 23 ++++++--- 2 files changed, 64 insertions(+), 6 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/common/NonWebRequestAttributes.java diff --git a/mallinkService/src/main/java/com/iformall/common/NonWebRequestAttributes.java b/mallinkService/src/main/java/com/iformall/common/NonWebRequestAttributes.java new file mode 100644 index 000000000..e9fc1d913 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/common/NonWebRequestAttributes.java @@ -0,0 +1,47 @@ +package com.iformall.common; + +import org.springframework.web.context.request.RequestAttributes; + +public class NonWebRequestAttributes implements RequestAttributes{ + + @Override + public Object getAttribute(String arg0, int arg1) { + return null; + } + + @Override + public String[] getAttributeNames(int arg0) { + return null; + } + + @Override + public String getSessionId() { + return null; + } + + @Override + public Object getSessionMutex() { + return null; + } + + @Override + public void registerDestructionCallback(String arg0, Runnable arg1, int arg2) { + + } + + @Override + public void removeAttribute(String arg0, int arg1) { + + } + + @Override + public Object resolveReference(String arg0) { + return null; + } + + @Override + public void setAttribute(String arg0, Object arg1, int arg2) { + + } + +} diff --git a/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java b/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java index 0e7c3e39b..8e1785ce9 100644 --- a/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java +++ b/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java @@ -9,27 +9,38 @@ public class TenantThreadLocal { //private static ThreadLocal parentLocal = new ThreadLocal(); public static void setCurrentThreadTenant(String tenantId,String parentId) { - RequestContextHolder.currentRequestAttributes().setAttribute("tenaneId", tenantId, RequestAttributes.SCOPE_REQUEST); - RequestContextHolder.currentRequestAttributes().setAttribute("parentTenaneId", parentId, RequestAttributes.SCOPE_REQUEST); + getRequestAttributesSafely().setAttribute("tenaneId", tenantId, RequestAttributes.SCOPE_REQUEST); + getRequestAttributesSafely().setAttribute("parentTenaneId", parentId, RequestAttributes.SCOPE_REQUEST); //local.set(tenantId); //parentLocal.set(parentId); } public static String getTenantId() { - return (String)RequestContextHolder.currentRequestAttributes().getAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST); + return (String)getRequestAttributesSafely().getAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST); //return local.get(); } public static String getParentTenantId() { - return (String)RequestContextHolder.currentRequestAttributes().getAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST); + return (String)getRequestAttributesSafely().getAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST); //return parentLocal.get(); } public static void remove() { - RequestContextHolder.currentRequestAttributes().removeAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST); - RequestContextHolder.currentRequestAttributes().removeAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST); + getRequestAttributesSafely().removeAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST); + getRequestAttributesSafely().removeAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST); //local.remove(); //parentLocal.remove(); } + //如果是非web的线程,则都为空 + public static RequestAttributes getRequestAttributesSafely(){ + RequestAttributes requestAttributes = null; + try{ + requestAttributes = RequestContextHolder.currentRequestAttributes(); + }catch (IllegalStateException e){ + requestAttributes = new NonWebRequestAttributes(); + } + return requestAttributes; + } + } From a88830d2c5c5586c3ef428890b321176c6bcc673 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Jul 2020 18:16:25 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E4=BC=9A=E5=91=98?= =?UTF-8?q?=E6=B2=A1=E6=9C=89parentTeanantId=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/tenant/TenantInfoImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java index 6a757c08d..38afaebd9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java +++ b/mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java @@ -115,9 +115,6 @@ public class TenantInfoImpl implements TenantInfo { if ("wx_c_user".equals(tableName)) { return true; } - if ("wx_c_user_basic_info".equals(tableName)) { - return true; - } if ("wx_c_user_car".equals(tableName)) { return true; } From 960e7a7daea742abdfe7ac1579bbf023676ec8e5 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Jul 2020 18:28:25 +0800 Subject: [PATCH 04/10] add log --- .../main/java/com/iformall/domain/po/base/BaseTenantEntity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 0345bc6f5..416f6f9d8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -25,6 +25,7 @@ public class BaseTenantEntity extends BaseEntity { private TenantEntity tenantInfo; public void updateTenantInfo(TenantEntity info) { + System.out.println("info.tenantId:"+info.getTenantId()+". info.parentTenantId:"+info.getParentTenantId()+"."); setTenantId(info.getTenantId()); if (StringUtils.isNotBlank(info.getParentTenantId())) { setParentTenantId(info.getParentTenantId()); From 2a747980b1c5f2bee7119803a10d943820af607b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Jul 2020 18:45:58 +0800 Subject: [PATCH 05/10] add log --- .../java/com/iformall/domain/po/base/BaseTenantEntity.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java index 416f6f9d8..085d1b320 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; + import org.apache.commons.lang3.StringUtils; /** @@ -11,6 +13,7 @@ import org.apache.commons.lang3.StringUtils; * @date 2019/4/24 14:32 */ @Data +@Slf4j @EqualsAndHashCode(callSuper = true) public class BaseTenantEntity extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") @@ -25,7 +28,7 @@ public class BaseTenantEntity extends BaseEntity { private TenantEntity tenantInfo; public void updateTenantInfo(TenantEntity info) { - System.out.println("info.tenantId:"+info.getTenantId()+". info.parentTenantId:"+info.getParentTenantId()+"."); + log.info("info.tenantId:"+info.getTenantId()+". info.parentTenantId:"+info.getParentTenantId()+"."); setTenantId(info.getTenantId()); if (StringUtils.isNotBlank(info.getParentTenantId())) { setParentTenantId(info.getParentTenantId()); From 74b4f0d708ac1b1637379466fd786909b8a824ad Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 15 Jul 2020 14:08:50 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BC=9A=E5=91=98parentTenantId=E4=B8=BA=E7=A9=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/WxCUserBasicInfoMapper.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index d5da0055c..6021edd5d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -131,7 +131,7 @@ c.`id`,c.`phone`,cb.`birthdate`,cb.`education`,cb.`sex`,cb.`email`,cb.`address`,cb.`poins`,cb.`tag_id`, - cb.`create_date`,cb.`update_date`,c.`tenant_id`,cb.`name`,cb.level,cb.nick_name,`cb.act_record` + cb.`create_date`,cb.`update_date`,c.`tenant_id`,cb.`name`,cb.`level`,cb.`nick_name`,cb.`act_record`,cb.`parent_tenant_id` @@ -225,7 +225,7 @@ cub.id,cub.phone,cub.birthdate,cub.education,cub.sex,cub.email,cub.address,cub.poins,cub.tag_id, - cub.create_date,cub.update_date,cub.tenant_id,cub.name,cub.level,cub.nick_name,cub.score_date + cub.create_date,cub.update_date,cub.tenant_id,cub.name,cub.level,cub.nick_name,cub.score_date,cub.parent_tenant_id