diff --git a/doc/开发规范/命名规范.txt b/doc/开发规范/命名规范.txt
index 684d4b35ef..439096e23c 100644
--- a/doc/开发规范/命名规范.txt
+++ b/doc/开发规范/命名规范.txt
@@ -1,19 +1,14 @@
-dao层：
+一、controller
+1、方法名和接口名一致，改为驼峰式
+二、service层：
+2、同controller一致
+三、dao层：
 1、结果集是集合用selectListXXX
 2、结果集为一个实例用selectOneXXX
 3、更新：updateXXX
 4、插入：insertXXX
 5、删除：deleteXXX
 6、获取统计值的方法用 selectCount
-service层：
-1、结果集是集合：listXXX
-2、结果集是一个实例：getXXX
-3、插入：saveXXX
-5、修改：modifyXXX
-4、删除：removeXXX
-5、获取统计值的方法用 countXXX
 
 
-数据传输对象：xxxDTO，xxx 为业务领域相关的名称
 
-controller层根据接口定义来取名，接口定的什么就取什么
diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml
index 773ee4729d..57008f3d6b 100644
--- a/epmet-admin/epmet-admin-server/pom.xml
+++ b/epmet-admin/epmet-admin-server/pom.xml
@@ -99,7 +99,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -129,7 +129,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml
index 3d8c615718..bee517a83e 100644
--- a/epmet-auth/pom.xml
+++ b/epmet-auth/pom.xml
@@ -123,7 +123,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -157,7 +157,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 0ff436f5f5..d4ab31a087 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -95,7 +95,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -163,7 +163,7 @@
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -204,7 +204,7 @@
                 <!--   14、#运营端访问权限控制   -->
                 <gateway.routes.oper-access-server.uri>lb://oper-access-server</gateway.routes.oper-access-server.uri>
                 <!--   15、居民端个人信息            -->
-                <gateway.routes.resi-mine-server.uri>http://resi-mine-server</gateway.routes.resi-mine-server.uri>
+                <gateway.routes.resi-mine-server.uri>lb://resi-mine-server</gateway.routes.resi-mine-server.uri>
             </properties>
         </profile>
     </profiles>
diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
index eebb530f54..77c63cce67 100644
--- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
+++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml
@@ -175,7 +175,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -203,7 +203,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-demo/epmet-demo-server/pom.xml b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
index 06fdbd6546..f5069b05a8 100644
--- a/epmet-module/epmet-demo/epmet-demo-server/pom.xml
+++ b/epmet-module/epmet-demo/epmet-demo-server/pom.xml
@@ -115,7 +115,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -145,7 +145,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml
index 207e7d95d2..69e393849b 100644
--- a/epmet-module/epmet-job/epmet-job-server/pom.xml
+++ b/epmet-module/epmet-job/epmet-job-server/pom.xml
@@ -112,7 +112,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -142,7 +142,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml
index 195c274f3a..02c764271c 100644
--- a/epmet-module/epmet-message/epmet-message-server/pom.xml
+++ b/epmet-module/epmet-message/epmet-message-server/pom.xml
@@ -135,7 +135,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -162,7 +162,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
index 49a297e1f5..28570008ee 100644
--- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml
+++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml
@@ -143,7 +143,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -173,7 +173,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 164cf5387f..1ab1be15fe 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -106,7 +106,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -136,7 +136,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml
index 21efec9f84..8df713a550 100644
--- a/epmet-module/oper-access/oper-access-server/pom.xml
+++ b/epmet-module/oper-access/oper-access-server/pom.xml
@@ -108,7 +108,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -138,7 +138,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml
index a7d55f5520..8473caf7e8 100644
--- a/epmet-module/oper-crm/oper-crm-server/pom.xml
+++ b/epmet-module/oper-crm/oper-crm-server/pom.xml
@@ -107,7 +107,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -137,7 +137,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml
index acd7a063cb..c2781bb01a 100644
--- a/epmet-module/oper-customize/oper-customize-server/pom.xml
+++ b/epmet-module/oper-customize/oper-customize-server/pom.xml
@@ -101,7 +101,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -131,7 +131,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml
index 4cf1999e78..213e2aae32 100644
--- a/epmet-module/resi-guide/resi-guide-server/pom.xml
+++ b/epmet-module/resi-guide/resi-guide-server/pom.xml
@@ -119,7 +119,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -149,7 +149,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml
index 6e973e581e..01a62faf8d 100644
--- a/epmet-module/resi-mine/resi-mine-server/pom.xml
+++ b/epmet-module/resi-mine/resi-mine-server/pom.xml
@@ -107,7 +107,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -137,7 +137,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
index 7348057d21..7dc2f9c69a 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/controller/ResiMineGridController.java
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Date 2020/3/24 11:02
  */
 @RestController
-@RequestMapping("minegrid")
+@RequestMapping("mygrid")
 public class ResiMineGridController {
 	@Autowired
 	private ResiMineGridService resiMineGridService;
diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml
index f1f3a8cda1..1020d925ff 100644
--- a/epmet-user/epmet-user-server/pom.xml
+++ b/epmet-user/epmet-user-server/pom.xml
@@ -115,7 +115,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>10.10.10.79</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
@@ -145,7 +145,7 @@
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
-                <spring.redis.host>122.152.200.70</spring.redis.host>
+                <spring.redis.host>10.10.10.77</spring.redis.host>
                 <spring.redis.port>6379</spring.redis.port>
                 <spring.redis.password>123456</spring.redis.password>
                 <!-- nacos -->
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
index c9ffb85093..8bd9024bd1 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerUserServiceImpl.java
@@ -139,9 +139,9 @@ public class CustomerUserServiceImpl extends BaseServiceImpl<CustomerUserDao, Cu
 	public Result<String> saveOrUpdateCustomerUser(CustomerUserDTO customerUserDTO) {
 		CustomerUserEntity entity = ConvertUtils.sourceToTarget(customerUserDTO, CustomerUserEntity.class);
 		if (StringUtils.isNotBlank(customerUserDTO.getId())) {
-			insert(entity);
-		} else {
 			updateById(entity);
+		} else {
+			insert(entity);
 		}
 		return new Result<String>().ok(entity.getId());
 	}
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
index b427ea8e2d..b060b4940c 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/GridLatestServiceImpl.java
@@ -147,6 +147,10 @@ public class GridLatestServiceImpl extends BaseServiceImpl<GridLatestDao, GridLa
         if(StringUtils.isBlank(userId)){
             return new Result<LatestGridInfoResultDTO>().error(GridVisitedConstant.USER_ID_NOTNULL);
         }
-        return new Result<LatestGridInfoResultDTO>().ok(baseDao.selectLatestGridInfoByUserId(userId));
+        LatestGridInfoResultDTO latestGridInfoResultDTO = baseDao.selectLatestGridInfoByUserId(userId);
+        if (null == latestGridInfoResultDTO) {
+            return new Result<>();
+        }
+        return new Result<LatestGridInfoResultDTO>().ok(latestGridInfoResultDTO);
     }
 }