回滚

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: 172.22.76.12:5000/epmet-cloud-master/epmet-admin-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:version_placeholder
     ports:
       - "8082:8082"
     network_mode: host # 使用现有网络

epmet-admin/epmet-admin-server/pom.xml

@@ -254,20 +254,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_admin_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -280,7 +279,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
 
                 <!--线程池-->

epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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
@@ -136,12 +126,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000
@@ -166,4 +150,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@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@

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: 172.22.76.12:5000/epmet-cloud-master/epmet-auth:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:version_placeholder
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/pom.xml

@@ -376,14 +376,13 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-auth/src/main/java/com/epmet/controller/ThirdLoginController.java

@@ -108,7 +108,7 @@ public class ThirdLoginController {
      **/
     @PostMapping(value = "/getmyorgbyaccount")
     public Result<List<StaffOrgsResultDTO>> getMyOrgByAccount(@RequestBody ThirdStaffOrgByAccountFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO);
+        ValidatorUtils.validateEntity(formDTO, StaffOrgByAccountFormDTO.AddUserShowGroup.class, StaffOrgByAccountFormDTO.GetMyOrgByPassWordGroup.class);
         List<StaffOrgsResultDTO> staffOrgs = thirdLoginService.getMyOrgByAccount(formDTO);
         return new Result<List<StaffOrgsResultDTO>>().ok(staffOrgs);
     }

epmet-auth/src/main/java/com/epmet/dto/form/ThirdStaffOrgByAccountFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -12,20 +13,36 @@ 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不能为空")
+    @NotBlank(message = "appId不能为空", groups = {AddUserShowGroup.class})
     private String appId;
 
     /**
      * 手机号
      */
-    @NotBlank(message = "账号不能为空")
+    @NotBlank(message = "账号不能为空", groups = {AddUserShowGroup.class})
     private String userAccount;
 
-    @NotBlank(message = "密码不能为空")
+    /**
+     * 验证码
+     */
+    @NotBlank(message="验证码不能为空", groups = {GetMyOrgByLoginWxmp.class})
+    private String smsCode;
+
+    @NotBlank(message = "密码不能为空",groups ={GetMyOrgByPassWordGroup.class})
     private String password;
 }
 

epmet-auth/src/main/java/com/epmet/service/impl/ThirdLoginServiceImpl.java

@@ -19,8 +19,6 @@ 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;
@@ -91,8 +89,6 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
     @Autowired
     private LoginUserUtil loginUserUtil;
     @Autowired
-    private RedisUtils redisUtils;
-    @Autowired
     private DingTalkClientToken dingTalkClientToken;
     @Autowired
     private DingTalkClientUser dingTalkClientUser;
@@ -648,42 +644,11 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
                 result.getMsg()));
         return new ArrayList<>();
     }
-    //临时解决方案
+
-    private static final  List<StaffOrgsResultDTO> resultTemp = new ArrayList<>();
-     static {
-         StaffOrgsResultDTO t = new StaffOrgsResultDTO();
-         t.setRootAgencyId("53613e1c5de6ed473467f0159a10b135");
-         t.setRootAgencyName("平阴县");
-         t.setCustomerId("6f203e30de1a65aab7e69c058826cd80");
-         t.setCustomerName("平音");
-         resultTemp.add(t);
-    }
     @Override
     public List<StaffOrgsResultDTO> 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();
@@ -694,31 +659,30 @@ 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<CustomerStaffDTO> customerStaffList=customerStaffResult.getData();
-        if (CollectionUtils.isEmpty(customerStaffList)){
-            throw new EpmetException(EpmetErrorCode.GOV_STAFF_ACCOUNT_NOT_EXISTS.getCode());
-        }
         //3、查询用户所有的组织信息
         List<String> customerIdList = new ArrayList<>();
         //是否设置过密码
         boolean havePasswordFlag=false;
         //密码是否正确
         boolean passwordRightFlag=false;
-        CustomerStaffDTO customerStaffDTO = customerStaffList.get(0);
+        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()));
 
-        if (StringUtils.isNotBlank(customerStaffDTO.getPassword())) {
+            }else{
-            havePasswordFlag = true;
+                logger.warn(String.format("当前用户:账户%s,客户Id%s密码匹配正确.",formDTO.getUserAccount(),customerStaffDTO.getCustomerId()));
-        }
+                passwordRightFlag=true;
-        long start2 = System.currentTimeMillis();
+                customerIdList.add(customerStaffDTO.getCustomerId());
-        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()));
@@ -729,27 +693,11 @@ 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<StaffOrgsResultDTO> redisTemp = (List<StaffOrgsResultDTO>)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<List<StaffOrgsResultDTO>> result = govOrgOpenFeignClient.getStaffOrgList(staffOrgFormDTO);
         if(result.success()&&null!=result.getData()){
-            List<StaffOrgsResultDTO> data = result.getData();
+            return 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,
@@ -766,11 +714,6 @@ 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);
@@ -786,9 +729,8 @@ public class ThirdLoginServiceImpl implements ThirdLoginService, ResultDataResol
         Object PublicCustomerResultDTO = mapToResult.getData();
         JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
         Map<String,Object> map = (Map)json.get("customer");
-        customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
+        PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
         logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->"+customer);
-        redisUtils.set(redisKey,customer);
         return customer;
     }
 

epmet-auth/src/main/resources/bootstrap.yml

@@ -19,19 +19,11 @@ 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:
@@ -91,12 +83,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000
@@ -161,8 +147,7 @@ thirdplat:
     appkey: @thirdplat.jcet.g.appkey@
     appsecret: @thirdplat.jcet.g.appsecret@
   pyld:
-    domain: https://epmet-cloud-pingyin.elinkservice.cn/platform
+    domain: https://epmet-ext1.pingyin.gov.cn/platform
-#    domain: https://epmet-ext1.pingyin.gov.cn/platform
     appId: 7a5aec009ba4eba8e254ee64fe3775e1
     appKey: 14faef9af508d1c253b720ea5a43f9de
     appSecret: 38e7c2604c8dd33c445705d25eebbfc12a2f7ed8a87111e9e10a40312d3a1595
@@ -185,4 +170,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@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@

epmet-commons/epmet-commons-mybatis/pom.xml

@@ -70,12 +70,6 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
             <version>1.2.12</version>
         </dependency>
-        <!--读写分离-->
-        <dependency>
-            <groupId>org.apache.shardingsphere</groupId>
-            <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-            <version>4.0.0-RC1</version>
-        </dependency>
 
         <!--flyway 数据库迁移工具-->
         <dependency>

epmet-commons/epmet-commons-tools/pom.xml

@@ -75,12 +75,6 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>${commons.fileupload.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/config/RedissonConfig.java

@@ -25,10 +25,6 @@ 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
@@ -45,17 +41,10 @@ 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().setAddress("redis://".concat(host).concat(StrConstant.COLON).concat(port));
+            config.useSingleServer().setConnectTimeout(NumConstant.ONE_THOUSAND * NumConstant.FIVE);
-            //config.useSingleServer().setPassword(password);
+            config.useSingleServer().setDatabase(NumConstant.TEN);
-            //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);
@@ -64,19 +53,4 @@ 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;
-    }
 }

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-pingyin.elinkservice.cn/api/"),
+	PROD("prod", "生产环境", "https://epmet-cloud.elinkservice.cn/api/"),
 	UN_KNOWN("un_known", "未知", "https://epmet-dev.elinkservice.cn/api/"),
 	;
 

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java

@@ -888,25 +888,6 @@ 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

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 static final Pattern BCRYPT_PATTERN = Pattern
+	private 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);
 	}

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: 172.22.76.12:5000/epmet-cloud-master/epmet-gateway:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:version_placeholder
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -507,14 +507,13 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-gateway/src/main/resources/bootstrap.yml

@@ -18,19 +18,11 @@ 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:
@@ -477,12 +469,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/data-aggregator-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:version_placeholder
     ports:
       - "8114:8114"
     network_mode: host # 使用现有网络

epmet-module/data-aggregator/data-aggregator-server/pom.xml

@@ -32,13 +32,6 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
-            <!--排除主从-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.shardingsphere</groupId>
-                    <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
@@ -625,63 +618,63 @@
 
                 <!--gov-org -->
                 <datasource.druid.govorg.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govorg.url>
                 <datasource.druid.govorg.username>epmet_gov_org_user</datasource.druid.govorg.username>
                 <datasource.druid.govorg.password>EpmEt-db-UsEr</datasource.druid.govorg.password>
 
                 <!-- govissue -->
                 <datasource.druid.govissue.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govissue.url>
                 <datasource.druid.govissue.username>epmet_gov_issue_user</datasource.druid.govissue.username>
                 <datasource.druid.govissue.password>EpmEt-db-UsEr</datasource.druid.govissue.password>
 
                 <!-- gov-project -->
                 <datasource.druid.govproject.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.govproject.url>
                 <datasource.druid.govproject.username>epmet_gov_project_user</datasource.druid.govproject.username>
                 <datasource.druid.govproject.password>EpmEt-db-UsEr</datasource.druid.govproject.password>
 
                 <!-- resi-group -->
                 <datasource.druid.resigroup.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.resigroup.url>
                 <datasource.druid.resigroup.username>epmet_resi_group_user</datasource.druid.resigroup.username>
                 <datasource.druid.resigroup.password>EpmEt-db-UsEr</datasource.druid.resigroup.password>
 
                 <!-- epmet-user -->
                 <datasource.druid.epmetuser.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetuser.url>
                 <datasource.druid.epmetuser.username>epmet_user_user</datasource.druid.epmetuser.username>
                 <datasource.druid.epmetuser.password>EpmEt-db-UsEr</datasource.druid.epmetuser.password>
 
                 <!--  epmet_common_service-->
                 <datasource.druid.commonservice.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.commonservice.url>
                 <datasource.druid.commonservice.username>epmet_common_service_user</datasource.druid.commonservice.username>
                 <datasource.druid.commonservice.password>EpmEt-db-UsEr</datasource.druid.commonservice.password>
 
                 <!-- opercrm-->
                 <datasource.druid.opercrm.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercrm.url>
                 <datasource.druid.opercrm.username>epmet_oper_crm_user</datasource.druid.opercrm.username>
                 <datasource.druid.opercrm.password>EpmEt-db-UsEr</datasource.druid.opercrm.password>
 
                 <!-- data_statistical -->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <!-- epmet_evaluation_index -->
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
@@ -693,49 +686,48 @@
                 <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.opercustomize.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
                 <datasource.druid.opercustomize.username>epmet_oper_customize_user</datasource.druid.opercustomize.username>
                 <datasource.druid.opercustomize.password>EpmEt-db-UsEr</datasource.druid.opercustomize.password>
 
                 <datasource.druid.epmetmessage.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetmessage.url>
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
                 <!-- 问卷调查 -->
                 <datasource.druid.epmettduck.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmettduck.url>
                 <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
                 <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
 
                 <!--heart-->
                 <datasource.druid.heart.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.heart.url>
                 <datasource.druid.heart.username>epmet_heart_user</datasource.druid.heart.username>
                 <datasource.druid.heart.password>EpmEt-db-UsEr</datasource.druid.heart.password>
 
                 <!--epmet_resi_partymember-->
                 <datasource.druid.partymember.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partymember.url>
                 <datasource.druid.partymember.username>epmet_resi_partymember_user</datasource.druid.partymember.username>
                 <datasource.druid.partymember.password>EpmEt-db-UsEr</datasource.druid.partymember.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml

@@ -10,19 +10,11 @@ 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:
@@ -196,13 +188,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
-
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/data-report-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:version_placeholder
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-report/data-report-server/pom.xml

@@ -28,13 +28,6 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
-            <!--排除主从-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.shardingsphere</groupId>
-                    <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
@@ -341,34 +334,33 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
                 <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
 
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/data-report/data-report-server/src/main/resources/bootstrap.yml

@@ -16,19 +16,11 @@ 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
@@ -138,12 +130,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java

@@ -17,8 +17,4 @@ public interface DataSourceConstant {
     String EPMET_HEART="epmetHeart";
     String EPMET_POINT = "epmetPoint";
     String OPER_CUSTOMIZE="operCustomize";
-    /**
-     * 济南的中间数据库
-     */
-    String JI_NAN = "jinan";
 }

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: 172.22.76.12:5000/epmet-cloud-master/data-statistical-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:version_placeholder
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络

epmet-module/data-statistical/data-statistical-server/pom.xml

@@ -22,13 +22,6 @@
             <groupId>com.epmet</groupId>
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
-            <!--排除主从-->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.shardingsphere</groupId>
-                    <artifactId>sharding-jdbc-spring-boot-starter</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -606,105 +599,104 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.stats.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.stats.url>
                 <datasource.druid.stats.username>epmet_data_statistical</datasource.druid.stats.username>
                 <datasource.druid.stats.password>EpmEt-db-UsEr</datasource.druid.stats.password>
 
                 <datasource.druid.org.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.org.url>
                 <datasource.druid.org.username>epmet_gov_org_user</datasource.druid.org.username>
                 <datasource.druid.org.password>EpmEt-db-UsEr</datasource.druid.org.password>
 
                 <datasource.druid.issue.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.issue.url>
                 <datasource.druid.issue.username>epmet_gov_issue_user</datasource.druid.issue.username>
                 <datasource.druid.issue.password>EpmEt-db-UsEr</datasource.druid.issue.password>
 
                 <datasource.druid.project.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.project.url>
                 <datasource.druid.project.username>epmet_gov_project_user</datasource.druid.project.username>
                 <datasource.druid.project.password>EpmEt-db-UsEr</datasource.druid.project.password>
 
                 <datasource.druid.voice.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.voice.url>
                 <datasource.druid.voice.username>epmet_gov_voice_user</datasource.druid.voice.username>
                 <datasource.druid.voice.password>EpmEt-db-UsEr</datasource.druid.voice.password>
 
                 <datasource.druid.crm.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_crm?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.crm.url>
                 <datasource.druid.crm.username>epmet_oper_crm_user</datasource.druid.crm.username>
                 <datasource.druid.crm.password>EpmEt-db-UsEr</datasource.druid.crm.password>
 
                 <datasource.druid.group.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_group?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.group.url>
                 <datasource.druid.group.username>epmet_resi_group_user</datasource.druid.group.username>
                 <datasource.druid.group.password>EpmEt-db-UsEr</datasource.druid.group.password>
 
                 <datasource.druid.user.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_user?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.user.url>
                 <datasource.druid.user.username>epmet_user_user</datasource.druid.user.username>
                 <datasource.druid.user.password>EpmEt-db-UsEr</datasource.druid.user.password>
 
                 <datasource.druid.statsdisplay.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_data_statistical_display?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.statsdisplay.url>
                 <datasource.druid.statsdisplay.username>epmet_data_stats_display_user</datasource.druid.statsdisplay.username>
                 <datasource.druid.statsdisplay.password>EpmEt-db-UsEr</datasource.druid.statsdisplay.password>
 
                 <datasource.druid.evaluationIndex.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex.url>
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
                 <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.evaluationIndex1.url>
                 <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
                 <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
 
                 <datasource.druid.partyMember.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_resi_partymember?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.partyMember.url>
                 <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
                 <datasource.druid.epmetHeart.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetHeart.url>
                 <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <datasource.druid.epmetPoint.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.epmetPoint.url>
                 <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
                 <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.password>
 
                 <datasource.druid.operCustomize.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.operCustomize.url>
                 <datasource.druid.operCustomize.username>epmet_oper_customize_user</datasource.druid.operCustomize.username>
                 <datasource.druid.operCustomize.password>EpmEt-db-UsEr</datasource.druid.operCustomize.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -730,7 +722,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java

@@ -94,8 +94,6 @@ public interface BaseReportDao {
      */
     int delAgencyProject(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
-    void delAgencyProjectDaily(@Param("customerId") String customerId,@Param("dateIdList")List<String> dateIdList);
-
     /**
      * @Description  批量新增组织项目数据
      * @Param dataList

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java

@@ -11,7 +11,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -289,22 +288,10 @@ public class BaseReportServiceImpl implements BaseReportService {
     @Override
     public void agencyProject(AgencyProjectFormDTO formDTO) {
         if (formDTO.getIsFirst()) {
-            // 20220711修改逻辑
+            int deleteNum;
-//            int deleteNum;
+            do {
-//            do {
+                deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId());
-//                deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId());
+            } while (deleteNum > NumConstant.ZERO);
-//            } while (deleteNum > NumConstant.ZERO);
-
-            List<AgencyProjectFormDTO.DataList> dataList = formDTO.getDataList();
-            List<String> dateIdList = new ArrayList<String>();
-            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<List<AgencyProjectFormDTO.DataList>> partition = ListUtils.partition(formDTO.getDataList(), NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml

@@ -16,19 +16,11 @@ 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
@@ -120,12 +112,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml

@@ -364,15 +364,6 @@
           LIMIT 1000
     </delete>
 
-    <delete id="delAgencyProjectDaily">
-        DELETE FROM fact_agency_project_daily
-        WHERE customer_id = #{customerId}
-        AND date_id IN
-        <foreach collection="dateIdList" index="index" item="dateId" open="(" separator="," close=")">
-            #{dateId}
-        </foreach>
-    </delete>
-
     <!-- 批量新增组织项目数据 -->
     <insert id="insertAgencyProject">
         INSERT INTO fact_agency_project_daily

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: 172.22.76.12:5000/epmet-cloud-master/epmet-activiti-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:version_placeholder
     ports:
       - "8086:8086"
     network_mode: host # 使用现有网络

epmet-module/epmet-activiti/epmet-activiti-server/pom.xml

@@ -84,10 +84,6 @@
                     <artifactId>slf4j-log4j12</artifactId>
                     <groupId>org.slf4j</groupId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -126,10 +122,6 @@
                     <artifactId>spring-security-crypto</artifactId>
                     <groupId>org.springframework.security</groupId>
                 </exclusion>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
         <!-- 替换Feign原生httpclient -->
@@ -295,20 +287,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_activiti?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_activiti_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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

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: 172.22.76.12:5000/epmet-cloud-master/common-service-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:version_placeholder
     ports:
       - "8103:8103"
     network_mode: host # 使用现有网络

epmet-module/epmet-common-service/common-service-server/pom.xml

@@ -270,20 +270,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_common_service?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_common_service_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/service/impl/ShowApiServiceImpl.java

@@ -129,13 +129,11 @@ public class ShowApiServiceImpl implements ShowApiService {
         try {
             dayDetailResultDTO = ShowApiUtil.queryHolidayV2020(currentDate);
             if (dayDetailResultDTO == null){
-                logger.error(String.format("workDayInitTask 获取(%s)工作日接口异常", currentDate));
+                logger.warn("initWorkDay howApiUtil.queryHolidayV2020 return null");
-                // 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<CalenderEntity> list = calenderDao.selectByDay(currentDate);

epmet-module/epmet-common-service/common-service-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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
@@ -122,12 +112,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

epmet-module/epmet-demo/epmet-demo-server/pom.xml

@@ -125,38 +125,6 @@
     <profiles>
         <profile>
             <id>dev</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <properties>
-                <server.port>8088</server.port>
-                <spring.profiles.active>dev</spring.profiles.active>
-
-                <!-- 数据库配置-->
-                <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_demo?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.druid.url>
-                <spring.datasource.druid.username>epmet_demo_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-                <!-- redis配置 -->
-                <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>192.168.1.140</spring.redis.host>
-                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.password>123456</spring.redis.password>
-                <!-- nacos -->
-                <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>192.168.1.140:8848</nacos.server-addr>
-                <nacos.discovery.namespace>1fecc730-5e6e-464c-aae9-7567944e7936</nacos.discovery.namespace>
-                <nacos.config.namespace></nacos.config.namespace>
-                <nacos.config.group></nacos.config.group>
-                <nacos.config-enabled>false</nacos.config-enabled>
-                <nacos.ip/>
-                <!--是否开启服务列表变更监听-->
-                <nacos.service-list-changed-listening.enable>true</nacos.service-list-changed-listening.enable>
-            </properties>
-        </profile>
-        <profile>
-            <id>local</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>

epmet-module/epmet-demo/epmet-demo-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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
@@ -41,15 +31,6 @@ 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:

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: 172.22.76.12:5000/epmet-cloud-master/epmet-ext-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:version_placeholder
     ports:
       - "8113:8113"
     network_mode: host # 使用现有网络

epmet-module/epmet-ext/epmet-ext-server/pom.xml

@@ -349,20 +349,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/epmet-ext/epmet-ext-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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

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: 172.22.76.12:5000/epmet-cloud-master/epmet-heart-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:version_placeholder
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -331,20 +331,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_heart_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -365,7 +364,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
 
                 <!--线程池-->
                 <thread.threadPool.enable-customize>true</thread.threadPool.enable-customize>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcUserDemandRecDao.xml

@@ -333,7 +333,7 @@
         <if test="null != keyword and keyword != ''">
             AND (
                 r.DEMAND_USER_NAME = #{keyword}
-                OR r.CONTENT like CONCAT('%',#{keyword},'%')
+                OR match(r.CONTENT) against (#{keyword} in boolean mode )
                 OR s.SERVER_NAME like CONCAT('%',#{keyword},'%')
             )
         </if>

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: 172.22.76.12:5000/epmet-cloud-master/epmet-job-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:version_placeholder
     ports:
       - "8084:8084"
     network_mode: host # 使用现有网络

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -262,20 +262,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_job?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_job_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java

@@ -24,16 +24,11 @@ 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);
@@ -43,8 +38,4 @@ 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));
-	}
 }

epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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
@@ -127,12 +117,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 600000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 600000

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: 172.22.76.12:5000/epmet-cloud-master/epmet-message-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:version_placeholder
     ports:
       - "8085:8085"
     network_mode: host # 使用现有网络

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -324,20 +324,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_message_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -365,7 +364,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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

epmet-module/epmet-oss/epmet-oss-client/pom.xml

@@ -32,12 +32,6 @@
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.3.3</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>net.coobird</groupId>

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: 172.22.76.12:5000/epmet-cloud-master/epmet-oss-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:version_placeholder
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -55,12 +55,6 @@
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -91,12 +85,6 @@
             <groupId>com.github.tobato</groupId>
             <artifactId>fastdfs-client</artifactId>
             <version>${fastdfs.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-io</groupId>
-                    <artifactId>commons-io</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -281,20 +269,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oss_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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
@@ -133,12 +123,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/epmet-point-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:version_placeholder
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -290,20 +290,19 @@
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.url>
                 <datasource.druid.username>epmet_point_user</datasource.druid.username>
                 <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -328,7 +327,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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
@@ -122,12 +112,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000
@@ -163,4 +147,4 @@ shutdown:
 
 rocketmq:
   enable: @rocketmq.enable@
-  name-server: @rocketmq.nameserver@
+  name-server: @rocketmq.nameserver@

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: 172.22.76.12:5000/epmet-cloud-master/epmet-third-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:version_placeholder
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -380,20 +380,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_third?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_third_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -421,7 +420,7 @@
 
                 <!-- epmet-cloud内部用的rocketmq配置 -->
                 <!--<rocketmq.epmet-cloud-inner.enable>true</rocketmq.epmet-cloud-inner.enable>
-                <rocketmq.epmet-cloud-inner.name-server>172.22.76.20:9876;172.22.76.36:9876</rocketmq.epmet-cloud-inner.name-server>-->
+                <rocketmq.epmet-cloud-inner.name-server>192.168.11.187:9876;192.168.11.184:9876</rocketmq.epmet-cloud-inner.name-server>-->
 
                 <!-- 区块链用的rocketmq配置 -->
                 <rocketmq.block-chain.enable>false</rocketmq.block-chain.enable>

epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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

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: 172.22.76.12:5000/epmet-cloud-master/gov-access-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:version_placeholder
     ports:
       - "8099:8099"
     network_mode: host # 使用现有网络

epmet-module/gov-access/gov-access-server/pom.xml

@@ -248,20 +248,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_access_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/gov-access/gov-access-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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

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: 172.22.76.12:5000/epmet-cloud-master/gov-grid-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:version_placeholder
     ports:
       - "8097:8097"
     network_mode: host # 使用现有网络

epmet-module/gov-grid/gov-grid-server/pom.xml

@@ -234,14 +234,13 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/gov-grid/gov-grid-server/src/main/resources/bootstrap.yml

@@ -19,19 +19,11 @@ 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:
@@ -77,12 +69,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/gov-issue-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:version_placeholder
     ports:
       - "8101:8101"
     network_mode: host # 使用现有网络

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -303,20 +303,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_issue?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_issue_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -345,7 +344,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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
@@ -120,12 +110,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/gov-mine-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:version_placeholder
     ports:
       - "8098:8098"
     network_mode: host # 使用现有网络

epmet-module/gov-mine/gov-mine-server/pom.xml

@@ -248,14 +248,13 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/gov-mine/gov-mine-server/src/main/resources/bootstrap.yml

@@ -16,19 +16,11 @@ 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:
@@ -101,12 +93,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -445,11 +445,6 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "dictInit", customerId);
     }
 
-    @Override
-    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto);
-    }
-
     /**
      * 获取房主名下的房屋
      *
@@ -474,4 +469,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "sendEnterprisePatrolRemindMessage", null);
     }
 
+    @Override
+    public Result<List<CustomerGridStaffListResultDTO>> gridStaff(CustomerGridStaffListFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto);
+    }
+
 }

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: 172.22.76.12:5000/epmet-cloud-master/gov-org-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/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 -Xmx512m -jar ./gov-org.jar"
+      RUN_INSTRUCT: "java -Xms256m -Xmx1024m -jar ./gov-org.jar"
     restart: "unless-stopped"
     logging:
       driver: local
@@ -20,4 +20,4 @@ services:
       resources:
         limits:
           cpus: '0.1'
-          memory: 600M
+          memory: 1100M

epmet-module/gov-org/gov-org-server/pom.xml

@@ -33,6 +33,11 @@
             <artifactId>epmet-commons-mybatis</artifactId>
             <version>2.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-commons-dynamic-datasource</artifactId>
+            <version>2.0.0</version>
+        </dependency>
         <dependency>
             <groupId>com.epmet</groupId>
             <artifactId>epmet-oss-client</artifactId>
@@ -354,30 +359,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_org_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-                <spring.datasource.slave1.url>
-                    <![CDATA[jdbc:mysql://172.22.76.25:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.slave1.url>
-                <spring.datasource.slave1.username>epmet_gov_org_user</spring.datasource.slave1.username>
-                <spring.datasource.slave1.password>EpmEt-db-UsEr</spring.datasource.slave1.password>
-                <spring.datasource.slave2.url>
-                    <![CDATA[jdbc:mysql://172.22.76.26:3306/epmet_gov_org?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.slave2.url>
-                <spring.datasource.slave2.username>epmet_gov_org_user</spring.datasource.slave2.username>
-                <spring.datasource.slave2.password>EpmEt-db-UsEr</spring.datasource.slave2.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -405,7 +399,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/EnterpriseExportExcelDTO.java

@@ -85,7 +85,6 @@ public class EnterpriseExportExcelDTO {
     @ExcelIgnore
     private String scale;
 
-    @ExcelIgnore
     private Integer scaleTotal;
     /**
      * 规模名称

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java

@@ -67,9 +67,6 @@ 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;
 
@@ -116,8 +113,6 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
     private IcBuildingUnitDao icBuildingUnitDao;
     @Autowired
     private IcHouseDao icHouseDao;
-    @Autowired
-    private ExecutorService executorService;
 
 
     @Override
@@ -177,22 +172,10 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl<CustomerAgencyDao
         if (null == staffOrgsFormDTO || staffOrgsFormDTO.getCustomerIdList().size() == 0) {
             return new Result<>();
         }
-        CompletableFuture<List<StaffOrgsResultDTO>> listFuture = CompletableFuture.supplyAsync(()-> baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList()),executorService);
+        List<StaffOrgsResultDTO> list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList());
-        //List<StaffOrgsResultDTO> list = baseDao.selectStaffOrgList(staffOrgsFormDTO.getCustomerIdList());
-
         CustomerFormDTO customerFormDTO = new CustomerFormDTO();
         customerFormDTO.setCustomerIdList(staffOrgsFormDTO.getCustomerIdList());
-        CompletableFuture<Result<List<CustomerDTO>>> customerDTOResultFuture = CompletableFuture.supplyAsync(()-> operCrmFeignClient.queryCustomerList(customerFormDTO),executorService);
+        Result<List<CustomerDTO>> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO);
-        //Result<List<CustomerDTO>> customerDTOResult = operCrmFeignClient.queryCustomerList(customerFormDTO);
-        List<StaffOrgsResultDTO> list = null;
-        Result<List<CustomerDTO>> 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<CustomerDTO> customerDTOList = customerDTOResult.getData();
         if (customerDTOResult.success() && customerDTOList.size() > 0) {
             for (CustomerDTO customer : customerDTOList) {

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -111,8 +111,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     private GovProjectOpenFeignClient govProjectOpenFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
-    @Autowired
-    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
 
 
 

epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml

@@ -19,19 +19,11 @@ 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@
   # 数据迁移工具flyway
   flyway:
     enabled: @spring.flyway.enabled@
@@ -41,129 +33,34 @@ spring:
     password: @spring.datasource.druid.password@
     baseline-on-migrate: true
     baseline-version: 0
-  shardingsphere:
+  datasource:
-    sharding:
+    druid:
-      default-data-source-name: master
+      #MySQL
-    masterslave:
+      driver-class-name: com.mysql.cj.jdbc.Driver
-      name: ms
+      url: @spring.datasource.druid.url@
-      master-data-source-name: master
+      username: @spring.datasource.druid.username@
-      slave-data-source-names: slave1,slave2
+      password: @spring.datasource.druid.password@
-      #配置slave节点的负载均衡均衡策略,采用轮询机制
+      initial-size: 10
-      load-balance-algorithm-type: round_robin
+      max-active: 100
-    datasource:
+      min-idle: 10
-      names: master,slave1,slave2
+      max-wait: 60000
-      master:
+      pool-prepared-statements: true
-        #MySQL
+      max-pool-prepared-statement-per-connection-size: 20
-        type: com.alibaba.druid.pool.DruidDataSource
+      time-between-eviction-runs-millis: 60000
-        driver-class-name: com.mysql.cj.jdbc.Driver
+      min-evictable-idle-time-millis: 300000
-        url: @spring.datasource.druid.url@
+      #Oracle需要打开注释
-        username: @spring.datasource.druid.username@
+      #validation-query: SELECT 1 FROM DUAL
-        password: @spring.datasource.druid.password@
+      test-while-idle: true
-        initial-size: 10
+      test-on-borrow: false
-        max-active: 100
+      test-on-return: false
-        min-idle: 10
+      filter:
-        max-wait: 60000
+        stat:
-        pool-prepared-statements: true
+          log-slow-sql: true
-        max-pool-prepared-statement-per-connection-size: 20
+          slow-sql-millis: 1000
-        time-between-eviction-runs-millis: 60000
+          merge-sql: false
-        min-evictable-idle-time-millis: 300000
+        wall:
-        #Oracle需要打开注释
+          config:
-        #validation-query: SELECT 1 FROM DUAL
+            multi-statement-allow: true
-        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
-#      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: true
-#          slow-sql-millis: 1000
-#          merge-sql: false
-#        wall:
-#          config:
-#            multi-statement-allow: true
   cloud:
     nacos:
       discovery:

epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-project-server:
     container_name: gov-project-server-prod
-    image: 172.22.76.12:5000/epmet-cloud-master/gov-project-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:version_placeholder
     ports:
       - "8102:8102"
     network_mode: host # 使用现有网络

epmet-module/gov-project/gov-project-server/pom.xml

@@ -338,30 +338,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_project_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-                <spring.datasource.slave1.url>
-                    <![CDATA[jdbc:mysql://172.22.76.25:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.slave1.url>
-                <spring.datasource.slave1.username>epmet_gov_project_user</spring.datasource.slave1.username>
-                <spring.datasource.slave1.password>EpmEt-db-UsEr</spring.datasource.slave1.password>
-                <spring.datasource.slave2.url>
-                    <![CDATA[jdbc:mysql://172.22.76.26:3306/epmet_gov_project?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.slave2.url>
-                <spring.datasource.slave2.username>epmet_gov_project_user</spring.datasource.slave2.username>
-                <spring.datasource.slave2.password>EpmEt-db-UsEr</spring.datasource.slave2.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/gov-project/gov-project-server/src/main/resources/bootstrap.yml

@@ -16,115 +16,11 @@ 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
@@ -214,12 +110,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/gov-voice-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:version_placeholder
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -259,20 +259,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_gov_voice?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_gov_voice_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/gov-voice/gov-voice-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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
@@ -111,12 +101,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000

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: 172.22.76.12:5000/epmet-cloud-master/open-data-worker-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:version_placeholder
     ports:
       - "8117:8117"
     network_mode: host # 使用现有网络

epmet-module/open-data-worker/open-data-worker-server/pom.xml

@@ -85,12 +85,6 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.epmet</groupId>
-            <artifactId>epmet-commons-dynamic-datasource</artifactId>
-            <version>2.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -279,28 +273,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.30:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_open_data?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_open_data_user</spring.datasource.druid.username>
-                <spring.datasource.druid.password>EpmEtOpEndAtArw_)$</spring.datasource.druid.password>
+                <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
-
-                <!--JN datanbase-->
-                <datasource.druid.jinan.url>
-                    <![CDATA[jdbc:mysql://172.20.92.220:3306/district_grid_record?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.jinan.url>
-                <datasource.druid.jinan.username>sync_gridinfo_pingyin</datasource.druid.jinan.username>
-                <datasource.druid.jinan.password>xvfuz2lz</datasource.druid.jinan.password>
-
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>
@@ -318,7 +303,7 @@
                 <thread.threadPool.rejected-execution-handler>callerRunsPolicy</thread.threadPool.rejected-execution-handler>
 
                 <!--flyway migration 数据库迁移工具-->
-                <spring.flyway.enabled>false</spring.flyway.enabled>
+                <spring.flyway.enabled>true</spring.flyway.enabled>
 
                 <!--生产钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=a5f66c3374b1642fe2142dbf56d5997e280172d4e8f2b546c9423a68c82ece6c</dingTalk.robot.webHook>
@@ -326,7 +311,7 @@
 
                 <!--rocketmq-->
                 <rocketmq.enable>true</rocketmq.enable>
-                <rocketmq.nameserver>172.22.76.20:9876;172.22.76.36:9876</rocketmq.nameserver>
+                <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
             </properties>
         </profile>
     </profiles>

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java

@@ -1,14 +1,12 @@
 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;
@@ -38,7 +36,6 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@DataSource(DataSourceConstant.JI_NAN)
 public class EventreportPingyinServiceImpl extends BaseServiceImpl<EventreportPingyinDao, EventreportPingyinEntity> implements EventreportPingyinService {
     @Resource
     private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java

@@ -1,6 +1,5 @@
 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;
@@ -8,7 +7,6 @@ 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;
@@ -45,7 +43,6 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@DataSource(DataSourceConstant.JI_NAN)
 public class GridInfoPingyinServiceImpl extends BaseServiceImpl<GridInfoPingyinDao, GridInfoPingyinEntity> implements GridInfoPingyinService {
     @Autowired
     private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java

@@ -1,12 +1,10 @@
 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;
@@ -41,7 +39,6 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
-@DataSource(DataSourceConstant.JI_NAN)
 public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffInfoPingyinDao, GridstaffInfoPingyinEntity> implements GridstaffInfoPingyinService {
 
     @Autowired

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java

@@ -1,7 +1,6 @@
 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;
@@ -14,7 +13,6 @@ 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;
@@ -48,7 +46,6 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-@DataSource(DataSourceConstant.JI_NAN)
 public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl<GridstaffWorkInfoPingyinDao, GridstaffWorkInfoPingyinEntity> implements GridstaffWorkInfoPingyinService {
 
     @Autowired

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml

@@ -16,21 +16,11 @@ 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
@@ -74,14 +64,6 @@ 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:

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml

@@ -188,7 +188,7 @@
     <springProfile name="prod">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
-        <logger name="com.epmet.dao" level="DEBUG"/>
+        <logger name="com.epmet.dao" level="INFO"/>
         <!-- 只打印rocketmq client的日志 -->
         <logger name="RocketmqClient" level="INFO" additivity="false">
             <appender-ref ref="RocketmqClientAppender"/>

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: 172.22.76.12:5000/epmet-cloud-master/oper-access-server:version_placeholder
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:version_placeholder
     ports:
       - "8093:8093"
     network_mode: host # 使用现有网络

epmet-module/oper-access/oper-access-server/pom.xml

@@ -244,20 +244,19 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://172.22.76.6:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_access?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet_oper_access_user</spring.datasource.druid.username>
                 <spring.datasource.druid.password>EpmEt-db-UsEr</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.cluster.nodes>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</spring.redis.cluster.nodes>
+                <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
-                <spring.redis.mode>cluster</spring.redis.mode>
+                <spring.redis.port>6379</spring.redis.port>
-                <spring.redis.cluster.max-redirects>3</spring.redis.cluster.max-redirects>
+                <spring.redis.password>EpmEtclOUdrEdIs!Q2w</spring.redis.password>
-                <spring.redis.password>EpmEtclOUdrEdIs@py</spring.redis.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.22.76.5:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.11.180:8848</nacos.server-addr>
-                <nacos.discovery.namespace>762652d0-b22e-4d56-93ed-b012ad735309</nacos.discovery.namespace>
+                <nacos.discovery.namespace>bd205d23-e696-47be-b995-916313f86e99</nacos.discovery.namespace>
                 <nacos.config.namespace></nacos.config.namespace>
                 <nacos.config.group></nacos.config.group>
                 <nacos.config-enabled>false</nacos.config-enabled>

epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@@ -19,21 +19,11 @@ 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
@@ -122,12 +112,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 20
-      maximumSize: 50
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 200
 
 ribbon:
   ReadTimeout: 300000
@@ -158,4 +142,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@
+    rejectedExecutionHandler: @thread.threadPool.rejected-execution-handler@