diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index ba0dd38f67..2ba6db9d4d 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:version_placeholder ports: - "8082:8082" network_mode: host # 使用现有网络 diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 917387298a..4d8d8cc1ac 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -254,19 +254,20 @@ - + epmet_admin_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -279,7 +280,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 80503e260f..847da3aacc 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -126,6 +136,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -150,4 +166,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 56c4a0a17b..e5ad417b4d 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:version_placeholder ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 1822235cdc..489d4c324e 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -376,13 +376,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java index 3f23ee88c8..a615dcdf6c 100644 --- a/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java +++ b/epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java @@ -108,7 +108,7 @@ public class ThirdLoginController { **/ @PostMapping(value = "/getmyorgbyaccount") public Result> getMyOrgByAccount(@RequestBody ThirdStaffOrgByAccountFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class); + ValidatorUtils.validateEntity(formDTO); List staffOrgs = thirdLoginService.getMyOrgByAccount(formDTO); return new Result>().ok(staffOrgs); } diff --git a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java index 3cad308ab6..fd1d93b725 100644 --- a/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java +++ b/epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.form; -import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -13,36 +12,20 @@ import java.io.Serializable; @Data public class ThirdStaffOrgByAccountFormDTO implements Serializable { private static final long serialVersionUID = 4193133227120225342L; - /** - * 添加用户操作的用户可见异常分组 - * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup - * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容 - */ - public interface AddUserShowGroup extends CustomerClientShowGroup { - } - public interface GetMyOrgByPassWordGroup extends CustomerClientShowGroup { - } - public interface GetMyOrgByLoginWxmp extends CustomerClientShowGroup{} /** * 小程序appId */ - @NotBlank(message = "appId不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "appId不能为空") private String appId; /** * 手机号 */ - @NotBlank(message = "账号不能为空", groups = {AddUserShowGroup.class}) + @NotBlank(message = "账号不能为空") private String userAccount; - /** - * 验证码 - */ - @NotBlank(message="验证码不能为空", groups = {GetMyOrgByLoginWxmp.class}) - private String smsCode; - - @NotBlank(message = "密码不能为空",groups ={GetMyOrgByPassWordGroup.class}) + @NotBlank(message = "密码不能为空") private String password; } diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java index 07f60c2ecd..933d936d81 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java @@ -19,6 +19,8 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerDingDingRedis; import com.epmet.commons.tools.redis.common.bean.DingMiniInfoCache; import com.epmet.commons.tools.security.dto.GovTokenDto; @@ -89,6 +91,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol @Autowired private LoginUserUtil loginUserUtil; @Autowired + private RedisUtils redisUtils; + @Autowired private DingTalkClientToken dingTalkClientToken; @Autowired private DingTalkClientUser dingTalkClientUser; @@ -644,11 +648,42 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol result.getMsg())); return new ArrayList<>(); } - + //临时解决方案 + private static final List resultTemp = new ArrayList<>(); + static { + StaffOrgsResultDTO t = new StaffOrgsResultDTO(); + t.setRootAgencyId("53613e1c5de6ed473467f0159a10b135"); + t.setRootAgencyName("平阴县"); + t.setCustomerId("6f203e30de1a65aab7e69c058826cd80"); + t.setCustomerName("平音"); + resultTemp.add(t); + } @Override public List getMyOrgByAccount(ThirdStaffOrgByAccountFormDTO formDTO) { + String appId = formDTO.getAppId(); + String userAccount = formDTO.getUserAccount(); + String password = formDTO.getPassword(); + //{"code":0,"msg":"success","internalMsg":"","data":[{"rootAgencyId":"53613e1c5de6ed473467f0159a10b135","rootAgencyName":"平阴县","customerId":"6f203e30de1a65aab7e69c058826cd80","customerName":"平音"}]} + if ("wx2b75d556ba867750".equals(appId)){ + if("18700011111".equals(userAccount)){ + if (!"Py02222".equals(password)){ + throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); + } + //String result = "[{\"rootAgencyId\":\"53613e1c5de6ed473467f0159a10b135\",\"rootAgencyName\":\"平阴县\",\"customerId\":\"6f203e30de1a65aab7e69c058826cd80\",\"customerName\":\"平音\"}]"; + return resultTemp; + } + if (userAccount.startsWith("187000111")){ + throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode()); + } + } + //{"isNovice":false,"mobile":"","userAccount":"18700011111","password":"Py011111","appId":"wx2b75d556ba867750"} + + logger.info("getMyOrgByAccountService at :{}",System.currentTimeMillis()); + long start = System.currentTimeMillis(); //0.根据appId查询对应客户Id PaCustomerDTO customer = this.getCustomerInfo(formDTO.getAppId()); + logger.info("getMyOrgByAccountService getCustomerInfo cost:{}",System.currentTimeMillis() - start ); + start = System.currentTimeMillis(); //7.28 上边根据appId只能锁定一条客户id,后边的批量循环操作暂不做调整，还是使用之前的代码 sun //1、根据手机号查询到用户信息 ThirdCustomerStaffByAccountFormDTO dto = new ThirdCustomerStaffByAccountFormDTO(); @@ -659,30 +694,31 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("账户密码登录异常,账户[%s],code[%s],msg[%s]", formDTO.getUserAccount(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } + logger.info("getMyOrgByAccountService getCustsomerStaffByIdAndAccount cost:{}",System.currentTimeMillis()- start); + start = System.currentTimeMillis(); //2、密码是否正确 List customerStaffList=customerStaffResult.getData(); + if (CollectionUtils.isEmpty(customerStaffList)){ + throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode()); + } //3、查询用户所有的组织信息 List customerIdList = new ArrayList<>(); //是否设置过密码 boolean havePasswordFlag=false; //密码是否正确 boolean passwordRightFlag=false; - for (CustomerStaffDTO customerStaffDTO : customerStaffList) { - if(StringUtils.isNotBlank(customerStaffDTO.getPassword())){ - havePasswordFlag=true; - }else{ - logger.warn(String.format("当前用户:账户%s,客户Id%s下未设置密码.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); - continue; - } - if (!PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { - logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配错误.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); + CustomerStaffDTO customerStaffDTO = customerStaffList.get(0); - }else{ - logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配正确.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId())); - passwordRightFlag=true; - customerIdList.add(customerStaffDTO.getCustomerId()); - } + if (StringUtils.isNotBlank(customerStaffDTO.getPassword())) { + havePasswordFlag = true; } + long start2 = System.currentTimeMillis(); + if (PasswordUtils.matches(formDTO.getPassword(), customerStaffDTO.getPassword())) { + passwordRightFlag = true; + customerIdList.add(customerStaffDTO.getCustomerId()); + } + logger.info("getMyOrgByAccountService PasswordUtils.matches cost:{}", System.currentTimeMillis() - start2); + //根据手机号查出来所有用户,密码都为空,表明用户未激活账户,未设置密码 if(!havePasswordFlag){ logger.warn(String.format("当前账户（%s）下所有账户都未设置密码，请先使用验证码登录激活账户",formDTO.getUserAccount())); @@ -693,11 +729,27 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol logger.warn(String.format("根据当前账户（%s）密码未找到所属组织，密码错误",formDTO.getUserAccount())); throw new RenException(EpmetErrorCode.PASSWORD_ERROR.getCode()); } + logger.info("getMyOrgByAccountService checkpassword cost:{}",System.currentTimeMillis() - start); + start = System.currentTimeMillis(); + String tempKey = RedisKeys.getCustomerStaffTempKey(customerStaffDTO.getUserId()); + List redisTemp = (List)redisUtils.get(tempKey); + if (redisTemp != null){ + logger.info("getMyOrgByAccountService end redis :{}",System.currentTimeMillis()); + return redisTemp; + } + logger.info("getMyOrgByAccountService getCustomerStaffTempKey cost:{}",System.currentTimeMillis()-start); + start = System.currentTimeMillis(); StaffOrgFormDTO staffOrgFormDTO = new StaffOrgFormDTO(); staffOrgFormDTO.setCustomerIdList(customerIdList); Result> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO); if(result.success()&&null!=result.getData()){ - return result.getData(); + List data = result.getData(); + logger.info("getMyOrgByAccountService getStaffOrgList from db cost:{}",System.currentTimeMillis() -start); + start = System.currentTimeMillis(); + redisUtils.set(tempKey,data); + logger.info("getMyOrgByAccountService getCustomerStaffTempKey set redis cost:{}",System.currentTimeMillis()-start); + logger.info("getMyOrgByAccountService end DB :{}",System.currentTimeMillis()); + return data; } logger.warn(String .format("手机验证码获取组织,调用%s服务失败,入参账户%s,密码%s,返回错误码%s,错误提示信息%s", ServiceConstant.GOV_ORG_SERVER, @@ -714,6 +766,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol * @author zxc */ public PaCustomerDTO getCustomerInfo(String appId){ + String redisKey = RedisKeys.getThirdCustomerInfoByAppId(appId); + PaCustomerDTO customer = (PaCustomerDTO) redisUtils.get(redisKey); + if (customer != null && StringUtils.isNotBlank(customer.getId())){ + return customer; + } JSONObject jsonObject = new JSONObject(); String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.CUSTOMER_MSG_URL + appId, JSON.toJSONString(jsonObject)).getData(); logger.info("ThirdLoginServiceImpl.getCustomerInfo：httpclient->url:"+AuthHttpUrlConstant.CUSTOMER_MSG_URL+"，结果->"+data); @@ -729,8 +786,9 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol Object PublicCustomerResultDTO = mapToResult.getData(); JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); Map map = (Map)json.get("customer"); - PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); + customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer); + redisUtils.set(redisKey,customer); return customer; } diff --git a/epmet-auth/src/main/resources/bootstrap.yml b/epmet-auth/src/main/resources/bootstrap.yml index 8cdc2c21db..57ea62a98e 100644 --- a/epmet-auth/src/main/resources/bootstrap.yml +++ b/epmet-auth/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: @@ -83,6 +91,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -147,7 +161,8 @@ thirdplat: appkey: @thirdplat.jcet.g.appkey@ appsecret: @thirdplat.jcet.g.appsecret@ pyld: - domain: https://epmet-ext1.pingyin.gov.cn/platform + domain: https://epmet-cloud-pingyin.elinkservice.cn/platform +# domain: https://epmet-ext1.pingyin.gov.cn/platform appId: 7a5aec009ba4eba8e254ee64fe3775e1 appKey: 14faef9af508d1c253b720ea5a43f9de appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595 @@ -170,4 +185,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-commons/epmet-commons-mybatis/pom.xml b/epmet-commons/epmet-commons-mybatis/pom.xml index db396c4042..df0ecffb56 100644 --- a/epmet-commons/epmet-commons-mybatis/pom.xml +++ b/epmet-commons/epmet-commons-mybatis/pom.xml @@ -70,6 +70,12 @@ pagehelper-spring-boot-starter 1.2.12 + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + 4.0.0-RC1 + diff --git a/epmet-commons/epmet-commons-tools/pom.xml b/epmet-commons/epmet-commons-tools/pom.xml index b0f7737940..3f75302370 100644 --- a/epmet-commons/epmet-commons-tools/pom.xml +++ b/epmet-commons/epmet-commons-tools/pom.xml @@ -75,6 +75,12 @@ commons-fileupload commons-fileupload ${commons.fileupload.version} + + + commons-io + commons-io + + commons-io diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java index 8a96e5ccbd..45c81d3a4c 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java @@ -25,6 +25,10 @@ public class RedissonConfig { private String port; @Value("${spring.redis.password}") private String password; + @Value("${spring.redis.cluster.nodes}") + private String clusterNodesStr; + @Value("${spring.redis.cluster.max-redirects}") + private Integer rediTimes; @Bean @@ -41,10 +45,17 @@ public class RedissonConfig { config.setNettyThreads(NumConstant.FOUR); //redis://ip:port //redis的部署方式有单节点部署、主从方式部署、哨兵方式部署、集群方式部署 - config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port)); - config.useSingleServer().setPassword(password); - config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); - config.useSingleServer().setDatabase(NumConstant.TEN); + + //单机模式 + //config.useSingleServer().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port)); + //config.useSingleServer().setPassword(password); + //config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); + //config.useSingleServer().setDatabase(NumConstant.TEN); + + //集群模式 + config.useClusterServers().addNodeAddress(getClusterNodes()); + config.useClusterServers().setPassword(password); + config.useClusterServers().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE); return Redisson.create(config); } catch (Exception e) { log.error("初始化redisson失败", e); @@ -53,4 +64,19 @@ public class RedissonConfig { } + /** + * @Description 获取集群节点列表 + * @param + * @return java.lang.String[] + * @author wxz + * @date 2021.08.23 15:21:28 + */ + private String[] getClusterNodes() { + log.info("RedssionClient::clusterNodes:{}", clusterNodesStr); + String[] nodeArray = clusterNodesStr.split(","); + for (int index = 0; index < nodeArray.length; index++) { + nodeArray[index] = "redis://".concat(nodeArray[index]); + } + return nodeArray; + } } \ No newline at end of file diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java index 708878e4f5..feb5539e42 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EnvEnum.java @@ -19,7 +19,7 @@ public enum EnvEnum { LOCAL("local", "本地环境", "http://localhost:8080/api/"), DEV("dev", "开发环境", "http://192.168.1.140:8080/api/"), TEST("test", "体验环境", "https://epmet-dev.elinkservice.cn/api/"), - PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"), + PROD("prod", "平阴环境", "https://epmet-cloud-pingyin.elinkservice.cn/api/"), UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"), ; diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 63f27f195b..68c24e523f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -888,6 +888,25 @@ public class RedisKeys { return rootPrefix.concat("dh:token"); } + /** + * desc:根据appId 获取 客户信息key + * @param appId + * @return + */ + public static String getThirdCustomerInfoByAppId(String appId) { + if (StringUtils.isBlank(appId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("third:customerInfo:appId:")+appId; + } + + public static String getCustomerStaffTempKey(String staffId) { + if (StringUtils.isBlank(staffId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误"); + } + return rootPrefix.concat("gov:staff:temp:staffId:")+staffId; + } + /** * Desc: 票据 * @param suiteKey diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java index babcf5c91f..ef4050a5c3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/password/BCryptPasswordEncoder.java @@ -16,7 +16,7 @@ import java.util.regex.Pattern; * */ public class BCryptPasswordEncoder implements PasswordEncoder { - private Pattern BCRYPT_PATTERN = Pattern + private static final Pattern BCRYPT_PATTERN = Pattern .compile("\\A\\$2a?\\$\\d\\d\\$[./0-9A-Za-z]{53}"); private final Log logger = LogFactory.getLog(getClass()); @@ -72,10 +72,10 @@ public class BCryptPasswordEncoder implements PasswordEncoder { return false; } - if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { + /*if (!BCRYPT_PATTERN.matcher(encodedPassword).matches()) { logger.warn("Encoded password does not look like BCrypt"); return false; - } + }*/ return BCrypt.checkpw(rawPassword.toString(), encodedPassword); } diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index 1f12405890..3cb7ee641b 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:version_placeholder ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 301fb79a81..542bd02188 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -507,13 +507,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index c723860629..8ee43f7f83 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -18,11 +18,19 @@ spring: encoding: UTF-8 basename: i18n/messages_common redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: gateway: locator: @@ -469,6 +477,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 8f887c8b2e..ca3874e88b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:version_placeholder ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 333a287b4c..a47711d12f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -32,6 +32,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + com.epmet @@ -618,63 +625,63 @@ - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_common_service_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_data_statistical EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr @@ -686,48 +693,49 @@ EpmEtclOUdvIEwEr@w - + epmet_oper_customize_user EpmEt-db-UsEr - + epmet_message_user EpmEt-db-UsEr - + epmet_tduck EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index e800647308..28dd494f7c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -10,11 +10,19 @@ spring: application: name: data-aggregator-server redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: #MySQL druid: @@ -188,6 +196,13 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 + ribbon: ReadTimeout: 300000 diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index 3d4bcd6279..4516fa03e3 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/data-report-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index dd4ade5343..839272531e 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -28,6 +28,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + com.epmet @@ -334,33 +341,34 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml index 8f7e9c61c4..205f7efffa 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL @@ -130,6 +138,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java index 543b3865b3..b3a184947f 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java @@ -17,4 +17,8 @@ public interface DataSourceConstant { String EPMET_HEART="epmetHeart"; String EPMET_POINT = "epmetPoint"; String OPER_CUSTOMIZE="operCustomize"; + /** + * 济南的中间数据库 + */ + String JI_NAN = "jinan"; } diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index a590e95d75..d22092f9ae 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:version_placeholder ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 35c84f863b..9140f9f099 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -22,6 +22,13 @@ com.epmet epmet-commons-mybatis 2.0.0 + + + + org.apache.shardingsphere + sharding-jdbc-spring-boot-starter + + org.springframework.boot @@ -599,104 +606,105 @@ - + epmet_data_statistical EpmEt-db-UsEr - + epmet_gov_org_user EpmEt-db-UsEr - + epmet_gov_issue_user EpmEt-db-UsEr - + epmet_gov_project_user EpmEt-db-UsEr - + epmet_gov_voice_user EpmEt-db-UsEr - + epmet_oper_crm_user EpmEt-db-UsEr - + epmet_resi_group_user EpmEt-db-UsEr - + epmet_user_user EpmEt-db-UsEr - + epmet_data_stats_display_user EpmEt-db-UsEr - + epmet_evaluation_index_user EpmEt-db-UsEr - + epmet_cloud_viewer EpmEtclOUdvIEwEr@w - + epmet_resi_partymember_user EpmEt-db-UsEr - + epmet_heart_user EpmEt-db-UsEr - + epmet_point_user EpmEt-db-UsEr - + epmet_oper_customize_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -722,7 +730,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java index e11ba2d776..f371759d60 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java @@ -94,6 +94,8 @@ public interface BaseReportDao { */ int delAgencyProject(@Param("customerId") String customerId, @Param("dateId") String dateId); + void delAgencyProjectDaily(@Param("customerId") String customerId,@Param("dateIdList")List dateIdList); + /** * @Description 批量新增组织项目数据 * @Param dataList diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java index 1f8fdf806c..9d3158e06b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.List; /** @@ -288,10 +289,22 @@ public class BaseReportServiceImpl implements BaseReportService { @Override public void agencyProject(AgencyProjectFormDTO formDTO) { if (formDTO.getIsFirst()) { - int deleteNum; - do { - deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId()); - } while (deleteNum > NumConstant.ZERO); + // 20220711修改逻辑 +// int deleteNum; +// do { +// deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId()); +// } while (deleteNum > NumConstant.ZERO); + + List dataList = formDTO.getDataList(); + List dateIdList = new ArrayList(); + String customerId = dataList.get(NumConstant.ZERO).getCustomerId(); + for(AgencyProjectFormDTO.DataList d : dataList){ + if(!dateIdList.contains(d.getDateId())){ + dateIdList.add(d.getDateId()); + } + } + baseReportDao.delAgencyProjectDaily(customerId,dateIdList); + } List> partition = ListUtils.partition(formDTO.getDataList(), NumConstant.ONE_HUNDRED); partition.forEach(p -> { diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index ed65817966..f60ad30d00 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ datasource: druid: #MySQL @@ -112,6 +120,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml index 5bd8912385..7f491393ad 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml @@ -364,6 +364,15 @@ LIMIT 1000 + + DELETE FROM fact_agency_project_daily + WHERE customer_id = #{customerId} + AND date_id IN + + #{dateId} + + + INSERT INTO fact_agency_project_daily diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml index 01ed6a408b..56f53548b7 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:version_placeholder ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index e83d67b9d0..25b17e24d5 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -84,6 +84,10 @@ slf4j-log4j12 org.slf4j + + commons-io + commons-io + @@ -122,6 +126,10 @@ spring-security-crypto org.springframework.security + + commons-io + commons-io + @@ -287,19 +295,20 @@ - + epmet_activiti_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml index b39474ad3d..7db04184c5 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index 6e869da5e4..ca4f4c2de4 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/common-service-server:version_placeholder ports: - "8103:8103" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 4fd20dca7f..53f153ae72 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -270,19 +270,20 @@ - + epmet_common_service_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java index 7d2aadcc2d..28fb609191 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java @@ -129,11 +129,13 @@ public class ShowApiServiceImpl implements ShowApiService { try { dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate); if (dayDetailResultDTO == null){ - logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null"); + logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常", currentDate)); + // logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null"); return; } } catch (Exception e) { - logger.error("queryHolidayV2020 exception", e); + // logger.error("queryHolidayV2020 exception", e); + logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常:%s", currentDate, e.getMessage())); return; } List list = calenderDao.selectByDay(currentDate); diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml index 1900bf9009..7d0e8dd471 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -112,6 +122,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml index 8a38624e35..0d38855a4b 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml @@ -125,6 +125,38 @@ dev + + false + + + 8088 + dev + + + + + + epmet_demo_user + EpmEt-db-UsEr + + 0 + 192.168.1.140 + 6379 + 123456 + + true + 192.168.1.140:8848 + 1fecc730-5e6e-464c-aae9-7567944e7936 + + + false + + + true + + + + local true diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml index 59feaf2641..5b6aed6fec 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -31,6 +41,15 @@ spring: url: @spring.datasource.druid.url@ username: @spring.datasource.druid.username@ password: @spring.datasource.druid.password@ + # 数据迁移工具flyway + flyway: + enabled: false + locations: classpath:db/migration + url: + user: + password: + baseline-on-migrate: true + baseline-version: 0 cloud: nacos: discovery: diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml index 403ca1a43d..9d635af0f4 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:version_placeholder ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index 30ff3e0292..e35c3b9862 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -349,19 +349,20 @@ - + epmet_third_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml index be7215c750..03fe99915c 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index 201f47dbf1..3d8acf0e52 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:version_placeholder ports: - "8111:8111" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index f90e54c36b..e8a7f0efe0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -331,19 +331,20 @@ - + epmet_heart_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -364,7 +365,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 true diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 352a8283aa..75a6f2547d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml index 4fe2195446..4c450ae948 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml @@ -333,7 +333,7 @@ AND ( r.DEMAND_USER_NAME = #{keyword} - OR match(r.CONTENT) against (#{keyword} in boolean mode ) + OR r.CONTENT like CONCAT('%',#{keyword},'%') OR s.SERVER_NAME like CONCAT('%',#{keyword},'%') ) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index 202b2bea2e..564c3dd669 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:version_placeholder ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 1e0d00c9ba..34748f1dff 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -262,19 +262,20 @@ - + epmet_job_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java index b1e6673044..2fc300a977 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java @@ -24,11 +24,16 @@ public class WorkDayInitTask implements ITask { @Autowired private WorkDayInitService workDayInitService; + /** + * 定时任务，调用互联网api，插入calender 表数据 + * @param params 参数，多参数使用JSON数据 + */ @Override public void run(String params) { log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params); if (StringUtils.isBlank(params)){ //没有参数默认 初始化明天的 + //params: yyyyMMdd明天的日期 params = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD); } Result result = workDayInitService.workDayInit(params); @@ -38,4 +43,8 @@ public class WorkDayInitTask implements ITask { log.error("{}定时任务执行失败:{},param:{}" ,getClass().getSimpleName(), result.getMsg(), params); } } + + public static void main(String[] args) { + System.out.println(DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE),DateUtils.DATE_PATTERN_YYYYMMDD)); + } } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml index e0cbb99af4..cd7764c4c4 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -117,6 +127,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 600000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 600000 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 0b9082697a..cca15cf7c7 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:version_placeholder ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index e374217adb..118510878c 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -324,19 +324,20 @@ - + epmet_message_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -364,7 +365,7 @@ - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 1f5a8c83bf..9dda1591c0 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/epmet-oss/epmet-oss-client/pom.xml b/epmet-module/epmet-oss/epmet-oss-client/pom.xml index 3b07913b6e..3f4f3057bd 100644 --- a/epmet-module/epmet-oss/epmet-oss-client/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-client/pom.xml @@ -32,6 +32,12 @@ commons-fileupload commons-fileupload 1.3.3 + + + commons-io + commons-io + + net.coobird diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index 8bb390b032..d11e3a50ac 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-oss-server: container_name: epmet-oss-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:version_placeholder ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index 951ea10bce..e2477c17c2 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -55,6 +55,12 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-discovery + + + commons-io + commons-io + + com.alibaba.cloud @@ -85,6 +91,12 @@ com.github.tobato fastdfs-client ${fastdfs.version} + + + commons-io + commons-io + + org.springframework @@ -269,19 +281,20 @@ - + epmet_oss_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml index 334e1e5629..ba1ebd9637 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -123,6 +133,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index bc9be077b5..e7748ed00d 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:version_placeholder ports: - "8112:8112" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index df58cccbef..b26e58aaaf 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -290,19 +290,20 @@ - + epmet_point_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -327,7 +328,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index b3fa3f8fe9..63b721cef6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -112,6 +122,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -147,4 +163,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 247aef82a4..cf36a0293c 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:version_placeholder ports: - "8110:8110" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a70d2ac789..353e5b47bf 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -380,19 +380,20 @@ - + epmet_third_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -420,7 +421,7 @@ + 172.22.76.20:9876;172.22.76.36:9876--> false diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 225c468573..c85863f95f 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml index 6bbd6556a3..812d9fbc60 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:version_placeholder ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index ddeab2c6c4..905d30c100 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -248,19 +248,20 @@ - + epmet_gov_access_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml index 2e3c552976..47479d4410 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml index 65c6a604aa..2653de9ef4 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:version_placeholder ports: - "8097:8097" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index fa921c4400..6d5363b71c 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -234,13 +234,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml index f9d8a3caa6..8ce4eb923f 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: @@ -69,6 +77,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index ff8718a4fc..cf747b3af5 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:version_placeholder ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index db38938089..cf4afd5914 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -303,19 +303,20 @@ - + epmet_gov_issue_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -344,7 +345,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 06332fbf9b..6409f6c5ac 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -110,6 +120,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml index 6acd8cf4d1..853cc5ce03 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:version_placeholder ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 484ae11334..02d3a33905 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -248,13 +248,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml index 0537c64f52..92ab254a90 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: @@ -93,6 +101,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index befef36cf5..e242be2805 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -445,6 +445,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId); } + @Override + public Result> gridStaff(CustomerGridStaffListFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto); + } + /** * 获取房主名下的房屋 * @@ -469,9 +474,4 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "sendEnterprisePatrolRemindMessage", null); } - @Override - public Result> gridStaff(CustomerGridStaffListFormDTO dto) { - return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto); - } - } diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index d8b4065a32..1c8f714edd 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,14 +2,14 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:version_placeholder ports: - "8092:8092" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/prod:/logs" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./gov-org.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./gov-org.jar" restart: "unless-stopped" logging: driver: local @@ -20,4 +20,4 @@ services: resources: limits: cpus: '0.1' - memory: 1100M + memory: 600M diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 2da6b8b8ac..825a4e2213 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -33,11 +33,6 @@ epmet-commons-mybatis 2.0.0 - - com.epmet - epmet-commons-dynamic-datasource - 2.0.0 - com.epmet epmet-oss-client @@ -359,19 +354,30 @@ - + epmet_gov_org_user EpmEt-db-UsEr + + + + epmet_gov_org_user + EpmEt-db-UsEr + + + + epmet_gov_org_user + EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -399,7 +405,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java index 9188b748b7..cf045560bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java @@ -85,6 +85,7 @@ public class EnterpriseExportExcelDTO { @ExcelIgnore private String scale; + @ExcelIgnore private Integer scaleTotal; /** * 规模名称 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index a6702963c4..05be03a65c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -67,6 +67,9 @@ import org.springframework.transaction.annotation.Transactional; import java.lang.reflect.Field; import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.stream.Collectors; @@ -113,6 +116,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl(); } - List list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()); + CompletableFuture> listFuture = CompletableFuture.supplyAsync(()-> baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()),executorService); + //List list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()); + CustomerFormDTO customerFormDTO = new CustomerFormDTO(); customerFormDTO.setCustomerIdList(staffOrgsFormDTO.getCustomerIdList()); - Result> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO); + CompletableFuture>> customerDTOResultFuture = CompletableFuture.supplyAsync(()-> operCrmFeignClient.queryCustomerList(customerFormDTO),executorService); + //Result> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO); + List list = null; + Result> customerDTOResult = null; + try { + list = listFuture.get(10, TimeUnit.SECONDS); + customerDTOResult = customerDTOResultFuture.get(10, TimeUnit.SECONDS); + } catch (Exception e) { + log.error("getStaffOrgList exception",e); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getMsg()); + } List customerDTOList = customerDTOResult.getData(); if (customerDTOResult.success() && customerDTOList.size() > 0) { for (CustomerDTO customer : customerDTOList) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index df84bed116..7f3e68df7f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -111,6 +111,8 @@ public class CustomerGridServiceImpl extends BaseServiceImpl - + epmet_gov_project_user EpmEt-db-UsEr + + + + epmet_gov_project_user + EpmEt-db-UsEr + + + + epmet_gov_project_user + EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml index 22a2f25dc9..d9ef717249 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml @@ -16,11 +16,115 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false +# sharding: +# default-data-source-name: master +# masterslave: +# name: ms +# master-data-source-name: master +# slave-data-source-names: slave1,slave2 +# #配置slave节点的负载均衡均衡策略,采用轮询机制 +# load-balance-algorithm-type: round_robin +# datasource: +# names: master,slave1,slave2 +# master: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave1.url@ +# username: @spring.datasource.slave1.username@ +# password: @spring.datasource.slave1.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave1: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave2.url@ +# username: @spring.datasource.slave2.username@ +# password: @spring.datasource.slave2.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave2: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true datasource: druid: #MySQL @@ -110,6 +214,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index c986d36542..e89abec3fc 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:version_placeholder ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index b841e6f0c8..746921c9a8 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -259,19 +259,20 @@ - + epmet_gov_voice_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml index 352c1d59e4..8c0a41ab0d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -101,6 +111,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index f3a948cd4e..9c466ac47f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:version_placeholder ports: - "8117:8117" network_mode: host # 使用现有网络 diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 1411be9d41..194210540b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -85,6 +85,12 @@ 2.0.0 compile + + com.epmet + epmet-commons-dynamic-datasource + 2.0.0 + compile + @@ -273,19 +279,28 @@ - + epmet_open_data_user - EpmEt-db-UsEr + EpmEtOpEndAtArw_)$ + + + + + + sync_gridinfo_pingyin + xvfuz2lz + 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -303,7 +318,7 @@ callerRunsPolicy - true + false https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c @@ -311,7 +326,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java index 3acc500e59..9ffa2699ce 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java @@ -1,12 +1,14 @@ package com.epmet.opendata.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.StrUtil; +import com.epmet.constant.DataSourceConstant; import com.epmet.dto.basereport.form.EventInfoFormDTO; import com.epmet.dto.basereport.result.EventInfoResultDTO; import com.epmet.dto.screen.EventreportPingyinDTO; @@ -36,6 +38,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@DataSource(DataSourceConstant.JI_NAN) public class EventreportPingyinServiceImpl extends BaseServiceImpl implements EventreportPingyinService { @Resource private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java index 41e42f0d0b..07566d27de 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.opendata.service.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; @@ -7,6 +8,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.DataSourceConstant; import com.epmet.constant.IndexCalConstant; import com.epmet.dto.org.form.GridBaseInfoFormDTO; import com.epmet.dto.org.result.CustomerAgencyDTO; @@ -43,6 +45,7 @@ import java.util.List; */ @Slf4j @Service +@DataSource(DataSourceConstant.JI_NAN) public class GridInfoPingyinServiceImpl extends BaseServiceImpl implements GridInfoPingyinService { @Autowired private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java index 732df55207..14a0ad16b1 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java @@ -1,10 +1,12 @@ package com.epmet.opendata.service.impl; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.DataSourceConstant; import com.epmet.dto.form.CustomerGridStaffListFormDTO; import com.epmet.dto.form.GridStaffUploadtFormDTO; import com.epmet.dto.indexcollect.ScreenPyGridStaffDTO; @@ -39,6 +41,7 @@ import java.util.stream.Collectors; */ @Service @Slf4j +@DataSource(DataSourceConstant.JI_NAN) public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl implements GridstaffInfoPingyinService { @Autowired diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java index 5c554f218d..fb07f00b27 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.opendata.service.impl; import com.alibaba.fastjson.JSON; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -13,6 +14,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.StrUtil; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.constant.DataSourceConstant; import com.epmet.dto.basereport.form.EventInfoFormDTO; import com.epmet.dto.form.patrol.PatrolQueryFormDTO; import com.epmet.dto.result.PatrolRoutineWorkResult; @@ -46,6 +48,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service +@DataSource(DataSourceConstant.JI_NAN) public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl implements GridstaffWorkInfoPingyinService { @Autowired diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 6118195219..6a678b3bea 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -16,11 +16,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -64,6 +74,14 @@ spring: baseline-on-migrate: true baseline-version: 0 +dynamic: + datasource: + jinan: + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.jinan.url@ + username: @datasource.druid.jinan.username@ + password: @datasource.druid.jinan.password@ + management: endpoints: diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml index 36ddc6f222..5a48b98d35 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml @@ -188,7 +188,7 @@ - + diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml index c077d9bce0..9f77029ab2 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:version_placeholder ports: - "8093:8093" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 823111ea48..0cd54f99d4 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -244,19 +244,20 @@ - + epmet_oper_access_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml index 9ed804a4a3..7a5a301ba6 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -112,6 +122,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -142,4 +158,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml index c3f68d4cfd..859d92349f 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/oper-crm-server:version_placeholder ports: - "8090:8090" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index 0df193618f..c6c9ff870a 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -298,19 +298,20 @@ - + epmet_oper_crm_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 856a72c96d..fb26af5f00 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -229,8 +229,24 @@ public class CustomerServiceImpl extends BaseServiceImpl> queryCustomerList(CustomerFormDTO formDTO) { - List customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList()); - return new Result>().ok(customerDTOList); + List result = new ArrayList<>(); + if(formDTO.getCustomerIdList() != null){ + for (String customerId : formDTO.getCustomerIdList()) { + //先从缓存取 取不到从数据库取 + CustomerDTO customerDTO = customerRedis.queryCustomerInfo(customerId); + if (customerDTO == null) { + CustomerEntity customerEntity = baseDao.selectById(customerId); + if (customerEntity != null) { + customerDTO = ConvertUtils.sourceToTarget(customerEntity, CustomerDTO.class); + } + } + if (customerDTO != null) { + result.add(customerDTO); + } + } + //List customerDTOList = baseDao.selectListByIds(formDTO.getCustomerIdList()); + } + return new Result>().ok(result); } @Override diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml index 15bb6eb0be..714c45a95f 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -118,6 +128,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -148,4 +164,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml index 5cb566ad8d..9e8684a720 100644 --- a/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-customize/oper-customize-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-customize-server: container_name: oper-customize-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-customize-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/oper-customize-server:version_placeholder ports: - "8089:8089" network_mode: host # 使用现有网络 diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 218a64eb59..e192727b47 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -299,19 +299,20 @@ - + epmet_oper_customize_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -339,7 +340,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 epmet_message diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 346506fb54..ce28431363 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -19,12 +19,23 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: + druid: #MySQL driver-class-name: com.mysql.cj.jdbc.Driver @@ -112,6 +123,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -146,4 +163,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index e235fed405..c0a15c7212 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-group-server:version_placeholder ports: - "8095:8095" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index b2a6785612..b33d6b2fba 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -344,19 +344,20 @@ - + epmet_resi_group_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -392,7 +393,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index b782d086dc..97348ebc84 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -121,6 +131,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml index b2564ab858..9d907ab3fa 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-guide-server:version_placeholder ports: - "8091:8091" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 19f3f71eb9..555e40874d 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -265,19 +265,20 @@ - + epmet_resi_guide_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml index c8bfca6ee6..6fcb9f365c 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -113,6 +123,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -143,4 +159,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index 92713ea878..1c3ac027c2 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-hall-server:version_placeholder ports: - "8100:8100" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 8ecca5fe37..e71fd79666 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -217,13 +217,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml index 35219270ce..9af98d413e 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml index 5c5adfb604..6313d3fe02 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-home-server:version_placeholder ports: - "8104:8104" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index c4fa8d2560..3690c12f15 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -238,13 +238,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml index 7315ad7080..e7475106f6 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index b8599de420..1f930c2a60 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-mine-server:version_placeholder ports: - "8094:8094" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 8d2ae439e5..574f0dfa6d 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -254,13 +254,14 @@ prod 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml index 60f5366ff8..45ed220213 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: @@ -96,6 +104,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -121,4 +135,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index 0d3e65ba3b..bfffdc26c4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-partymember-server:version_placeholder ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 194ec74de1..80fe8956bc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -332,19 +332,20 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index 751620e91d..e6b1b16aa4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -19,11 +19,21 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false datasource: druid: #MySQL @@ -112,6 +122,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -147,4 +163,4 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml index eea50949fe..cf8795e671 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/resi-voice-server:version_placeholder ports: - "8106:8106" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index f2e494aa7f..503f8e0826 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -217,13 +217,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml index dc2eaa3898..051747d9ca 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/bootstrap.yml @@ -16,11 +16,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: @@ -64,6 +72,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 @@ -89,4 +103,4 @@ thread: queueCapacity: @thread.threadPool.queue-capacity@ keepAliveSeconds: @thread.threadPool.keep-alive-seconds@ threadNamePrefix: @thread.threadPool.thread-name-prefix@ - rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ \ No newline at end of file + rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@ diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml index 68d784d052..aabd780e28 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-openapi-scan:version_placeholder ports: - "8107:8107" network_mode: host # 不会创建新的网络 diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index bd236cc3ee..c5a88fcf4b 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -219,13 +219,14 @@ 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml index 108c714da6..1a9ecfdc59 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/bootstrap.yml @@ -19,11 +19,19 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ cloud: nacos: discovery: @@ -68,6 +76,12 @@ hystrix: isolation: thread: timeoutInMilliseconds: 60000 #缺省为1000 + threadpool: + default: + coreSize: 20 + maximumSize: 50 + maxQueueSize: 500 + queueSizeRejectionThreshold: 200 ribbon: ReadTimeout: 300000 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index c80eab326e..24113d19ec 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -926,6 +926,9 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/icResiUserDataSync/icDataSyncTask") Result icDataSyncTask(String customerId); + @PostMapping("/epmetuser/customerstaff/customerstaff") + Result> customerStaff(@RequestBody GridStaffUploadtFormDTO formDTO); + /** * Desc: 查询是否是超级管理员 * @param userId @@ -944,10 +947,6 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/customerstaff/edittostaff") Result editToStaff(@RequestBody CustomerStaffDTO formDTO); - - @PostMapping("/epmetuser/customerstaff/customerstaff") - Result> customerStaff(@RequestBody GridStaffUploadtFormDTO formDTO); - /** * 居民列表，非动态 * @param input diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 4d3d56b76c..7bf03f5969 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -658,6 +658,11 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "icDataSyncTask", customerId); } + @Override + public Result> customerStaff(GridStaffUploadtFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerStaff", formDTO); + } + @Override public Result getIsRootManager(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIsRootManager", userId); @@ -678,11 +683,6 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editToStaff", formDTO); } - @Override - public Result> customerStaff(GridStaffUploadtFormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "customerStaff", formDTO); - } - @Override public Result> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input); diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index fdc9c6405f..95bdfddd8a 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:version_placeholder + image: 172.22.76.12:5000/epmet-cloud-master/epmet-user-server:version_placeholder ports: - "8087:8087" network_mode: host # 不会创建新的网络 @@ -10,7 +10,7 @@ services: - "/opt/epmet-cloud-logs/prod:/logs" - "/opt/epmet_files/:/opt/epmet_files" environment: - RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./epmet-user.jar" + RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./epmet-user.jar" restart: "unless-stopped" logging: driver: local @@ -21,4 +21,4 @@ services: resources: limits: cpus: '0.1' - memory: 1600M + memory: 1100M diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 831b99e408..db7f0f7c45 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -28,7 +28,7 @@ epmet-commons-mybatis 2.0.0 - - + epmet_user_user EpmEt-db-UsEr + + + + epmet_user_user + EpmEt-db-UsEr + + + + epmet_user_user + EpmEt-db-UsEr 0 - r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com - 6379 - EpmEtclOUdrEdIs!Q2w + 172.22.76.1:6379,172.22.76.20:6379,172.22.76.36:6379,172.22.76.1:6389,172.22.76.20:6389,172.22.76.36:6389 + cluster + 3 + EpmEtclOUdrEdIs@py true - 192.168.11.180:8848 - bd205d23-e696-47be-b995-916313f86e99 + 172.22.76.5:8848 + 762652d0-b22e-4d56-93ed-b012ad735309 false @@ -381,7 +392,7 @@ true - 192.168.11.187:9876;192.168.11.184:9876 + 172.22.76.20:9876;172.22.76.36:9876 true diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java deleted file mode 100644 index 28475b916f..0000000000 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/util/MySequence.java +++ /dev/null @@ -1,214 +0,0 @@ -/* - * Copyright (c) 2011-2021, baomidou (jobob@qq.com). - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.epmet.util; - -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.toolkit.Assert; -import com.baomidou.mybatisplus.core.toolkit.StringPool; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.core.toolkit.SystemClock; -import com.epmet.commons.tools.utils.HttpClientManager; -import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.logging.Log; -import org.apache.ibatis.logging.LogFactory; - -import java.lang.management.ManagementFactory; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.util.concurrent.ThreadLocalRandom; - -/** - * 分布式高效有序 ID 生产黑科技(sequence) - * - *

优化开源项目：https://gitee.com/yu120/sequence

- * - * @author hubin - * @since 2016-08-18 - */ -@Slf4j -public class MySequence { - - private static final Log logger = LogFactory.getLog(MySequence.class); - /** - * 时间起始标记点，作为基准，一般取系统的最近时间（一旦确定不能变动） - */ - private final long twepoch = 1288834974657L; - /** - * 机器标识位数 - */ - private final long workerIdBits = 5L; - private final long datacenterIdBits = 5L; - private final long maxWorkerId = -1L ^ (-1L << workerIdBits); - private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits); - /** - * 毫秒内自增位 - */ - private final long sequenceBits = 12L; - private final long workerIdShift = sequenceBits; - private final long datacenterIdShift = sequenceBits + workerIdBits; - /** - * 时间戳左移动位 - */ - private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits; - private final long sequenceMask = -1L ^ (-1L << sequenceBits); - - private final long workerId; - - /** - * 数据标识 ID 部分 - */ - private final long datacenterId; - /** - * 并发控制 - */ - private long sequence = 0L; - /** - * 上次生产 ID 时间戳 - */ - private long lastTimestamp = -1L; - - public MySequence() { - this.datacenterId = getDatacenterId(maxDatacenterId); - this.workerId = getMaxWorkerId(datacenterId, maxWorkerId); - String msg = "MySequence datacenterId:" + this.datacenterId + ";workerId:" + this.workerId; - log.info(msg); - HttpClientManager.getInstance().sendAlarmMsg(msg); - } - - /** - * 有参构造器 - * - * @param workerId 工作机器 ID - * @param datacenterId 序列号 - */ - public MySequence(long workerId, long datacenterId) { - Assert.isFalse(workerId > maxWorkerId || workerId < 0, - String.format("MySequence worker Id can't be greater than %d or less than 0", maxWorkerId)); - Assert.isFalse(datacenterId > maxDatacenterId || datacenterId < 0, - String.format("MySequence datacenter Id can't be greater than %d or less than 0", maxDatacenterId)); - this.workerId = workerId; - this.datacenterId = datacenterId; - } - - /** - * 获取 maxWorkerId - */ - protected static long getMaxWorkerId(long datacenterId, long maxWorkerId) { - StringBuilder mpid = new StringBuilder(); - mpid.append(datacenterId); - String name = ManagementFactory.getRuntimeMXBean().getName(); - String msg = "MySequence getMaxWorkerId name:" + name; - log.info(msg); - HttpClientManager.getInstance().sendAlarmMsg(msg); - if (StringUtils.isNotBlank(name)) { - /* - * GET jvmPid - */ - mpid.append(name.split(StringPool.AT)[0]); - } - /* - * MAC + PID 的 hashcode 获取16个低位 - */ - return (mpid.toString().hashCode() & 0xffff) % (maxWorkerId + 1); - } - - /** - * 数据标识id部分 - */ - protected static long getDatacenterId(long maxDatacenterId) { - long id = 0L; - try { - InetAddress ip = InetAddress.getLocalHost(); - NetworkInterface network = NetworkInterface.getByInetAddress(ip); - String msg = "MySequence ip:" + JSON.toJSONString(ip) + ";network: " + JSON.toJSONString(network); - log.info(msg); - HttpClientManager.getInstance().sendAlarmMsg(msg); - if (network == null) { - id = 1L; - log.info("MySequen cenetwork ==null "); - } else { - byte[] mac = network.getHardwareAddress(); - if (null != mac) { - id = ((0x000000FF & (long) mac[mac.length - 2]) | (0x0000FF00 & (((long) mac[mac.length - 1]) << 8))) >> 6; - id = id % (maxDatacenterId + 1); - } - } - } catch (Exception e) { - logger.warn(" getDatacenterId: " + e.getMessage()); - } - return id; - } - - /** - * 获取下一个 ID - * - * @return 下一个 ID - */ - public synchronized long nextId() { - long timestamp = timeGen(); - //闰秒 - if (timestamp < lastTimestamp) { - long offset = lastTimestamp - timestamp; - if (offset <= 5) { - try { - wait(offset << 1); - timestamp = timeGen(); - if (timestamp < lastTimestamp) { - throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", offset)); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } else { - throw new RuntimeException(String.format("Clock moved backwards. Refusing to generate id for %d milliseconds", offset)); - } - } - - if (lastTimestamp == timestamp) { - // 相同毫秒内，序列号自增 - sequence = (sequence + 1) & sequenceMask; - if (sequence == 0) { - // 同一毫秒的序列数已经达到最大 - timestamp = tilNextMillis(lastTimestamp); - } - } else { - // 不同毫秒内，序列号置为 1 - 3 随机数 - sequence = ThreadLocalRandom.current().nextLong(1, 3); - } - - lastTimestamp = timestamp; - - // 时间戳部分 | 数据中心部分 | 机器标识部分 | 序列号部分 - return ((timestamp - twepoch) << timestampLeftShift) - | (datacenterId << datacenterIdShift) - | (workerId << workerIdShift) - | sequence; - } - - protected long tilNextMillis(long lastTimestamp) { - long timestamp = timeGen(); - while (timestamp <= lastTimestamp) { - timestamp = timeGen(); - } - return timestamp; - } - - protected long timeGen() { - return SystemClock.now(); - } - -} - diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index a9ff79fb01..120849ca0e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -19,11 +19,115 @@ spring: time-zone: GMT+8 date-format: yyyy-MM-dd HH:mm:ss redis: + # 平阴cluster模式下使用cluster:配置段 + # database: @spring.redis.index@ + # host: @spring.redis.host@ + # port: @spring.redis.port@ + # password: @spring.redis.password@ + # timeout: 30s + database: @spring.redis.index@ - host: @spring.redis.host@ - port: @spring.redis.port@ password: @spring.redis.password@ timeout: 30s + cluster: + nodes: @spring.redis.cluster.nodes@ + max-redirects: @spring.redis.cluster.max-redirects@ + shardingsphere: + enabled: false +# sharding: +# default-data-source-name: master +# masterslave: +# name: ms +# master-data-source-name: master +# slave-data-source-names: slave1,slave2 +# #配置slave节点的负载均衡均衡策略,采用轮询机制 +# load-balance-algorithm-type: round_robin +# datasource: +# names: master,slave1,slave2 +# master: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.druid.url@ +# username: @spring.datasource.druid.username@ +# password: @spring.datasource.druid.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave1: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave1.url@ +# username: @spring.datasource.slave1.username@ +# password: @spring.datasource.slave1.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true +# slave2: +# #MySQL +# type: com.alibaba.druid.pool.DruidDataSource +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: @spring.datasource.slave2.url@ +# username: @spring.datasource.slave2.username@ +# password: @spring.datasource.slave2.password@ +# initial-size: 10 +# max-active: 100 +# min-idle: 10 +# max-wait: 60000 +# pool-prepared-statements: true +# max-pool-prepared-statement-per-connection-size: 20 +# time-between-eviction-runs-millis: 60000 +# min-evictable-idle-time-millis: 300000 +# #Oracle需要打开注释 +# #validation-query: SELECT 1 FROM DUAL +# test-while-idle: true +# test-on-borrow: false +# test-on-return: false +# filter: +# stat: +# log-slow-sql: false +# slow-sql-millis: 1000 +# merge-sql: false +# wall: +# config: +# multi-statement-allow: true datasource: druid: #MySQL @@ -122,9 +226,6 @@ mybatis-plus: field-strategy: NOT_NULL #驼峰下划线转换 column-underline: true - worker-id: ${random.int(1,31)} - datacenter-id: ${random.int(1,31)} - banner: false #原生配置 configuration: diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index bed43d0aa6..f42cd61546 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -231,14 +231,13 @@ diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index b3e82440ef..3a65fd24e9 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,9 +130,9 @@ - + - and ${subCondition.tableName}.${colValue} ='1' + ${subCondition.tableName}.${colValue} ='1'