From 3238780df7e2f7118d42adb6e7d939f8c3fa381d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 6 Jul 2020 16:34:25 +0800 Subject: [PATCH 01/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/config/WebMvcConfig.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java index e0c9c01d3..c4064057a 100644 --- a/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java +++ b/mallinkCApi/src/main/java/com/iformall/config/WebMvcConfig.java @@ -76,7 +76,7 @@ public class WebMvcConfig implements WebMvcConfigurer { MappingJackson2HttpMessageConverter jackson2HttpMessageConverter = new MappingJackson2HttpMessageConverter(); //ObjectMapper 是Jackson库的主要类。它提供一些功能将转换成Java对象匹配JSON结构,反之亦然 ObjectMapper objectMapper = new ObjectMapper(); -// SimpleModule simpleModule = new SimpleModule(); + SimpleModule simpleModule = new SimpleModule(); //不显示为null的字段 objectMapper.setSerializationInclusion(JsonInclude.Include.NON_NULL); @@ -88,17 +88,17 @@ public class WebMvcConfig implements WebMvcConfigurer { .without(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) ); //序列化将Long转String类型 -// simpleModule.addSerializer(Long.class, ToStringSerializer.instance); -// simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); -// SimpleModule bigIntegerModule = new SimpleModule(); + simpleModule.addSerializer(Long.class, ToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); + SimpleModule bigIntegerModule = new SimpleModule(); //序列化将BigInteger转String类型 -// bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); -// SimpleModule bigDecimalModule = new SimpleModule(); + bigIntegerModule.addSerializer(BigInteger.class, ToStringSerializer.instance); + SimpleModule bigDecimalModule = new SimpleModule(); //序列化将BigDecimal转String类型 -// bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); -// objectMapper.registerModule(simpleModule); -// objectMapper.registerModule(bigDecimalModule); -// objectMapper.registerModule(bigIntegerModule); + bigDecimalModule.addSerializer(BigDecimal.class, ToStringSerializer.instance); + objectMapper.registerModule(simpleModule); + objectMapper.registerModule(bigDecimalModule); + objectMapper.registerModule(bigIntegerModule); jackson2HttpMessageConverter.setObjectMapper(objectMapper); converters.add(jackson2HttpMessageConverter); } From ee294a891173940277ccf29d4b85c34bb83051ed Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 6 Jul 2020 21:12:48 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/UploadController.java | 38 ++++--- .../src/main/resources/application-dev.yml | 11 ++- .../iformall/controller/UploadController.java | 22 +++-- .../src/main/resources/application-dev.yml | 12 ++- .../iformall/controller/UploadController.java | 51 +++++++--- .../src/main/resources/application-dev.yml | 12 ++- .../callback/WxMsgCallbackController.java | 12 ++- .../src/main/resources/application-dev.yml | 12 ++- .../src/main/resources/application-dev.yml | 12 ++- .../src/main/resources/application-dev.yml | 12 ++- .../src/main/resources/application-dev.yml | 12 ++- .../com/iformall/file/aliyun/AliyunOSS.java | 99 +++++++++++++++++++ .../file/aliyun/bean/AliyunOSSConfig.java | 22 +++++ .../java/com/iformall/sms/EnumSMSChannel.java | 2 +- .../controller/sys/UploadController.java | 80 +++++++++------ .../src/main/resources/application-dev.yml | 12 ++- .../src/main/resources/application-dev.yml | 12 ++- pom.xml | 15 +++ 18 files changed, 364 insertions(+), 84 deletions(-) create mode 100644 mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java create mode 100644 mallinkService/src/main/java/com/iformall/file/aliyun/bean/AliyunOSSConfig.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index d8f51bb62..dfb6172bc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.QrCodeService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; @@ -33,6 +34,8 @@ public class UploadController extends BaseController { @Autowired private String fmUploadDir; + @Autowired + private AliyunOSS aliyunOSS; @Autowired private QrCodeService qrCodeService; @@ -67,15 +70,16 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - System.out.println(fileName); - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -137,15 +141,17 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(newFile.length()); - ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); - // 删除本地缓存 +// ResultData data = qrCodeService.awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(newFile)); + // 删除本地缓存 newFile.delete(); return data; } else { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(size); - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } } catch (Exception e) { @@ -185,14 +191,17 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length());; + fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length());; fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantInfo()); +// ResultData data1 = qrCodeService.awsUpload(multipartFile.getInputStream(), metadata, fileName, getTenantInfo()); + ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); + if(data1.code == ResultData.SUCCESS) { Map _data = (Map)data1.data; map.put("url", (String) _data.get("url")); @@ -229,10 +238,17 @@ public class UploadController extends BaseController { metadata.setContentLength(multiReq.getSize()); String fileName = multiReq.getOriginalFilename(); + + int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; + if (dot >= 0) { + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + } fileName = "cimg/" + fileName; - ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ - setTenantId("cimg"); - }}); +// ResultData data = qrCodeService.awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ +// setTenantId("cimg"); +// }}); + ResultData data = aliyunOSS.uploadFile("cimg", fileFormat, multiReq.getInputStream()); return data; } diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index c6efcbfa4..c8195e0ad 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -42,7 +42,7 @@ spring: max-wait: -1 min-idle: 10 - # SMS + aliyun: sms: accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V @@ -53,6 +53,14 @@ spring: 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 @@ -67,6 +75,7 @@ spring: socketFactory: port: 465 class: javax.net.ssl.SSLSocketFactory + # ROCKETMQ rocketmq: nameServer: 127.0.0.1:9876 diff --git a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java index a40a9010e..a2c29c53e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/UploadController.java @@ -15,6 +15,7 @@ import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.MallResourceService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; @@ -50,6 +51,9 @@ public class UploadController extends BaseController { @Autowired private String fmUploadDir; + @Autowired + private AliyunOSS aliyunOSS; + private AmazonS3 s3 = null; private String getFileName(TenantEntity tenantEntity, String fileName) { @@ -149,14 +153,16 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -212,7 +218,8 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(newFile.length()); - ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); +// ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(newFile)); // 删除本地缓存 newFile.delete(); return data; @@ -220,7 +227,8 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(multiReq.getSize()); - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } } @@ -256,14 +264,16 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); getFileName(tenantEntity, fileName + fileFormat); } else { getFileName(tenantEntity, fileName); } - ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); + ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); if (data1.code == ResultData.SUCCESS) { Map _data = (Map) data1.data; map.put("url", (String) _data.get("url")); diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index 8ab1e74c4..e34037bc7 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -52,11 +52,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkbapi + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java index 9e281050f..7241d91d8 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/UploadController.java @@ -11,9 +11,11 @@ import com.amazonaws.services.s3.AmazonS3ClientBuilder; import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; +import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.file.aliyun.AliyunOSS; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -42,6 +44,9 @@ public class UploadController extends BaseController { @Autowired private AwsProperty awsProperty; + @Autowired + private AliyunOSS aliyunOSS; + private AmazonS3 s3 = null; private ResultData awsUpload(MultipartFile multiReq, ObjectMetadata metadata, String fileName) { @@ -134,15 +139,24 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - ResultData data = awsUpload(multiReq, metadata, fileName); - return data; +// ResultData data = awsUpload(multiReq, metadata, fileName); + try { + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); + return data; + } catch (IOException e) { + //e.printStackTrace(); + logger.error(e.getMessage()); + return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); + } + } /** @@ -176,24 +190,33 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - ResultData data1 = awsUpload(multipartFile, metadata, fileName); - if (data1.code == ResultData.SUCCESS) { - Map _data = (Map) data1.data; - map.put("url", (String) _data.get("url")); - dataList.add(map); - } else { - // 部分成功 - data.code = ResultData.SUCCESS; - data.data = dataList; - return data; +// ResultData data1 = awsUpload(multipartFile, metadata, fileName); + try { + ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); + if (data1.code == ResultData.SUCCESS) { + Map _data = (Map) data1.data; + map.put("url", (String) _data.get("url")); + dataList.add(map); + } else { + // 部分成功 + data.code = ResultData.SUCCESS; + data.data = dataList; + return data; + } + } catch (IOException e) { + //e.printStackTrace(); + logger.error(e.getMessage()); + return new ResultData(ErrorCode.PICTURE_ANALYZING_ERROR); } + } data.code = ResultData.SUCCESS; data.data = dataList; diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 0ba11afb7..7307d0404 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -52,11 +52,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkcapi + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java index 2bf7175d3..e765afc18 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java @@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @RestController @@ -66,12 +67,17 @@ public class WxMsgCallbackController extends BaseController { } @PostMapping(value = "/receivemsgAliyun") - public Result receivemsg(@RequestParam Map param) { + public Result receivemsg(@RequestParam List> param) { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receivemsgAliyun"); logger.info(param.toString()); try { - //解析param数据插入数据库中 - wxMsgCallbackService.receivemsgAliyun(param); + if(param != null && param.size() > 0){ + for (Map p:param) { + //解析param数据插入数据库中 + wxMsgCallbackService.receivemsgAliyun(p); + } + } + }catch(Exception e){ logger.error("aliyun 短信回调ERROR",e); return new Result(ErrorCode.SYS_SERVER_ERROR); diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 5169e76f3..1bfa02852 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -53,11 +53,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkcallback + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index bbe0398a4..46adaa728 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -54,11 +54,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkmqconsumer + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 7d4580851..119bbf5f1 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -52,11 +52,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkposapi + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 304820ce4..9692540ff 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -54,11 +54,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkschedule + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java new file mode 100644 index 000000000..29317ca75 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/file/aliyun/AliyunOSS.java @@ -0,0 +1,99 @@ +package com.iformall.file.aliyun; + +import com.aliyun.oss.*; +import com.aliyun.oss.model.CannedAccessControlList; +import com.aliyun.oss.model.CreateBucketRequest; +import com.aliyun.oss.model.PutObjectRequest; +import com.aliyun.oss.model.PutObjectResult; +import com.iformall.common.ResultData; +import com.iformall.file.aliyun.bean.AliyunOSSConfig; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import java.io.File; +import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +@Component +@Slf4j +public class AliyunOSS { + + @Autowired + private AliyunOSSConfig aliyunOSSConfig; + + public ResultData uploadFile(String folder, String suffix,InputStream inputStream){ + String upload = upload(folder,suffix, inputStream); + ResultData data; + if(StringUtils.isNotBlank(upload)){ + data = new ResultData(); + Map map = new HashMap<>(); + map.put("url", upload); + data.data = map; + }else{ + data = new ResultData(ResultData.ERROR,"上传失败"); + } + return data; + } + + /** + * 上传 + * @param inputStream + * @return + */ + public String upload(String folder, String suffix,InputStream inputStream){ + log.info("=========>OSS文件上传开始:"); + String endpoint= aliyunOSSConfig.getEndpoint(); + String accessKeyId= aliyunOSSConfig.getKeyid(); + String accessKeySecret=aliyunOSSConfig.getKeysecret(); + String bucketName=aliyunOSSConfig.getBucketname(); + String fileHost=aliyunOSSConfig.getFilehost(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); + String dateStr = format.format(new Date()); + + if(null == inputStream){ + return null; + } + OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId,accessKeySecret); + try { + //容器不存在,就创建 + if(! ossClient.doesBucketExist(bucketName)){ + ossClient.createBucket(bucketName); + CreateBucketRequest createBucketRequest = new CreateBucketRequest(bucketName); + createBucketRequest.setCannedACL(CannedAccessControlList.PublicRead); + ossClient.createBucket(createBucketRequest); + } + if(StringUtils.isNotBlank(folder)){ + folder = folder + "/"; + }else{ + folder = ""; + } + //创建文件路径 + String fileUrl = folder + fileHost + "/" + dateStr + "/" + + UUID.randomUUID().toString().replace("-","") + suffix; + //上传文件 + PutObjectResult result = ossClient.putObject(new PutObjectRequest(bucketName, fileUrl, inputStream)); + //设置权限 这里是公开读 + ossClient.setBucketAcl(bucketName,CannedAccessControlList.PublicRead); + if(null != result){ + log.info("==========>OSS文件上传成功,OSS地址:"+fileUrl); + return aliyunOSSConfig.getFiledomain() + "/" + fileUrl; + } + }catch (OSSException oe){ + log.error(oe.getMessage()); + }catch (ClientException ce){ + log.error(ce.getMessage()); + }finally { + //关闭 + ossClient.shutdown(); + } + return null; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/file/aliyun/bean/AliyunOSSConfig.java b/mallinkService/src/main/java/com/iformall/file/aliyun/bean/AliyunOSSConfig.java new file mode 100644 index 000000000..8f95f98db --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/file/aliyun/bean/AliyunOSSConfig.java @@ -0,0 +1,22 @@ +package com.iformall.file.aliyun.bean; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * aliyun 配置 + */ +@Component +@Data +@ConfigurationProperties(prefix = "spring.aliyun.oss") +public class AliyunOSSConfig { + + private String endpoint; + private String keyid; + private String keysecret; + private String bucketname; + private String filehost; + private String filedomain; + +} \ No newline at end of file diff --git a/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java b/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java index e5df697d5..d5087279e 100644 --- a/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java +++ b/mallinkService/src/main/java/com/iformall/sms/EnumSMSChannel.java @@ -7,7 +7,7 @@ package com.iformall.sms; public enum EnumSMSChannel { ALIYUN(11, "ALIYUN"), - WIWIDE(1,"WIWIDE"); + WIWIDE(0,"WIWIDE"); public static EnumSMSChannel getEnum(Integer code) { for (EnumSMSChannel value : values()) { diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index 03fbd3b26..c878d468f 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -14,6 +14,7 @@ import com.iformall.config.AwsProperty; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallResource; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.file.aliyun.AliyunOSS; import com.iformall.service.MallResourceService; import com.iformall.utils.ImgUtil; import io.swagger.annotations.Api; @@ -43,6 +44,9 @@ public class UploadController extends BaseController { @Autowired private String fmUploadDir; + @Autowired + private AliyunOSS aliyunOSS; + @Autowired private MallResourceService mallResourceService; @@ -145,14 +149,16 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } @@ -207,7 +213,8 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(newFile.length()); - ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); +// ResultData data = awsUpload(new FileInputStream(newFile), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, new FileInputStream(newFile)); // 删除本地缓存 newFile.delete(); return data; @@ -215,7 +222,8 @@ public class UploadController extends BaseController { ObjectMetadata metadata = new ObjectMetadata(); metadata.setContentType(multiReq.getContentType()); metadata.setContentLength(multiReq.getSize()); - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, tenantEntity); + ResultData data = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multiReq.getInputStream()); return data; } } @@ -251,14 +259,16 @@ public class UploadController extends BaseController { String fileName = UUID.randomUUID().toString(); int dot = multipartFile.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; if (dot >= 0) { - String fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); + fileFormat = multipartFile.getOriginalFilename().substring(dot, multipartFile.getOriginalFilename().length()); fileName = getFileName(tenantEntity, fileName + fileFormat); } else { fileName = getFileName(tenantEntity, fileName); } - ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); +// ResultData data1 = awsUpload(multipartFile.getInputStream(), metadata, fileName, tenantEntity); + ResultData data1 = aliyunOSS.uploadFile(tenantEntity.getTenantId(), fileFormat, multipartFile.getInputStream()); if(data1.code == ResultData.SUCCESS) { Map _data = (Map)data1.data; map.put("url", (String) _data.get("url")); @@ -296,34 +306,40 @@ public class UploadController extends BaseController { String fileName = multiReq.getOriginalFilename(); fileName = "cimg/" + fileName; - ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ - setTenantId("cimg"); - }}); + int dot = multiReq.getOriginalFilename().lastIndexOf('.'); + String fileFormat = ""; + if (dot >= 0) { + fileFormat = multiReq.getOriginalFilename().substring(dot, multiReq.getOriginalFilename().length()); + } +// ResultData data = awsUpload(multiReq.getInputStream(), metadata, fileName, new TenantEntity() {{ +// setTenantId("cimg"); +// }}); + ResultData data = aliyunOSS.uploadFile("cimg", fileFormat, multiReq.getInputStream()); return data; } - /** - * AWS - * @return - * @throws Exception - */ - @GetMapping(value = "/lists") - @ApiOperation("aws列举文件") - public ResultData awsList() throws Exception { - logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); - - try{ - ObjectListing ol = s3.listObjects(awsProperty.getBucketName()); - List objects = ol.getObjectSummaries(); - for (S3ObjectSummary os: objects) { - logger.info(os.toString()); - break; - } - }catch (Exception e){ - e.printStackTrace(); - } - - return new ResultData(); - } +// /** +// * AWS +// * @return +// * @throws Exception +// */ +// @GetMapping(value = "/lists") +// @ApiOperation("aws列举文件") +// public ResultData awsList() throws Exception { +// logger.info("[" + getIpAddr() + "] UploadController::cimgUpload"); +// +// try{ +// ObjectListing ol = s3.listObjects(awsProperty.getBucketName()); +// List objects = ol.getObjectSummaries(); +// for (S3ObjectSummary os: objects) { +// logger.info(os.toString()); +// break; +// } +// }catch (Exception e){ +// e.printStackTrace(); +// } +// +// return new ResultData(); +// } } diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index cac1eab42..3ac633170 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -52,11 +52,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinksysadmin + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index a304cdeef..0e2f81464 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -54,11 +54,19 @@ spring: dateFormat: yyyyMMdd endpointName: cn-hangzhou + oss: + endpoint: oss-cn-beijing.aliyuncs.com + keyid: LTAI4G7ixY4AhvM35F8o3W3V + keysecret: VfWqGb83qIQrS9us45utskl8itd7ry + bucketname: formall + filehost: malinkwebsocketserver + filedomain: http://formall.oss-accelerate.aliyuncs.com + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(lknBjZsA24AaQEXuy0fFw3acd4v4Xsf3CsgDcRZgjlYnNAL9R07d/w==) - password: ENC(gIkVPuYMmJ/EDxry8QIfGumIAk4plAwolGrfg1fiM3U=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: diff --git a/pom.xml b/pom.xml index 62e78ae79..a45fdc757 100644 --- a/pom.xml +++ b/pom.xml @@ -387,6 +387,21 @@ 2.1.0 + + + com.aliyun.oss + aliyun-sdk-oss + 3.10.2 + + + + commons-fileupload + commons-fileupload + 1.4 + + + + From 73bd247652da9d5c8e0b826d836dc272ee413330 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 7 Jul 2020 14:15:13 +0800 Subject: [PATCH 03/36] duanxinbug --- .../src/main/java/com/iformall/domain/po/WxMsgConfig.java | 4 ++-- .../service/msg/impl/SendCallBackSmsServiceImpl.java | 2 +- .../com/iformall/service/msg/impl/SendSmsServiceImpl.java | 2 +- .../src/main/resources/mapper/WxMsgConfigMapper.xml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java index 43f846037..8d5eb10d3 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMsgConfig.java @@ -44,7 +44,7 @@ public class WxMsgConfig extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="appid",name="appid") private String appid; - @io.swagger.annotations.ApiModelProperty(value="是否阿里云发短信1:是;0:否",name="isAliyunSMS") - private Integer isAliyunSMS; + @io.swagger.annotations.ApiModelProperty(value="发短信渠道0:wiwidi; 11:aliyun",name="smsChannel") + private Integer smsChannel; } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index 86c9ded93..c433a41ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -103,7 +103,7 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { */ String result = SMSFactory.sendSms(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString(), modelId, - null,wxMsgModel.getModelCode(),Long.toString(record.getId()),wxMsgConfig.getIsAliyunSMS()); + null,wxMsgModel.getModelCode(),Long.toString(record.getId()),wxMsgConfig.getSmsChannel()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index b46aa872d..5597c8297 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -102,7 +102,7 @@ public class SendSmsServiceImpl implements MsgSendService { String result = SMSFactory.sendSms(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.YES.getCode().toString(), modelId, JSON.toJSONString(record.getDynamicContentMap()),wxMsgValidationcodeModel.getModelCode(), - id,wxMsgConfig.getIsAliyunSMS()); + id,wxMsgConfig.getSmsChannel()); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); String batchNo = jsonObjectResult.get("data").toString(); diff --git a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml index d42040b64..7f99ab969 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgConfigMapper.xml @@ -19,14 +19,14 @@ - + `id`,`tenant_id`,`parent_tenant_id`,`secret`,`publickey`,`bid`,`recharge`,`remains`,`total`,`account`, - `reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`appid`,`isAliyunSMS` + `reminderstatus`,`reminder`,`phone`,`notifyurl`,`modelnotifyurl`,`verifynotifyurl`,`appid`,`sms_channel` @@ -104,8 +104,8 @@ - - and `appid` = #{isAliyunSMS} + + and `sms_channel` = #{smsChannel} From eec21772f40bc0ed9a451982774e8b3a9999fe92 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 7 Jul 2020 14:19:37 +0800 Subject: [PATCH 04/36] duanxinbug --- .../java/com/iformall/service/impl/WxMsgModelServiceImpl.java | 2 +- .../service/impl/WxMsgValidationcodeModelServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index 0944da5d0..8d5133c7f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -74,7 +74,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { String result = SMSFactory.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getModelnotifyurl(),EnumVerifyCode.NO.getCode().toString(), - wxMsgModel.getName(),2,wxMsgModel.getName(),wxMsgConfig.getIsAliyunSMS()); + wxMsgModel.getName(),2,wxMsgModel.getName(),wxMsgConfig.getSmsChannel()); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); logger.info("短信模板创建结果:" + result); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index 86ffee02f..9a8c8f069 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -124,7 +124,7 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM String result = SMSFactory.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getVerifynotifyurl(),EnumVerifyCode.YES.getCode().toString(), - wxMsgModel.getName(),1,wxMsgModel.getName(),wxMsgConfig.getIsAliyunSMS()); + wxMsgModel.getName(),1,wxMsgModel.getName(),wxMsgConfig.getSmsChannel()); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); From c32479c4883fe91dfa4bbf08f7b0604c445bc8bc Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 7 Jul 2020 17:36:55 +0800 Subject: [PATCH 05/36] duanxinbug --- .../callback/WxMsgCallbackController.java | 13 ++++++++---- .../service/impl/WxMsgModelServiceImpl.java | 21 +++++++++++++------ .../WxMsgValidationcodeModelServiceImpl.java | 19 ++++++++++++----- .../com/iformall/sms/aliyun/AliyunSMS.java | 20 ++++++++++++------ 4 files changed, 52 insertions(+), 21 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java index e765afc18..3bf488541 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/WxMsgCallbackController.java @@ -52,12 +52,17 @@ public class WxMsgCallbackController extends BaseController { * @param param */ @PostMapping(value = "/receivemodelAliyun") - public Result receiveverifymodel(@RequestParam Map param) { + public Result receiveverifymodel(@RequestBody List> param) { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receivemodelAliyun"); logger.info(param.toString()); try { - //解析param数据插入数据库中 - wxMsgCallbackService.receivemodelAliyun(param); + if(param != null && param.size() > 0){ + for (Map p:param) { + //解析param数据插入数据库中 + wxMsgCallbackService.receivemodelAliyun(p); + } + } + }catch(Exception e){ logger.error("aliyun 模板回调ERROR",e); return new Result(ErrorCode.SYS_SERVER_ERROR); @@ -67,7 +72,7 @@ public class WxMsgCallbackController extends BaseController { } @PostMapping(value = "/receivemsgAliyun") - public Result receivemsg(@RequestParam List> param) { + public Result receivemsg(@RequestBody List> param) { logger.debug("[" + getIpAddr() + "] WxMsgCallbackController::receivemsgAliyun"); logger.info(param.toString()); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index 8d5133c7f..f7042a5c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -17,6 +17,7 @@ import com.iformall.mapper.WxMsgModelMapper; import com.iformall.service.WxMsgModelService; import com.iformall.sms.SMSFactory; import com.iformall.utils.*; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -83,16 +84,24 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setTenantId(wxMsgModel.getTenantId()); - String data = jsonObjectResult.get("data").toString(); - wxMsgModel.setModelId(Integer.valueOf(data)); - wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + if(jsonObjectResult.get("data") != null){ + String data = jsonObjectResult.get("data").toString(); + wxMsgModel.setModelId(Integer.valueOf(data)); + } + if(jsonObjectResult.get("aliyunModelCode") != null){ + wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + } wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(2);//审核中 wxMsgModelMapper.insert(wxMsgModel); } else { - String data = jsonObjectResult.get("data").toString(); - wxMsgModel.setModelId(Integer.valueOf(data)); - wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + if(jsonObjectResult.get("data") != null){ + String data = jsonObjectResult.get("data").toString(); + wxMsgModel.setModelId(Integer.valueOf(data)); + } + if(jsonObjectResult.get("aliyunModelCode") != null){ + wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + } wxMsgModel.setStatus(2);//审核中 wxMsgModelMapper.updateById(wxMsgModel); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java index 9a8c8f069..6225aaa9c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java @@ -133,15 +133,24 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setTenantId(wxMsgModel.getTenantId()); - String data = jsonObjectResult.get("data").toString(); - wxMsgModel.setModelId(Integer.valueOf(data)); - wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + if(jsonObjectResult.get("data") != null){ + String data = jsonObjectResult.get("data").toString(); + wxMsgModel.setModelId(Integer.valueOf(data)); + } + if(jsonObjectResult.get("aliyunModelCode") != null){ + wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + } wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(2);//审核中 wxMsgValidationcodeModelMapper.insert(wxMsgModel); } else { - String data = jsonObjectResult.get("data").toString(); - wxMsgModel.setModelId(Integer.valueOf(data)); + if(jsonObjectResult.get("data") != null){ + String data = jsonObjectResult.get("data").toString(); + wxMsgModel.setModelId(Integer.valueOf(data)); + } + if(jsonObjectResult.get("aliyunModelCode") != null){ + wxMsgModel.setModelCode(jsonObjectResult.get("aliyunModelCode").toString()); + } wxMsgModel.setStatus(2);//审核中 wxMsgValidationcodeModelMapper.updateById(wxMsgModel); } diff --git a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java index 53f8cab46..76ba6bcf3 100644 --- a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java +++ b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java @@ -34,7 +34,7 @@ public class AliyunSMS implements SMSExcutor { sms.setSignName(signature); Result result = this.sendSms(sms); if(result.getSendSmsResponse().getCode() != null - && result.getSendSmsResponse().getCode().equals("ok")){ + && result.getSendSmsResponse().getCode().equalsIgnoreCase("ok")){ SMSResult.setRet("1"); SMSResult.setData(result.getSendSmsResponse().getBizId()); } @@ -50,7 +50,7 @@ public class AliyunSMS implements SMSExcutor { smsTemplate.setTemplateType(templateType); smsTemplate.setRemark(remark); AddSmsTemplateResponse addSmsTemplateResponse = this.addSmsTemplate(smsTemplate); - if(addSmsTemplateResponse.getCode() != null && addSmsTemplateResponse.getCode().equals("ok")){ + if(addSmsTemplateResponse.getCode() != null && addSmsTemplateResponse.getCode().equalsIgnoreCase("ok")){ SMSResult.setRet("1"); SMSResult.setAliyunModelCode(addSmsTemplateResponse.getTemplateCode()); } @@ -97,6 +97,7 @@ public class AliyunSMS implements SMSExcutor { log.error("添加签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info("添加签名-----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -115,6 +116,7 @@ public class AliyunSMS implements SMSExcutor { log.error("删除签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info("删除签名-----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -135,6 +137,7 @@ public class AliyunSMS implements SMSExcutor { log.error("修改签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info("修改签名----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -153,6 +156,7 @@ public class AliyunSMS implements SMSExcutor { log.error("查询签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info("查询签名----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -171,9 +175,10 @@ public class AliyunSMS implements SMSExcutor { try { response = acsClient.getAcsResponse(request); } catch (ClientException e) { - log.error("添加签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", + log.error(" 添加模板发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info(" 添加模板----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -189,9 +194,10 @@ public class AliyunSMS implements SMSExcutor { try { response = acsClient.getAcsResponse(request); } catch (ClientException e) { - log.error("删除签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", + log.error("删除模板发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info(" 删除模板----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -211,9 +217,10 @@ public class AliyunSMS implements SMSExcutor { try { response = acsClient.getAcsResponse(request); } catch (ClientException e) { - log.error("修改签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", + log.error("修改模板发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info(" 修改模板----" + response.getCode() + "----" + response.getMessage()); return response; } @@ -229,9 +236,10 @@ public class AliyunSMS implements SMSExcutor { try { response = acsClient.getAcsResponse(request); } catch (ClientException e) { - log.error("查询签名发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", + log.error("查询模板发生错误。错误代码是 [{}],错误消息是 [{}],错误请求ID是 [{}],错误Msg是 [{}],错误类型是 [{}]", e.getErrCode(), e.getMessage(), e.getRequestId(), e.getErrMsg(), e.getErrorType()); } + log.info(" 查询模板----" + response.getCode() + "----" + response.getMessage()); return response; } From 3c1643f49b7148faba5625645c38f930c5063b95 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 7 Jul 2020 17:58:28 +0800 Subject: [PATCH 06/36] duanxinbug --- .../java/com/iformall/service/impl/WxMsgModelServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index f7042a5c6..5ffd00974 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -75,7 +75,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { String result = SMSFactory.addTemplate(secret, bid, wxMsgConfig.getPublickey(), signature, content, wxMsgConfig.getModelnotifyurl(),EnumVerifyCode.NO.getCode().toString(), - wxMsgModel.getName(),2,wxMsgModel.getName(),wxMsgConfig.getSmsChannel()); + wxMsgModel.getName(),1,wxMsgModel.getName(),wxMsgConfig.getSmsChannel()); JSONObject jsonObjectResult = JSONObject.parseObject(result); String ret = jsonObjectResult.get("ret").toString(); logger.info("短信模板创建结果:" + result); From d74960fe24ee350fdec987493d8645033b58c87a Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 7 Jul 2020 18:44:20 +0800 Subject: [PATCH 07/36] duanxinbug --- .../iformall/service/impl/WxMsgCallbackServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index ffbec3202..d9a39543d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -167,11 +167,11 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { //approved:审核通过 //rejected:审核未通过 String templateStatus = param.get("template_status"); - if("approving".equals(templateStatus)){ + if("approving".equalsIgnoreCase(templateStatus)){ wxMsgModel.setStatus(2); - }else if("approved".equals(templateStatus)){ + }else if("approved".equalsIgnoreCase(templateStatus)){ wxMsgModel.setStatus(1); - }else if("rejected".equals(templateStatus)){ + }else if("rejected".equalsIgnoreCase(templateStatus)){ wxMsgModel.setStatus(0); }else{ wxMsgModel.setStatus(-1); @@ -190,7 +190,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { String success = param.get("success"); WxMsgCallback wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setBatchNo(param.get("biz_id")); - if("true".equals(success)){ + if("true".equalsIgnoreCase(success)){ wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); if(StringUtils.isNotBlank(param.get("out_id"))){ WxCouponPassword couponPassword = new WxCouponPassword(); From 98742883142c30b43aa44e9f6c87f8df6a87ce2d Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 8 Jul 2020 13:27:29 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 40 ++++++++++++++----- .../src/main/resources/application-prod.yml | 38 +++++++++++++----- .../src/main/resources/application-prod.yml | 38 ++++++++++++------ .../src/main/resources/application-prod.yml | 39 ++++++++++++------ .../src/main/resources/application-prod.yml | 38 ++++++++++++------ .../src/main/resources/application-prod.yml | 38 ++++++++++++------ .../src/main/resources/application-prod.yml | 38 ++++++++++++------ .../src/main/resources/application-prod.yml | 37 ++++++++++++----- .../src/main/resources/application-prod.yml | 37 ++++++++++++----- 9 files changed, 239 insertions(+), 104 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index 226742894..cc166698b 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowMultiQueries=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=60000" # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -37,11 +37,23 @@ spring: max-idle: 20 max-wait: -1 min-idle: 0 + + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -60,6 +72,12 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / + # + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" flyway: enabled: true @@ -80,9 +98,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -99,7 +117,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ ueditor: config: config.json diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 4b5504eea..6f9e6719b 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -23,9 +23,9 @@ spring: maxOpenPreparedStatements: 20 # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -36,11 +36,22 @@ spring: max-idle: 20 max-wait: -1 min-idle: 0 + + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -59,6 +70,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 @@ -73,9 +89,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -92,7 +108,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ pos: dev_id: fmpos diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 92549748d..6af3cffff 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -23,9 +23,9 @@ spring: maxOpenPreparedStatements: 20 # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -36,11 +36,21 @@ spring: max-idle: 20 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -59,7 +69,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / - + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 bucketName: iformall-net @@ -73,9 +87,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -92,7 +106,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ logging: level: diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 14c865b4d..4f93843b8 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -37,11 +37,22 @@ spring: max-idle: 20 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou + # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -60,7 +71,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / - + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 bucketName: iformall-net @@ -78,9 +93,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -97,7 +112,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ logging: level: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index ac253f36e..715b298c4 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -37,11 +37,21 @@ spring: max-idle: 50 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -60,7 +70,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / - + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 bucketName: iformall-net @@ -74,9 +88,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -93,7 +107,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ logging: level: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index 8f571529b..b3708df45 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -23,9 +23,9 @@ spring: maxOpenPreparedStatements: 20 # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -36,11 +36,21 @@ spring: max-idle: 20 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -59,7 +69,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / - + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 bucketName: iformall-net @@ -73,9 +87,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -92,7 +106,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ logging: level: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index e2076b714..ac6331e78 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -37,11 +37,21 @@ spring: max-idle: 8 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -60,7 +70,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / - + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 bucketName: iformall-net @@ -74,9 +88,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -93,7 +107,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com monitor_enable: false clear_data_before_msg_record: 1 diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index dd714f6f7..fa6b83bc0 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -37,11 +37,21 @@ spring: max-idle: 20 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -60,6 +70,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" flyway: enabled: true @@ -80,9 +95,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -99,7 +114,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ ueditor: config: config.json diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index d84017f8d..9c16e9070 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -1,11 +1,11 @@ spring: profiles: - include: rabbitMQ + include: aliyunRocketMQ # JDBC datasource: - url: jdbc:mysql://formalldb.cfqyqflkdlit.rds.cn-northwest-1.amazonaws.com.cn:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true - username: ENC(NUzgQOdJnCbVLKT6BaX0aw==) - password: ENC(mvuoDRiu0jqYaKNRwwTuXZ6U7aoIaqsjdiPqTLgi/nY=) + url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true + username: ENC(nUefcxWYlMS/1cDxikIKwA==) + password: ENC(neToS+hzeFjgSFB/7UEl5qYnW2rUjrPq) type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -24,9 +24,9 @@ spring: connectionProperties: "druid.stat.mergeSql=true;druid.stat.slowSqlMillis=6000" # REDIS redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 3 @@ -37,11 +37,21 @@ spring: max-idle: 8 max-wait: -1 min-idle: 0 + # SMS + aliyun: + sms: + accessKeyId: LTAI4G7ixY4AhvM35F8o3W3V + accessKeySecret: VfWqGb83qIQrS9us45utskl8itd7ry + product: Dysmsapi + domain: dysmsapi.aliyuncs.com + regionId: cn-hangzhou + dateFormat: yyyyMMdd + endpointName: cn-hangzhou # EMAIL mail: host: smtp.exmail.qq.com - username: ENC(IiL/PHP9wCkpibWHRH/Mts8K9fh4izYqaiaF66bDrqtEHP+KUcJRRg==) - password: ENC(m7L57m8mk6tApVoa4XIDQnXF0VxnYjKe4LVdzcgb+xY=) # 授权密码 + username: zhengfangyuan@iformall.com + password: xnydCeUzofB2h8qp # 授权密码 properties: mail: smtp: @@ -60,6 +70,11 @@ spring: publisher-confirms: true publisher-returns: false virtual-host: / + aliyunRocketmq: + accessKeyId: "LTAI4G7ixY4AhvM35F8o3W3V" + accessKeySecret: "VfWqGb83qIQrS9us45utskl8itd7ry" + groupId: "GID_P_1" + namesrvAddr: "http://MQ_INST_1796289517488555_Bcqaq2is.cn-beijing.mq-internal.aliyuncs.com:8080" aws: clientRegion: cn-northwest-1 @@ -74,9 +89,9 @@ wechat: componentToken: ENC(rkxj0733WxFFDLgA9x01m2s5Fi2L+0PC) componentAesKey: ENC(EIbJUBpbYOrLb4YQ/HXLQmxlxgAqIp2ZmpnGICC8pu5xiTz3Cqfkbwd2S8raCcK/IvYcX2GmedI=) redis: - host: 127.0.0.1 + host: 101.201.103.81 port: 6379 - password: ENC(8gYU47Fu93NUJPhwPCiPbAT+6VFA1YDx1egK4Z0Nl6w=) + password: ENC(KD+AiEPSefoV6aKm5qchSASXFGijMzHL) timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -93,7 +108,7 @@ fm: exception_emails: houtaikaifa@iformall.com deploy: 3 open: true - upload_dir: /home/ec2-user/server/uploads/ + upload_dir: /root/uploads/ logging: level: From e1cba8ef5c167e04d8adf8b89e7a2ecb5ae5dd03 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 8 Jul 2020 15:50:05 +0800 Subject: [PATCH 09/36] ALIYUN SQL --- ...006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql | 5 +++++ .../migration/V202007081547__ALIYUN_MSM_ADD.sql | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V202007081547__ALIYUN_MSM_ADD.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql b/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql index a3ccfecb1..a6c9de40d 100644 --- a/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql +++ b/mallinkAdmin/src/main/resources/db/migration/V202006281647__GROUP_UPDATE_PARENT_TENANT_ID.sql @@ -448,3 +448,8 @@ CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb ALTER TABLE `wx_wiwide_info` CHANGE COLUMN `sub_tenant_id` `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + + +ALTER TABLE `wx_c_user_car` +ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`, +MODIFY COLUMN `tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '租户ID'; \ No newline at end of file diff --git a/mallinkAdmin/src/main/resources/db/migration/V202007081547__ALIYUN_MSM_ADD.sql b/mallinkAdmin/src/main/resources/db/migration/V202007081547__ALIYUN_MSM_ADD.sql new file mode 100644 index 000000000..6aba13645 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V202007081547__ALIYUN_MSM_ADD.sql @@ -0,0 +1,17 @@ +ALTER TABLE `mallink`.`wx_msg_config` +ADD COLUMN `isAliyunSMS` smallint(1) NOT NULL DEFAULT 0 COMMENT '是否阿里云发短信1:是' AFTER `appid`; + +ALTER TABLE `mallink`.`wx_msg_config` +CHANGE COLUMN `isAliyunSMS` `sms_channel` smallint(1) NOT NULL DEFAULT 0 COMMENT '发短信渠道0:wiwidi; 11:aliyun' AFTER `appid`; + +ALTER TABLE `mallink`.`wx_msg_signature` +ADD COLUMN `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '短信签名申请说明' AFTER `createtime`, +ADD COLUMN `sign_status` smallint(1) COMMENT '签名审核状态。0:审核中1:审核通过。2:审核失败,请在参数Reason中查看审核失败原因。' AFTER `remark`, +ADD COLUMN `reason` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '审核失败原因' AFTER `sign_status`; + +ALTER TABLE `mallink`.`wx_msg_model` +ADD COLUMN `model_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '模板code' AFTER `model_id`; + + +ALTER TABLE `mallink`.`wx_msg_validationcode_model` +ADD COLUMN `model_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci COMMENT '模板code' AFTER `model_id`; \ No newline at end of file From 30b542afba63b5b48228ecd229e3a563501b1338 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 9 Jul 2020 01:32:20 +0800 Subject: [PATCH 10/36] 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 11/36] =?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 12/36] =?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 13/36] =?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(); } } From 15f6be5f8d12fc568af727a9d8aea0a6f3afbe96 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 9 Jul 2020 06:11:14 +0800 Subject: [PATCH 14/36] ALIYUN msg bug --- .../service/msg/impl/SendCallBackSmsServiceImpl.java | 7 ++++++- .../src/main/java/com/iformall/sms/aliyun/AliyunSMS.java | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java index c433a41ce..46aba1d01 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java @@ -101,9 +101,14 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { return; } */ + String outId = ""; + try { + outId = Long.toString(record.getId()); + }catch(Exception e){} + String result = SMSFactory.sendSms(secret, bid, publickey, phone, signature, msg, notifyUrl, EnumVerifyCode.NO.getCode().toString(), modelId, - null,wxMsgModel.getModelCode(),Long.toString(record.getId()),wxMsgConfig.getSmsChannel()); + null,wxMsgModel.getModelCode(),outId,wxMsgConfig.getSmsChannel()); diff --git a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java index 76ba6bcf3..9e4993637 100644 --- a/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java +++ b/mallinkService/src/main/java/com/iformall/sms/aliyun/AliyunSMS.java @@ -11,6 +11,7 @@ import com.iformall.sms.SMSExcutor; import com.iformall.sms.SMSResult; import com.iformall.sms.aliyun.bean.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -30,7 +31,9 @@ public class AliyunSMS implements SMSExcutor { sms.setPhoneNumbers(phone); sms.setTemplateParam(templateParam); sms.setTemplateCode(templateCode); - sms.setOutId(outId); + if(StringUtils.isNotBlank(outId)){ + sms.setOutId(outId); + } sms.setSignName(signature); Result result = this.sendSms(sms); if(result.getSendSmsResponse().getCode() != null From d910d21b65653d3014797b23e386cc15a97b1f9c Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Fri, 10 Jul 2020 12:53:04 +0800 Subject: [PATCH 15/36] fix bug --- .../service/impl/WxOrderServiceImpl.java | 60 +++++++++---------- .../java/com/iformall/utils/RedisLock.java | 12 +++- 2 files changed, 41 insertions(+), 31 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 3b8d31278..90b350818 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -610,7 +610,7 @@ public class WxOrderServiceImpl implements WxOrderService { long redisStock = redisLock.getCouponStock(Long.parseLong(couponIdStr)); if (redisStock<=0) { - throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"券库存已为零!"); + throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"券库存已为零!:"+couponIdStr); } // 检查 优惠券 库存 if (coupon.getRemainInventory() <= 0) { @@ -1067,13 +1067,6 @@ public class WxOrderServiceImpl implements WxOrderService { /// 储值卡信息添加 if (isCard) { - //判断该transctionId是否已经存在,如果存在,则不添加 - WxCardInfo cardInfoq = new WxCardInfo(); - cardInfoq.setTransactionId(payOrder.getTransactionId()); - List cardInfoList = wxCardInfoMapper.findList(cardInfoq); - if (null != cardInfoList && cardInfoList.size() > 0) { - //do nothing - }else { Integer fee = 0; WxCardInfo cardInfo = new WxCardInfo(); cardInfo.setId(couponOrder.getId()); @@ -1083,27 +1076,35 @@ public class WxOrderServiceImpl implements WxOrderService { cardInfo.setSaleAmount(coupon.getSalePrice()); cardInfo.setRemainingAmount(coupon.getPrice()); if (!coupon.checkIsFree()) { - // 有价卡 - cardInfo.setTransactionId(payOrder.getTransactionId()); - if (payOrder.getShareAmount() != null) { - // 开启分账 - fee = payOrder.getPayAmount() - payOrder.getShareAmount(); - cardInfo.setShareFeeAmount(payOrder.getShareAmount()); - cardInfo.setRemainingShareFeeAmount(payOrder.getShareAmount()); - cardInfo.setRateAmount(payOrder.getRateAmount()); - } else { - // 未开启分账 - fee = PayUtils.getPayRate(payOrder.getPayAmount(), payAccount.getRate(), false); - Integer shareAmount = payOrder.getPayAmount() - fee; - cardInfo.setShareFeeAmount(shareAmount); - cardInfo.setRemainingShareFeeAmount(shareAmount); - if (payAccount.getRealRate() != null) { - int iRealChargeFee = PayUtils.getPayRate(payOrder.getPayAmount(), payAccount.getRealRate(), true); - if (fee > iRealChargeFee) { - cardInfo.setRateAmount(fee - iRealChargeFee); - } - } - } + //判断该transctionId是否已经存在,如果存在,则不添加 + WxCardInfo cardInfoq = new WxCardInfo(); + cardInfoq.setTransactionId(payOrder.getTransactionId()); + List cardInfoList = wxCardInfoMapper.findList(cardInfoq); + if (null != cardInfoList && cardInfoList.size() > 0) { + //do nothing + }else { + // 有价卡 + cardInfo.setTransactionId(payOrder.getTransactionId()); + if (payOrder.getShareAmount() != null) { + // 开启分账 + fee = payOrder.getPayAmount() - payOrder.getShareAmount(); + cardInfo.setShareFeeAmount(payOrder.getShareAmount()); + cardInfo.setRemainingShareFeeAmount(payOrder.getShareAmount()); + cardInfo.setRateAmount(payOrder.getRateAmount()); + } else { + // 未开启分账 + fee = PayUtils.getPayRate(payOrder.getPayAmount(), payAccount.getRate(), false); + Integer shareAmount = payOrder.getPayAmount() - fee; + cardInfo.setShareFeeAmount(shareAmount); + cardInfo.setRemainingShareFeeAmount(shareAmount); + if (payAccount.getRealRate() != null) { + int iRealChargeFee = PayUtils.getPayRate(payOrder.getPayAmount(), payAccount.getRealRate(), true); + if (fee > iRealChargeFee) { + cardInfo.setRateAmount(fee - iRealChargeFee); + } + } + } + } } else { // 免费卡 cardInfo.setShareFeeAmount(0); @@ -1130,7 +1131,6 @@ public class WxOrderServiceImpl implements WxOrderService { } wxCardInfoMapper.insert(cardInfo); } - } return couponOrder; } diff --git a/mallinkService/src/main/java/com/iformall/utils/RedisLock.java b/mallinkService/src/main/java/com/iformall/utils/RedisLock.java index 924b788a4..05b199b7a 100644 --- a/mallinkService/src/main/java/com/iformall/utils/RedisLock.java +++ b/mallinkService/src/main/java/com/iformall/utils/RedisLock.java @@ -133,6 +133,16 @@ public class RedisLock { } public boolean hasCouponStockCache(long couponId) { - return stringRedisTemplate.hasKey(EnumCacheKey.COUPON_STOCK.getMessage()+String.valueOf(couponId)); + //如果库存为零,这个时候同步一下数据库的库存,因为有的时候系统报错事务会胡滚,但是redis扣减库存执行了,所以为0的时候,跟数据库的同步一下 + boolean booleanHasCache = stringRedisTemplate.hasKey(EnumCacheKey.COUPON_STOCK.getMessage()+String.valueOf(couponId)); + if (booleanHasCache) { + long stockvalue = getCouponStock(couponId); + if (stockvalue > 0) { + return true; + }else { + return false; + } + } + return false; } } From 94b7c6cf08225f886c5a3f5450527f30314a9e93 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 12 Jul 2020 20:03:45 +0800 Subject: [PATCH 16/36] fix bug --- .../schedule/WxCUserCheckSchedule.java | 2 +- .../mapper/WxCUserBasicInfoMapper.xml | 223 +++++++----------- 2 files changed, 84 insertions(+), 141 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java index 509c1d6a9..401c5915e 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/WxCUserCheckSchedule.java @@ -28,7 +28,7 @@ public class WxCUserCheckSchedule { @Autowired private WxCUserMapper cUserMapper; - @Scheduled(cron = "0 0 8 * * ?") // 每天凌晨08:00对c_user扫描查重 + //@Scheduled(cron = "0 0 8 * * ?") // 每天凌晨08:00对c_user扫描查重 // @Scheduled(cron = "0 */1 * * * ?") // 测试1分钟一次 public void cuserCheckDuplicate() { diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 56b7c9dc0..659df49d5 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -26,10 +26,10 @@ - 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.`nick_name`,cub.`credit`,cub.`active_time`,cub.`act_record` + `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, + `create_date`,`update_date`,`tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` ,(select level from wx_level_config - where poins >= points and tenant_id=cub.tenant_id + where poins >= points and tenant_id=#{tenantId} order by points desc limit 1 ) level,status @@ -37,77 +37,74 @@ where 1 = 1 - and cub.`id` = #{id} + and `id` = #{id} - - and cub.`tenant_id` = #{tenantId} - - - and cu.`parent_tenant_id` = #{parentTenantId} + + and `tenant_id` = #{tenantId} - and cub.`phone` like concat('%', #{phone},'%') + and `phone` like concat('%', #{phone},'%') - and cub.`birthdate` = #{birthdate} + and `birthdate` = #{birthdate} - and cub.`education` like concat('%', #{education},'%') + and `education` like concat('%', #{education},'%') - and cub.`sex` = #{sex} + and `sex` = #{sex} - and cub.`email` like concat('%', #{email},'%') + and `email` like concat('%', #{email},'%') - and cub.`address` like concat('%', #{address},'%') + and `address` like concat('%', #{address},'%') - and cub.`poins` = #{poins} + and `poins` = #{poins} - and cub.`credit` = #{credit} + and `credit` = #{credit} - and cub.`tag_id` = #{tagId} + and `tag_id` = #{tagId} - and cub.`create_date` = #{createDate} + and `create_date` = #{createDate} - and cub.`update_date` = #{updateDate} + and `update_date` = #{updateDate} - and cub.`act_record` = #{actRecord} + and `act_record` = #{actRecord} - and cub.`name` like concat('%', #{name},'%') + and `name` like concat('%', #{name},'%') - and cub.`create_date` between #{startTime} and #{endTime} + and `create_date` between #{startTime} and #{endTime} - and cub.`status` = #{status} + and `status` = #{status} - and cub.id in + and id in #{idItem} @@ -119,8 +116,7 @@ select r.* from ( select - from wx_c_user_basic_info cub - inner join wx_c_user cu on cu.id = cub.id + from wx_c_user_basic_info ) r where 1=1 @@ -136,95 +132,81 @@ update wx_c_user_basic_info set poins=#{poins} - where phone=#{phone} + where phone=#{phone} and tenant_id=#{tenantId} and id=#{id} update wx_c_user_basic_info set id=#{newId} , credit=#{credit} , poins=#{poins} - where id = #{id} + where tenant_id=#{tenantId} + and id = #{id} @@ -253,11 +235,8 @@ and cub.poins is null - - and cub.`tenant_id` = #{tenantId} - - - and cu.`parent_tenant_id` = #{parentTenantId} + + and cub.tenant_id =#{tenantId} @@ -269,83 +248,66 @@ where cub.status = 0 and cu.phone is not null AND DATE_FORMAT(cub.birthdate,'%m-%d') >= #{begin} AND DATE_FORMAT(cub.birthdate,'%m-%d') <= #{end} - - and cub.`tenant_id` = #{tenantId} - - - and cu.`parent_tenant_id` = #{parentTenantId} + + and cub.tenant_id = #{tenantId} @@ -465,7 +423,6 @@ select count(*) from wx_c_user_basic_info cu - inner join wx_c_user c on c.id = cu.id left join wx_c_user_tags cut on cut.`id` = cu.`tag_id` @@ -477,12 +434,8 @@ where 1=1 - - - and cu.`tenant_id` = #{tenantId} - - - and c.`parent_tenant_id` = #{parentTenantId} + + and cu.tenant_id =#{tenantId} @@ -550,7 +503,6 @@ select from wx_c_user_basic_info cu - inner join wx_c_user c on c.id = cu.id join wx_c_user_tags cut on cut.`id` = cu.`tag_id` @@ -570,22 +521,15 @@ @@ -596,5 +540,4 @@ - - + \ No newline at end of file From 6465920f0220dff06660c946a32f9425316fe658 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 13 Jul 2020 12:44:47 +0800 Subject: [PATCH 17/36] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=89=88=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V2020070131031__GROUP__ADD_001.sql | 2 + .../mapper/WxCUserBasicInfoMapper.xml | 99 +++++++++++++------ .../resources/mapper/WxCUserCarMapper.xml | 45 ++++++--- .../main/resources/mapper/WxCUserMapper.xml | 7 +- 4 files changed, 110 insertions(+), 43 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V2020070131031__GROUP__ADD_001.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V2020070131031__GROUP__ADD_001.sql b/mallinkAdmin/src/main/resources/db/migration/V2020070131031__GROUP__ADD_001.sql new file mode 100644 index 000000000..5bf81edb6 --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V2020070131031__GROUP__ADD_001.sql @@ -0,0 +1,2 @@ +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 diff --git a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml index 659df49d5..d5da0055c 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserBasicInfoMapper.xml @@ -14,6 +14,7 @@ + @@ -27,9 +28,9 @@ `id`,`phone`,`birthdate`,`education`,`sex`,`email`,`address`,`poins`,`tag_id`, - `create_date`,`update_date`,`tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` + `create_date`,`update_date`,`tenant_id`,`parent_tenant_id`,`name`,`nick_name`,`credit`,`active_time`,`act_record` ,(select level from wx_level_config - where poins >= points and tenant_id=#{tenantId} + where poins >= points and tenant_id=wcubi.tenant_id order by points desc limit 1 ) level,status @@ -40,9 +41,12 @@ and `id` = #{id} - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `phone` like concat('%', #{phone},'%') @@ -116,7 +120,7 @@ select r.* from ( select - from wx_c_user_basic_info + from wx_c_user_basic_info wcubi ) r where 1=1 @@ -132,14 +136,13 @@ update wx_c_user_basic_info set poins=#{poins} - where phone=#{phone} and tenant_id=#{tenantId} + where phone=#{phone} and id=#{id} update wx_c_user_basic_info set id=#{newId} , credit=#{credit} , poins=#{poins} - where tenant_id=#{tenantId} - and id = #{id} + where id = #{id} @@ -178,8 +184,11 @@ and birthdate is null - - and tenant_id =#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} @@ -205,8 +214,11 @@ and poins is null - - and tenant_id =#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} @@ -235,8 +247,11 @@ and cub.poins is null - - and cub.tenant_id =#{tenantId} + + and cub.`tenant_id` = #{tenantId} + + + and cub.`parent_tenant_id` = #{parentTenantId} @@ -248,8 +263,11 @@ where cub.status = 0 and cu.phone is not null AND DATE_FORMAT(cub.birthdate,'%m-%d') >= #{begin} AND DATE_FORMAT(cub.birthdate,'%m-%d') <= #{end} - - and cub.tenant_id = #{tenantId} + + and cub.`tenant_id` = #{tenantId} + + + and cub.`parent_tenant_id` = #{parentTenantId} @@ -261,8 +279,11 @@ and create_date < #{endTime} - - and tenant_id =#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and create_date like '%00:00:00' @@ -293,15 +314,21 @@ date_format(create_date, '%Y') <= reportTime - - and tenant_id =#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} ) as totalCount from wx_c_user_basic_info where 1=1 - - and tenant_id =#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and create_date >= #{startTime} @@ -348,9 +375,12 @@ and cu.`id` = #{id} - + and cu.`tenant_id` = #{tenantId} + + and cu.`parent_tenant_id` = #{parentTenantId} + and cu.`phone` like concat('%', #{phone},'%') @@ -434,8 +464,11 @@ where 1=1 - - and cu.tenant_id =#{tenantId} + + and cu.`tenant_id` = #{tenantId} + + + and cu.`parent_tenant_id` = #{parentTenantId} @@ -521,15 +554,21 @@ diff --git a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml index 1f4a2a63e..4316f7a1d 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserCarMapper.xml @@ -4,6 +4,7 @@ + @@ -13,7 +14,7 @@ - `id`,`tenant_id`,`c_user_id`,`car_number`,`create_date`,`update_date`,`vendor_type`,`vendor_params` + `id`,`tenant_id`,`parent_tenant_id`,`c_user_id`,`car_number`,`create_date`,`update_date`,`vendor_type`,`vendor_params` @@ -22,12 +23,14 @@ and `id` = #{id} - - - - and `tenant_id` = #{tenantId} - - + + + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and `c_user_id` = #{cUserId} @@ -82,10 +85,14 @@ diff --git a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml index e7f20e98d..b00fab155 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserMapper.xml @@ -66,8 +66,11 @@ and `id` = #{id} - - and `tenant_id`= #{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} From 45ced459c7985a385a631cadcb506e42b9433fa8 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Mon, 13 Jul 2020 19:03:12 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 64 +++++++++++++------ ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 58 ++++++++++++----- ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 58 ++++++++++++----- ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 64 +++++++++++++------ ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 59 ++++++++++++----- ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 58 ++++++++++++----- ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 58 ++++++++++++----- ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 60 +++++++++++------ ...tion-test.yml => application-test.yml-bak} | 0 .../src/main/resources/application-dev.yml | 58 ++++++++++++----- ...tion-test.yml => application-test.yml-bak} | 0 18 files changed, 377 insertions(+), 160 deletions(-) rename mallinkAdmin/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkBApi/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkCApi/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkCallback/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkMQConsumer/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkPosApi/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkSchedule/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkSysAdmin/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) rename mallinkWebSocketServer/src/main/resources/{application-test.yml => application-test.yml-bak} (100%) diff --git a/mallinkAdmin/src/main/resources/application-dev.yml b/mallinkAdmin/src/main/resources/application-dev.yml index c8195e0ad..b70f43f41 100644 --- a/mallinkAdmin/src/main/resources/application-dev.yml +++ b/mallinkAdmin/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true&allowMultiQueries=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -28,9 +27,9 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -90,8 +89,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -109,20 +108,45 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# web: +# appId: "wxe31beafbfd8295ba" +# secret: "c689fabf3c4c9f5b6424ff2a36a26727" +# url: "https://mall.youlane.cn" +# open: +# componentAppId: "wx897e4673286c915d" +# componentSecret: "cdfdfda65c45689beb6766c4c427eed2" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 202.165.179.86 +# port: 6379 +# password: iF0rm@2l2ol9 +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: web: - appId: "wxe31beafbfd8295ba" - secret: "c689fabf3c4c9f5b6424ff2a36a26727" - url: "https://mall.youlane.cn" + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wx897e4673286c915d" - componentSecret: "cdfdfda65c45689beb6766c4c427eed2" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -130,7 +154,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkAdmin/src/main/resources/application-test.yml b/mallinkAdmin/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkAdmin/src/main/resources/application-test.yml rename to mallinkAdmin/src/main/resources/application-test.yml-bak diff --git a/mallinkBApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml index e34037bc7..53589c006 100644 --- a/mallinkBApi/src/main/resources/application-dev.yml +++ b/mallinkBApi/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -27,9 +26,9 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -109,16 +108,41 @@ jasypt: encryptor: password: oRqdnDbK5pj3eMmB +#wechat: +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: + web: + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -126,7 +150,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkBApi/src/main/resources/application-test.yml b/mallinkBApi/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkBApi/src/main/resources/application-test.yml rename to mallinkBApi/src/main/resources/application-test.yml-bak diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml index 7307d0404..9ec032bba 100644 --- a/mallinkCApi/src/main/resources/application-dev.yml +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -28,9 +27,9 @@ spring: # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -105,16 +104,41 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: + web: + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -122,7 +146,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkCApi/src/main/resources/application-test.yml b/mallinkCApi/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkCApi/src/main/resources/application-test.yml rename to mallinkCApi/src/main/resources/application-test.yml-bak diff --git a/mallinkCallback/src/main/resources/application-dev.yml b/mallinkCallback/src/main/resources/application-dev.yml index 1bfa02852..c2de357bd 100644 --- a/mallinkCallback/src/main/resources/application-dev.yml +++ b/mallinkCallback/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -28,9 +27,9 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -89,8 +88,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -107,20 +106,45 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# web: +# appId: "wxe31beafbfd8295ba" +# secret: "c689fabf3c4c9f5b6424ff2a36a26727" +# url: "https://mall.youlane.cn" +# open: +# componentAppId: "wx897e4673286c915d" +# componentSecret: "cdfdfda65c45689beb6766c4c427eed2" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: web: - appId: "wxe31beafbfd8295ba" - secret: "c689fabf3c4c9f5b6424ff2a36a26727" - url: "https://mall.youlane.cn" + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wx897e4673286c915d" - componentSecret: "cdfdfda65c45689beb6766c4c427eed2" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -128,7 +152,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkCallback/src/main/resources/application-test.yml b/mallinkCallback/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkCallback/src/main/resources/application-test.yml rename to mallinkCallback/src/main/resources/application-test.yml-bak diff --git a/mallinkMQConsumer/src/main/resources/application-dev.yml b/mallinkMQConsumer/src/main/resources/application-dev.yml index 46adaa728..96f2a28b6 100644 --- a/mallinkMQConsumer/src/main/resources/application-dev.yml +++ b/mallinkMQConsumer/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -29,9 +28,9 @@ spring: # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -105,16 +104,41 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: + web: + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -122,10 +146,11 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 + jasypt: encryptor: password: oRqdnDbK5pj3eMmB diff --git a/mallinkMQConsumer/src/main/resources/application-test.yml b/mallinkMQConsumer/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkMQConsumer/src/main/resources/application-test.yml rename to mallinkMQConsumer/src/main/resources/application-test.yml-bak diff --git a/mallinkPosApi/src/main/resources/application-dev.yml b/mallinkPosApi/src/main/resources/application-dev.yml index 119bbf5f1..cb1c954bf 100644 --- a/mallinkPosApi/src/main/resources/application-dev.yml +++ b/mallinkPosApi/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallinkDevGroup1?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -27,9 +26,9 @@ spring: #date-format: yyyy-MM-dd HH:mm:ss # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -109,16 +108,41 @@ jasypt: encryptor: password: oRqdnDbK5pj3eMmB +#wechat: +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: + web: + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -126,7 +150,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkPosApi/src/main/resources/application-test.yml b/mallinkPosApi/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkPosApi/src/main/resources/application-test.yml rename to mallinkPosApi/src/main/resources/application-test.yml-bak diff --git a/mallinkSchedule/src/main/resources/application-dev.yml b/mallinkSchedule/src/main/resources/application-dev.yml index 9692540ff..298c01a4c 100644 --- a/mallinkSchedule/src/main/resources/application-dev.yml +++ b/mallinkSchedule/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -29,9 +28,9 @@ spring: # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -105,16 +104,41 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: + web: + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -122,7 +146,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkSchedule/src/main/resources/application-test.yml b/mallinkSchedule/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkSchedule/src/main/resources/application-test.yml rename to mallinkSchedule/src/main/resources/application-test.yml-bak diff --git a/mallinkSysAdmin/src/main/resources/application-dev.yml b/mallinkSysAdmin/src/main/resources/application-dev.yml index 3ac633170..d60c5cb09 100644 --- a/mallinkSysAdmin/src/main/resources/application-dev.yml +++ b/mallinkSysAdmin/src/main/resources/application-dev.yml @@ -3,10 +3,9 @@ spring: include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -29,7 +28,7 @@ spring: redis: host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 1 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -102,28 +101,53 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# web: +# appId: "wxe31beafbfd8295ba" +# secret: "c689fabf3c4c9f5b6424ff2a36a26727" +# url: "https://mall.youlane.cn" +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 5 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: web: - appId: "wxe31beafbfd8295ba" - secret: "c689fabf3c4c9f5b6424ff2a36a26727" - url: "https://mall.youlane.cn" + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 - database: 5 + database: 2 defaultExpiration: 2592000 # 默认生命周期30天 jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkSysAdmin/src/main/resources/application-test.yml b/mallinkSysAdmin/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkSysAdmin/src/main/resources/application-test.yml rename to mallinkSysAdmin/src/main/resources/application-test.yml-bak diff --git a/mallinkWebSocketServer/src/main/resources/application-dev.yml b/mallinkWebSocketServer/src/main/resources/application-dev.yml index 0e2f81464..cf96df06a 100644 --- a/mallinkWebSocketServer/src/main/resources/application-dev.yml +++ b/mallinkWebSocketServer/src/main/resources/application-dev.yml @@ -1,13 +1,12 @@ spring: profiles: - include: aliyunRocketMQ - #include: rabbitMQ + #include: aliyunRocketMQ + include: rabbitMQ # JDBC datasource: - #url: jdbc:mysql://rm-2zel9i9t555zy7lftmo.mysql.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - url: jdbc:mysql://zc349w82qvn56ftl5e64-rw4rm.rwlb.rds.aliyuncs.com:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true - username: ENC(dZ8fmrtuBMQYaRytKQgTqg==) - password: ENC(IKH7HxMZwIqMttMc9+QsqWa1KMsJvTs4) + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useUnicode=true&useSSL=false&useAffectedRows=true + username: root + password: fm2020test type: com.alibaba.druid.pool.DruidDataSource driver-class-name: com.mysql.cj.jdbc.Driver filters: stat @@ -29,9 +28,9 @@ spring: # REDIS redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 5 @@ -88,8 +87,8 @@ spring: rabbitmq: host: 202.165.179.86 port: 5672 - username: ENC(2f9Nqt3c4cbVGYnhpjp9Mg==) - password: ENC(2av0JfMfz141IHkG6ibI8aKzmD33bc64wcN/O43ucbo=) + username: fumao + password: f9l98&*%%u7flt33 publisher-confirms: true publisher-returns: false virtual-host: / @@ -105,16 +104,41 @@ aws: access: ENC(3gx5ghDFBqGrEhO3Wf8aYmXsnwHO7Cj3HNKJGOeUj0o=) secret: ENC(HVKIJwCJKVXLlUpGlQPwNqJOlnpxn4xYuy91SH0seTSm2uAttIQHvA49fXWWax90v5wloIk0QuU=) +#wechat: +# open: +# componentAppId: "wxdfc8fb4e62d6b52b" +# componentSecret: "98daa62b316dd6feabaad708327ce233" +# componentToken: "formall2018" +# componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" +# redis: +# host: 101.201.103.81 +# port: 6379 +# password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) +# timeout: 3600 +# expire: 1800 #30分钟 +# database: 2 +# defaultExpiration: 2592000 # 默认生命周期30天 +# jedis: +# pool: +# max-active: 100 +# max-idle: 500 +# max-wait: -1 +# min-idle: 10 + wechat: + web: + appId: "wx091907dd0bfd3f6b" + secret: "2a2ca10738998b9ef92c1fe8a4d366a6" + url: "https://admintest.malls.iformall.com" open: - componentAppId: "wxdfc8fb4e62d6b52b" - componentSecret: "98daa62b316dd6feabaad708327ce233" - componentToken: "formall2018" - componentAesKey: "htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN" + componentAppId: wxdfc8fb4e62d6b52b + componentSecret: 98daa62b316dd6feabaad708327ce233 + componentToken: formall2018 + componentAesKey: htKq8EjBMPNndfZQK9JiFojFaqFwFpw42VfeWFtx7HN redis: - host: 101.201.103.81 + host: 202.165.179.86 port: 6379 - password: ENC(xPFDlgd6v8zUhJMbcKc0KmmQiqs9qHtk) + password: iF0rm@2l2ol9 timeout: 3600 expire: 1800 #30分钟 database: 2 @@ -122,7 +146,7 @@ wechat: jedis: pool: max-active: 100 - max-idle: 500 + max-idle: 100 max-wait: -1 min-idle: 10 diff --git a/mallinkWebSocketServer/src/main/resources/application-test.yml b/mallinkWebSocketServer/src/main/resources/application-test.yml-bak similarity index 100% rename from mallinkWebSocketServer/src/main/resources/application-test.yml rename to mallinkWebSocketServer/src/main/resources/application-test.yml-bak From 0ed5152a46e5c14be9d1f34127697a38285c01d8 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 13 Jul 2020 19:36:32 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=89=88=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...1031__GROUP__ADD_001.sql => V202007131031__GROUP__ADD_001.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename mallinkAdmin/src/main/resources/db/migration/{V2020070131031__GROUP__ADD_001.sql => V202007131031__GROUP__ADD_001.sql} (100%) diff --git a/mallinkAdmin/src/main/resources/db/migration/V2020070131031__GROUP__ADD_001.sql b/mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql similarity index 100% rename from mallinkAdmin/src/main/resources/db/migration/V2020070131031__GROUP__ADD_001.sql rename to mallinkAdmin/src/main/resources/db/migration/V202007131031__GROUP__ADD_001.sql From dfe507c2c5e9178e0acf552d01c2e99c93b40da8 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Tue, 14 Jul 2020 16:37:33 +0800 Subject: [PATCH 20/36] =?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 21/36] =?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 22/36] =?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 23/36] 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 24/36] 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 25/36] =?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 + + delete from wx_mall_floor where building_id=#{buildingId} + + + diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 05504be40..d6da92382 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -179,6 +179,15 @@ and m.`parent_tenant_id` = #{parentTenantId} + + + update wx_mall set parent_tenant_id = null where parent_tenant_id = #{parentTenantId} ; + update wx_mall set parent_tenant_id = #{parentTenantId} where tenant_id in + + #{item} + + diff --git a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml index 164561bf7..76e3f339e 100644 --- a/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayAccountBillMapper.xml @@ -77,12 +77,18 @@ order by ${sortColumns} - select - from wx_pay_account + from wx_pay_account_bill + + diff --git a/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml b/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml index e1714c017..139f2996e 100644 --- a/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayAccountMapper.xml @@ -3,6 +3,8 @@ + + @@ -15,14 +17,17 @@ - `id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`,`real_rate` + `id`,`tenant_id`,`parent_tenant_id`,`mch_id`,`sub_mch_id`,`api_key`,`notify_url`,`cert_path`,`type`,`share`,`rate`,`real_rate` where 1 = 1 - - and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} @@ -72,5 +77,11 @@ + + From fcfb41cee50c0a7dd196dbdffa6fdf4b3459ead9 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 16 Jul 2020 00:08:45 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/basic/WxProjectConfigController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java index 33a8dde75..d025475f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java @@ -171,7 +171,7 @@ public class WxProjectConfigController extends BaseController { } @ApiOperation("添加修改特殊商户号信息") - @PostMapping("/init/building") + @PostMapping("/init/payAccount") @SystemControllerLog(description = "特殊商户号-更新") public ResultData initPayAccount(@RequestBody WxPayAccount wxPayAccount) { logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initPayAccount"); From 1a1c81fb2528fdf7388e684e37359159e83de508 Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 16 Jul 2020 12:01:43 +0800 Subject: [PATCH 32/36] bug yiban --- .../V202007131031__GROUP__ADD_001.sql | 4 +++ .../com/iformall/domain/po/WxUserVisit.java | 4 +-- .../mapper/KwMerchantMeterMapper.xml | 5 ++- .../resources/mapper/KwMeterDataMapper.xml | 15 ++++++-- .../resources/mapper/MallUserInfoMapper.xml | 28 ++++++++++----- .../resources/mapper/WxActivityJoinMapper.xml | 5 ++- .../mapper/WxBillSettleBillMapper.xml | 7 +++- .../main/resources/mapper/WxBuserMapper.xml | 11 +++--- .../resources/mapper/WxCUserFromBMapper.xml | 12 +++++-- .../mapper/WxCouponChannelMapper.xml | 25 ++++++++----- .../resources/mapper/WxCouponOrderMapper.xml | 19 +++++++--- .../resources/mapper/WxCouponSendMapper.xml | 7 ++-- .../mapper/WxCreditHistoryMapper.xml | 5 ++- .../mapper/WxDataRuleTargetMapper.xml | 7 ---- .../mapper/WxGameActionLogMapper.xml | 8 +++-- .../resources/mapper/WxMerchantMapper.xml | 5 ++- .../mapper/WxMerchantSubsidyMapper.xml | 5 ++- .../resources/mapper/WxMsgCallbackMapper.xml | 14 ++++---- .../resources/mapper/WxMsgLimitMapper.xml | 16 +++++++-- .../resources/mapper/WxMsgModelMapper.xml | 7 ++-- .../main/resources/mapper/WxOrderMapper.xml | 10 ++++-- .../resources/mapper/WxOrderPressMapper.xml | 9 +++-- .../resources/mapper/WxPayOrderMapper.xml | 7 +++- .../mapper/WxPropertyContractMapper.xml | 8 ++++- .../main/resources/mapper/WxShopMapper.xml | 6 ++++ .../resources/mapper/WxUserVisitMapper.xml | 35 +++++++++++++++---- 26 files changed, 206 insertions(+), 78 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 7626a22f0..99da1da0b 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 @@ -7,3 +7,7 @@ ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_u ALTER TABLE `wx_mall` ADD COLUMN `live_support` SMALLINT(1) DEFAULT '0' COMMENT '是否支持直播(0-不支持,1-支持)'; +ALTER TABLE `wx_user_visit` +ADD COLUMN `parent_tenant_id` varchar(5) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '父租户ID' AFTER `tenant_id`; + +CREATE OR REPLACE ALGORITHM = UNDEFINED DEFINER = `root`@`%` SQL SECURITY DEFINER VIEW `mallink`.`view_touch_user` AS select date_format(`u`.`day_date`,'%Y-%m-%d') AS `xTime`,`u`.`tenant_id` AS `tenant_id`,`u`.`parent_tenant_id` AS `parent_tenant_id`,`u`.`visit_pv` AS `pv`,`u`.`visit_uv` AS `uv`,ifnull(`o`.`couponCount`,0) AS `couponCount`,ifnull(`o`.`userCount`,0) AS `userCount`,ifnull(`v`.`verifyCount`,0) AS `verifyCount`,ifnull(`v`.`verifyUserCount`,0) AS `verifyUserCount` from ((`mallink`.`wx_user_visit` `u` left join (select `mallink`.`wx_coupon_order`.`tenant_id` AS `tenant_id`,date_format(`mallink`.`wx_coupon_order`.`create_date`,'%Y-%m-%d') AS `xTime`,count(distinct `mallink`.`wx_coupon_order`.`c_user_id`) AS `userCount`,count(0) AS `couponCount` from `mallink`.`wx_coupon_order` group by `xTime`,`mallink`.`wx_coupon_order`.`tenant_id`) `o` on(((date_format(`u`.`day_date`,'%Y-%m-%d') = `o`.`xTime`) and (`o`.`tenant_id` = `u`.`tenant_id`)))) left join (select `mallink`.`wx_coupon_order`.`tenant_id` AS `tenant_id`,date_format(`mallink`.`wx_coupon_order`.`update_date`,'%Y-%m-%d') AS `xTime`,count(0) AS `verifyCount`,count(distinct `mallink`.`wx_coupon_order`.`c_user_id`) AS `verifyUserCount` from `mallink`.`wx_coupon_order` where (`mallink`.`wx_coupon_order`.`coupon_order_status` = 1) group by `xTime`,`mallink`.`wx_coupon_order`.`tenant_id`) `v` on(((date_format(`u`.`day_date`,'%Y-%m-%d') = `v`.`xTime`) and (`v`.`tenant_id` = `u`.`tenant_id`)))); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java index 369bd83ee..a39195b82 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxUserVisit.java @@ -1,7 +1,7 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.iformall.domain.po.base.BaseTenantEntity; +import com.iformall.domain.po.base.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -10,7 +10,7 @@ import java.util.*; @TableName(value = "wx_user_visit") @Data @EqualsAndHashCode(callSuper = true) -public class WxUserVisit extends BaseTenantEntity { +public class WxUserVisit extends TenantEntity { protected Long id; diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 0eb19710c..02b0eabf9 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -175,9 +175,12 @@ where 1 = 1 - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `box_id` = #{boxId} diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 4beb0e5cc..eaded14e1 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -27,9 +27,12 @@ and `id` = #{id} - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `box_id` = #{boxId} @@ -106,9 +109,12 @@ where 1 = 1 - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `box_id` = #{boxId} @@ -232,9 +238,12 @@ tenant_id FROM kw_meter_data where 1 = 1 - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + and `meter_id` = #{meterId} diff --git a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml index e23c88ac3..74637f838 100644 --- a/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/MallUserInfoMapper.xml @@ -152,8 +152,11 @@ from mall_user_info where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and `bopen_id`=#{bopenId} @@ -174,8 +177,11 @@ update mall_user_info set `web_open_id` = null where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and username=#{username} @@ -189,8 +195,11 @@ update mall_user_info set `web_open_id` = null, `bopen_id` = null where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and username=#{username} @@ -205,8 +214,11 @@ from mall_user_info where 1=1 - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} and `phone`=#{phone} diff --git a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml index 352aaa387..b22de08d0 100644 --- a/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxActivityJoinMapper.xml @@ -83,9 +83,12 @@ select a.id,a.cover_img,a.title,a.activity_start_time,a.activity_end_time,aj.`status` from wx_activity_join aj left join wx_activity a on aj.activity_id=a.id where aj.user_id=#{userId} - + and aj.`tenant_id` = #{tenantId} + + and aj.`parent_tenant_id` = #{parentTenantId} + and aj.`status` in (${statusStr}) and a.`status`=2 diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml index 6c4740fcd..7e9c206bc 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleBillMapper.xml @@ -28,7 +28,12 @@ where 1=1 and `id` = #{id} - and `tenant_id` = #{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxBuserMapper.xml b/mallinkService/src/main/resources/mapper/WxBuserMapper.xml index b7d62466c..d59eef32a 100644 --- a/mallinkService/src/main/resources/mapper/WxBuserMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBuserMapper.xml @@ -66,13 +66,12 @@ and `id` = #{id} - - - and `tenant_id`= #{tenantId} + + + and `tenant_id` = #{tenantId} - - - and `parent_tenant_id`= #{parentTenantId} + + and `parent_tenant_id` = #{parentTenantId} diff --git a/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml b/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml index 68cfad34b..e4d28d9ef 100644 --- a/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCUserFromBMapper.xml @@ -4,6 +4,7 @@ + @@ -16,13 +17,18 @@ - `id`,`tenant_id`,`merchant_id`,`b_user_id`,`c_user_id`,`info`,`create_time`,`update_time`,`openid`,`app_id` + `id`,`tenant_id`,`parent_tenant_id`,`merchant_id`,`b_user_id`,`c_user_id`,`info`,`create_time`,`update_time`,`openid`,`app_id` where 1 = 1 - and `id` = #{id} - and `tenant_id` = #{tenantId} + and `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and `merchant_id` = #{merchantId} and `b_user_id` = #{bUserId} and `c_user_id` = #{cUserId} diff --git a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml index 5a9b9a9e0..0e7651abe 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml @@ -124,18 +124,24 @@ update wx_coupon_channel set status=#{status}, update_date=#{updateDate} where coupon_id=#{couponId} - - and tenant_id = #{tenantId} - + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + update wx_coupon_channel set end_time = #{endTime} where coupon_id=#{couponId} - - and tenant_id = #{tenantId} - + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + @@ -214,8 +220,11 @@ and cc.status=#{status} - - and cc.tenant_id = #{tenantId} + + and cc.`tenant_id` = #{tenantId} + + + and cc.`parent_tenant_id` = #{parentTenantId} order by ${sortColumns} diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index aa9dd403c..0cc29dc47 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -226,12 +226,18 @@ - update wx_msg_limit set limit_num = limit_num - 1 where `id` = #{id} and `tenant_id` = #{tenantId} and limit_num > 0 + update wx_msg_limit set limit_num = limit_num - 1 where `id` = #{id} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + + and limit_num > 0 diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index 174497cab..399ed931b 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -82,8 +82,11 @@ and `model_id` = #{modelId} - - and `tenant_id`=#{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} limit 1 diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 4768829c8..8c72b2cc6 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -237,9 +237,12 @@ update wx_order set order_status=#{orderStatus} where product_id=#{productId} and press_end_date is not null and order_status in (6,7) - + and `tenant_id` = #{tenantId} + + and `parent_tenant_id` = #{parentTenantId} + @@ -502,9 +505,12 @@ LEFT JOIN wx_c_user cu on cu.id = o.c_user_id LEFT JOIN wx_c_user_basic_info cubi on cubi.id = o.c_user_id where o.order_status = '0' and o.`type` = 1 - + and o.`tenant_id` = #{tenantId} + + and o.`parent_tenant_id` = #{parentTenantId} + and bu.`merchant_id` = #{merchantId} diff --git a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml index d47ced398..f2569b63f 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderPressMapper.xml @@ -20,9 +20,12 @@ and `id` = #{id} - - and `tenant_id` = #{tenantId} - + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and `order_id` = #{orderId} diff --git a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml index a0879bc64..286c55975 100644 --- a/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPayOrderMapper.xml @@ -173,7 +173,12 @@ from wx_pay_order where 1=1 - and `tenant_id` = #{tenantId} + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and order_id in ( select id from wx_order where `tenant_id` = #{tenantId} and type = 1 and order_status = 0 ); diff --git a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml index ed624e9b9..33feeaaed 100644 --- a/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxPropertyContractMapper.xml @@ -130,7 +130,13 @@ left join wx_mall_building b on s.building=b.id left join wx_brand br on rc.brand=br.id - rc.tenant_id=#{tenantId} + + + and rc.`tenant_id` = #{tenantId} + + + and rc.`parent_tenant_id` = #{parentTenantId} + and rc.`merchant_name` like concat('%',#{merchantName},'%') diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index c19970a6c..a7a651672 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -565,6 +565,12 @@ SELECT DATE_FORMAT(day_date,'%m/%d') as xTime,visit_pv as pv,visit_uv as uv from wx_user_visit - where tenant_id=#{tenantId} + where 1=1 + + and `tenant_id` = #{tenantId} + + + and `parent_tenant_id` = #{parentTenantId} + and day_date >= #{startTime} @@ -133,7 +148,13 @@ - insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id) + insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id,parent_tenant_id) select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)) id ,'系统端' user_name,7 `action`,b.id bill_id, @@ -292,7 +292,7 @@ b.owe * (c.late_pay_ratio) /10000 ,2) ) - ,'元') details,b.tenant_id + ,'元') details,b.tenant_id,b.parent_tenant_id from wx_bill_property b left join wx_property_contract c on(b.`property_contract_id`=c.id) where c.late_pay_ratio >0 and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 diff --git a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml index a0f6b5d44..f217cb022 100644 --- a/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillRentMapper.xml @@ -279,7 +279,7 @@ - insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id) + insert into wx_bill_action(id,user_name,`action`,bill_id,details,tenant_id,parent_tenant_id) select (select unix_timestamp(now()) + CEILING(RAND()*90000+10000) + CEILING(RAND()*90000+10000)+ CEILING(RAND()*90000+10000) ) id ,'系统端' user_name,7 `action`,b.id bill_id, @@ -293,7 +293,7 @@ b.owe * (c.late_pay_ratio) /10000 ,2) ) - ,'元') details,b.tenant_id + ,'元') details,b.tenant_id,b.parent_tenant_id from wx_bill_rent b left join wx_rent_contract c on(b.rent_contract_id=c.id) where c.late_pay_ratio >0 and DATEDIFF(now(), date_add(b.receive_date,interval(c.late_pay_day) day)) >0 From 94509a9beca98a7b1bb96ccbad2e9b0f1570045d Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 16 Jul 2020 14:59:32 +0800 Subject: [PATCH 35/36] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/sys/MallRoleController.java | 4 ++-- .../com/iformall/controller/sys/MallUserInfoController.java | 2 +- .../java/com/iformall/controller/sys/SysMenuController.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index c627aef99..70125f588 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -52,7 +52,7 @@ public class MallRoleController extends BaseController { @SystemControllerLog(description = "用户管理-role列表") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); - sysRole.updateTenantInfo(getTenantInfo()); + sysRole.updateTenantInfo(ifParentUpdateTenantInfo()); sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); for (MallRole r : page.getList()) { @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { MallRole role = sysRoleService.getById(sysRole.getId()); MallRolePermission p = new MallRolePermission(); p.setRoleId(role.getId()); - p.updateTenantInfo(getTenantInfo()); + p.updateTenantInfo(ifParentUpdateTenantInfo()); List pers = sysRolePermissionService.getList(p); String menus = ""; for (MallRolePermission rp : pers) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 60dbc70f0..39158e41d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); - userInfo.updateTenantInfo(getTenantInfo()); + userInfo.updateTenantInfo(ifParentUpdateTenantInfo()); userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index a98c0cbe7..cbba72d38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -73,7 +73,7 @@ public class SysMenuController extends BaseController { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); if (user.checkGroupAdmin()) { - TenantEntity tenantEntity = getTenantInfo(); + TenantEntity tenantEntity = ifParentUpdateTenantInfo(); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { user.setParentTenantId(tenantEntity.getParentTenantId()); } From 77b7283c6607d166592ee1ba4deebb6124ed5446 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 16 Jul 2020 17:35:59 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=8E=92=E9=99=A4wx-java=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mallinkAdmin/pom.xml | 1 - mallinkBApi/pom.xml | 1 - mallinkCApi/pom.xml | 1 - mallinkCallback/pom.xml | 1 - mallinkMQConsumer/pom.xml | 1 - mallinkPosApi/pom.xml | 1 - mallinkSchedule/pom.xml | 1 - mallinkSysAdmin/pom.xml | 1 - mallinkWebSocketServer/pom.xml | 1 - 9 files changed, 9 deletions(-) diff --git a/mallinkAdmin/pom.xml b/mallinkAdmin/pom.xml index 4b844ae82..d17aa1dd1 100644 --- a/mallinkAdmin/pom.xml +++ b/mallinkAdmin/pom.xml @@ -77,7 +77,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml index 1e82a3857..d35260501 100644 --- a/mallinkBApi/pom.xml +++ b/mallinkBApi/pom.xml @@ -46,7 +46,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkCApi/pom.xml b/mallinkCApi/pom.xml index 7454c5c62..e3708dd5a 100644 --- a/mallinkCApi/pom.xml +++ b/mallinkCApi/pom.xml @@ -46,7 +46,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkCallback/pom.xml b/mallinkCallback/pom.xml index 261915bfe..f0d9c7642 100644 --- a/mallinkCallback/pom.xml +++ b/mallinkCallback/pom.xml @@ -49,7 +49,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkMQConsumer/pom.xml b/mallinkMQConsumer/pom.xml index 9a4083084..4e5ae9f12 100644 --- a/mallinkMQConsumer/pom.xml +++ b/mallinkMQConsumer/pom.xml @@ -43,7 +43,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkPosApi/pom.xml b/mallinkPosApi/pom.xml index e4e976b42..db014c7f1 100644 --- a/mallinkPosApi/pom.xml +++ b/mallinkPosApi/pom.xml @@ -46,7 +46,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkSchedule/pom.xml b/mallinkSchedule/pom.xml index 0b9d64146..298206a96 100644 --- a/mallinkSchedule/pom.xml +++ b/mallinkSchedule/pom.xml @@ -43,7 +43,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkSysAdmin/pom.xml b/mallinkSysAdmin/pom.xml index 0ebdc1beb..c9d60a5d0 100644 --- a/mallinkSysAdmin/pom.xml +++ b/mallinkSysAdmin/pom.xml @@ -66,7 +66,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio, diff --git a/mallinkWebSocketServer/pom.xml b/mallinkWebSocketServer/pom.xml index 70fbbbedf..942092684 100644 --- a/mallinkWebSocketServer/pom.xml +++ b/mallinkWebSocketServer/pom.xml @@ -51,7 +51,6 @@ com.fasterxml.uuid, com.fasterxml, com.github.axet, - com.github.binarywang, com.github.jsqlparser, com.github.pagehelper, com.github.ulisesbocchio,