From 30b542afba63b5b48228ecd229e3a563501b1338 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Jul 2020 01:32:20 +0800 Subject: [PATCH 1/4] fix --- mallinkAdmin/src/main/resources/application-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index cc166698b..2dcfc4604 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -79,7 +79,7 @@ spring: groupId: "GID_P_1" namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" flyway: - enabled: true + enabled: false aws: clientRegion: cn-northwest-1 From 3080c82ac688bfcd2d5883bc2ae1136c1dd67fc4 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Jul 2020 02:17:14 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/shiro/PasswordHelper.java | 8 ++++---- mallinkAdmin/src/main/resources/application-prod.yml | 8 +++++++- mallinkBApi/src/main/resources/application-prod.yml | 9 ++++++++- mallinkCApi/src/main/resources/application-prod.yml | 10 +++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- mallinkPosApi/src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- .../src/main/resources/application-prod.yml | 9 ++++++++- 10 files changed, 76 insertions(+), 13 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java index f9e7a6476..085389270 100644 --- a/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java +++ b/mallinkAdmin/src/main/java/com/iformall/shiro/PasswordHelper.java @@ -20,16 +20,16 @@ public class PasswordHelper { } - /* + public static void main(String[] args) { MallUserInfo user = new MallUserInfo(); - user.setUsername("admin"); - user.setPassword("admin123"); + user.setUsername("sadmin"); + user.setPassword("fm2020admin"); PasswordHelper passwordHelper = new PasswordHelper(); passwordHelper.encryptPassword(user); System.out.println(user); System.out.println(user.getPassword()); } - */ + } diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 2dcfc4604..69ae8b3c2 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -48,7 +48,13 @@ spring: regionId: cn-hangzhou dateFormat: yyyyMMdd endpointName: cn-hangzhou - + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 6f9e6719b..673236766 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 6af3cffff..93fe8adab 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -45,7 +45,15 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 4f93843b8..9ebbf91b7 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index 715b298c4..b6787707f 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index b3708df45..6f9d27193 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -45,7 +45,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index ac6331e78..c1ab1613c 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index fa6b83bc0..ad75e947d 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 9c16e9070..0e231f47e 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -46,7 +46,14 @@ spring: domain: dysmsapi.aliyuncs.com regionId: cn-hangzhou dateFormat: yyyyMMdd - endpointName: cn-hangzhou + endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com # EMAIL mail: host: smtp.exmail.qq.com From ae289ba16f49f49802509046bb39abd1cf764e52 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Jul 2020 04:14:02 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=99=BB=E9=99=86?= =?UTF-8?q?=E4=BC=9A=E4=B8=B2=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/controller/WxInfoController.java | 4 ++++ .../java/com/iformall/controller/WxUserGrantController.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index b8668b3a1..c4679195f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -7,6 +7,7 @@ import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo; import cn.binarywang.wx.miniapp.bean.WxMaUserInfo; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.AuthIgnore; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -75,6 +76,7 @@ public class WxInfoController extends BaseController { WxMerchantBUserService merchantBUserService; @AuthIgnore + @TenantIgnore @ApiOperation("获取OPENID") @PostMapping("getOpenId") public ResultData getOpenId(@RequestBody Map param) { @@ -223,6 +225,7 @@ public class WxInfoController extends BaseController { } @AuthIgnore + @TenantIgnore @ApiOperation("获取超管OPENID") @PostMapping("getSuperOpenId") public ResultData getSuperOpenId(@RequestBody Map param) { @@ -330,6 +333,7 @@ public class WxInfoController extends BaseController { * @return */ @AuthIgnore + @TenantIgnore @PostMapping("/getUserPhone") @ApiOperation(value = "授权后获取用户的手机号", notes="{\"appId\":\"string\",\"encryptedData\":\"string\",\"iv\":\"string\",\"openId\":\"string\",\"session_key\":\"string\"}") public ResultData getUserPhone(@RequestBody Map map) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index fef73f5d2..ea02dbcc4 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.AuthIgnore; import com.iformall.annotation.RedisCache; +import com.iformall.annotation.TenantIgnore; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; @@ -132,6 +133,7 @@ public class WxUserGrantController extends BaseController { * @return */ @AuthIgnore + @TenantIgnore @PostMapping("/login") @ApiOperation(value = "用户登录", notes = "{\"appId\":\"string\",\"code\":\"string\",\"scene\":\"string\",\"sceneAddress\":\"string\",\"latitude\":\"string\",\"longitude\":\"string\",\"systemInfo\":\"string\"}") public ResultData userLogin(@RequestBody Map map) { From 5f5a7cc3ae44b1a156a049518d027c1f1108ed8f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Jul 2020 04:40:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/common/TenantThreadLocal.java | 25 +++++++++++++------ 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java b/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java index 6ec1462dd..0e7c3e39b 100644 --- a/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java +++ b/mallinkService/src/main/java/com/iformall/common/TenantThreadLocal.java @@ -1,26 +1,35 @@ package com.iformall.common; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; + public class TenantThreadLocal { - private static ThreadLocal local = new ThreadLocal(); - private static ThreadLocal parentLocal = new ThreadLocal(); + //private static ThreadLocal local = new ThreadLocal(); + //private static ThreadLocal parentLocal = new ThreadLocal(); public static void setCurrentThreadTenant(String tenantId,String parentId) { - local.set(tenantId); - parentLocal.set(parentId); + RequestContextHolder.currentRequestAttributes().setAttribute("tenaneId", tenantId, RequestAttributes.SCOPE_REQUEST); + RequestContextHolder.currentRequestAttributes().setAttribute("parentTenaneId", parentId, RequestAttributes.SCOPE_REQUEST); + //local.set(tenantId); + //parentLocal.set(parentId); } public static String getTenantId() { - return local.get(); + return (String)RequestContextHolder.currentRequestAttributes().getAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST); + //return local.get(); } public static String getParentTenantId() { - return parentLocal.get(); + return (String)RequestContextHolder.currentRequestAttributes().getAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST); + //return parentLocal.get(); } public static void remove() { - local.remove(); - parentLocal.remove(); + RequestContextHolder.currentRequestAttributes().removeAttribute("tenaneId", RequestAttributes.SCOPE_REQUEST); + RequestContextHolder.currentRequestAttributes().removeAttribute("parentTenaneId", RequestAttributes.SCOPE_REQUEST); + //local.remove(); + //parentLocal.remove(); } }