diff --git a/dsBaseWeb/Business/BaseStudent/BaseStudentService/BaseStudentProtoServiceRpc.go b/dsBaseWeb/Business/BaseStudent/BaseStudentService/BaseStudentProtoServiceRpc.go
index 94a25c32..dc002d6b 100644
--- a/dsBaseWeb/Business/BaseStudent/BaseStudentService/BaseStudentProtoServiceRpc.go
+++ b/dsBaseWeb/Business/BaseStudent/BaseStudentService/BaseStudentProtoServiceRpc.go
@@ -194,7 +194,7 @@ func ExportStudentInfoExcel(modelArg BaseStudentProto.ModelArg) (*BaseStudentPro
 */
 func ImportStudentInfoExcel(importArg BaseStudentProto.ImportArg) (*BaseStudentProto.Reply, error) {
 	//1、准备动作：连接服务器
-	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	ctx, cancel := context.WithTimeout(context.Background(), 300*time.Second)
 	defer cancel()
 	conn := GRpcUtil.GetConnection()
 	if conn == nil {
diff --git a/dsBaseWeb/Config/Config.ini b/dsBaseWeb/Config/Config.ini
index 65f8f3ff..3d0277e2 100644
--- a/dsBaseWeb/Config/Config.ini
+++ b/dsBaseWeb/Config/Config.ini
@@ -1,5 +1,5 @@
 [distribute]    #发布功能的配置
-ip = 10.10.14.187
+ip = 10.10.14.211
 port = 22
 user = root
 pwd = dsideal
@@ -8,12 +8,12 @@ localPath = E:/Work/dsMin/dsBaseWeb
 
 
 [mysql]
-ip = 10.10.14.211
+ip = server.dsmin.com
 port = 22066
 db_name = base_db_dev
 
 [redis]
-ip = 10.10.14.211
+ip = server.dsmin.com
 port = 18890
 db = 0
 expireTime = 86400
diff --git a/dsBaseWeb/Handler/CheckHandler/LimitRoleId.go b/dsBaseWeb/Handler/CheckHandler/LimitRoleId.go
index b2d6622e..7fd79748 100644
--- a/dsBaseWeb/Handler/CheckHandler/LimitRoleId.go
+++ b/dsBaseWeb/Handler/CheckHandler/LimitRoleId.go
@@ -143,10 +143,10 @@ func roleIdLimitIsLegal(c *gin.Context, interName string, n int) (bool, ResultSt
 		resultStruct.Message = Reply.Message
 
 		//清cookie
-		c.SetCookie("person_id", "", -1, "/", "", false, true)
-		c.SetCookie("identity_id", "", -1, "/", "", false, true)
-		c.SetCookie("token", "", -1, "/", "", false, true)
-		c.SetCookie("ds_access_token", "", -1, "/", "", false, true)
+		//c.SetCookie("person_id", "", -1, "/", "", false, true)
+		//c.SetCookie("identity_id", "", -1, "/", "", false, true)
+		//c.SetCookie("token", "", -1, "/", "", false, true)
+		//c.SetCookie("ds_access_token", "", -1, "/", "", false, true)
 
 		return false, resultStruct
 	}
diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go
index ea996815..54a2dafc 100644
--- a/dsBaseWeb/docs/docs.go
+++ b/dsBaseWeb/docs/docs.go
@@ -2074,12 +2074,12 @@ var doc = `{
         "version": "1.0"
     },
     "paths": {
-        "/base/business/DeleteBaseBusiness": {
+        "/base/business/AddBaseBusiness": {
             "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "删除业务系统信息",
+                "description": "增加业务系统信息",
                 "parameters": [
                     {
                         "description": "业务系统编码",
@@ -2087,6 +2087,13 @@ var doc = `{
                         "name": "businessCode",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "description": "业务系统名称",
+                        "in": "formData",
+                        "name": "businessName",
+                        "required": true,
+                        "type": "string"
                     }
                 ],
                 "produces": [
@@ -2100,16 +2107,20 @@ var doc = `{
                         }
                     }
                 },
-                "summary": "删除业务系统信息",
+                "summary": "增加业务系统信息",
                 "tags": [
                     "业务系统维护"
                 ],
                 "x-emptylimit": [
-                    "businessCode"
+                    "businessCode",
+                    "businessName"
                 ],
                 "x-lengthlimit": [
                     {
-                        "businessCode": "6,6"
+                        "businessCode": "6:6"
+                    },
+                    {
+                        "businessName": "1:50"
                     }
                 ],
                 "x-rolelimit": [
@@ -2221,26 +2232,19 @@ var doc = `{
                 ]
             }
         },
-        "/base/business/AddBaseBusiness": {
-            "post": {
+        "/base/business/GetBaseBusiness": {
+            "get": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "增加业务系统信息",
+                "description": "获取业务系统信息(单条)",
                 "parameters": [
                     {
                         "description": "业务系统编码",
-                        "in": "formData",
+                        "in": "query",
                         "name": "businessCode",
                         "required": true,
                         "type": "string"
-                    },
-                    {
-                        "description": "业务系统名称",
-                        "in": "formData",
-                        "name": "businessName",
-                        "required": true,
-                        "type": "string"
                     }
                 ],
                 "produces": [
@@ -2254,20 +2258,16 @@ var doc = `{
                         }
                     }
                 },
-                "summary": "增加业务系统信息",
+                "summary": "获取业务系统信息(单条)",
                 "tags": [
                     "业务系统维护"
                 ],
                 "x-emptylimit": [
-                    "businessCode",
-                    "businessName"
+                    "businessCode"
                 ],
                 "x-lengthlimit": [
                     {
-                        "businessCode": "6:6"
-                    },
-                    {
-                        "businessName": "1:50"
+                        "businessCode": "6,6"
                     }
                 ],
                 "x-rolelimit": [
@@ -2275,16 +2275,16 @@ var doc = `{
                 ]
             }
         },
-        "/base/business/GetBaseBusiness": {
-            "get": {
+        "/base/business/DeleteBaseBusiness": {
+            "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "获取业务系统信息(单条)",
+                "description": "删除业务系统信息",
                 "parameters": [
                     {
                         "description": "业务系统编码",
-                        "in": "query",
+                        "in": "formData",
                         "name": "businessCode",
                         "required": true,
                         "type": "string"
@@ -2301,7 +2301,7 @@ var doc = `{
                         }
                     }
                 },
-                "summary": "获取业务系统信息(单条)",
+                "summary": "删除业务系统信息",
                 "tags": [
                     "业务系统维护"
                 ],
@@ -9878,12 +9878,12 @@ var doc = `{
                 ]
             }
         },
-        "/base/area/UpdateGovArea": {
+        "/base/area/DeleteGovArea": {
             "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "修改行政区划信息",
+                "description": "删除行政区划信息",
                 "parameters": [
                     {
                         "description": "区域代码",
@@ -9891,27 +9891,6 @@ var doc = `{
                         "name": "areaCode",
                         "required": true,
                         "type": "string"
-                    },
-                    {
-                        "description": "区域名称",
-                        "in": "formData",
-                        "name": "areaName",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "上级代码",
-                        "in": "formData",
-                        "name": "masterCode",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "区域类型",
-                        "in": "formData",
-                        "name": "areaTypeId",
-                        "required": true,
-                        "type": "integer"
                     }
                 ],
                 "produces": [
@@ -9925,28 +9904,16 @@ var doc = `{
                         }
                     }
                 },
-                "summary": "修改行政区划信息",
+                "summary": "删除行政区划信息",
                 "tags": [
                     "行政区划"
                 ],
                 "x-emptylimit": [
-                    "areaTypeId",
-                    "areaCode",
-                    "areaName",
-                    "masterCode"
-                ],
-                "x-intlimit": [
-                    "areaTypeId"
+                    "areaCode"
                 ],
                 "x-lengthlimit": [
                     {
                         "areaCode": "6,6"
-                    },
-                    {
-                        "masterCode": "6,6"
-                    },
-                    {
-                        "areaName": "3:50"
                     }
                 ],
                 "x-rolelimit": [
@@ -9960,12 +9927,12 @@ var doc = `{
                 ]
             }
         },
-        "/base/area/AddGovArea": {
+        "/base/area/UpdateGovArea": {
             "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "增加行政区划信息",
+                "description": "修改行政区划信息",
                 "parameters": [
                     {
                         "description": "区域代码",
@@ -10007,7 +9974,7 @@ var doc = `{
                         }
                     }
                 },
-                "summary": "增加行政区划信息",
+                "summary": "修改行政区划信息",
                 "tags": [
                     "行政区划"
                 ],
@@ -10028,7 +9995,7 @@ var doc = `{
                         "masterCode": "6,6"
                     },
                     {
-                        "areaName": "3,50"
+                        "areaName": "3:50"
                     }
                 ],
                 "x-rolelimit": [
@@ -10042,16 +10009,30 @@ var doc = `{
                 ]
             }
         },
-        "/base/area/DeleteGovArea": {
-            "post": {
+        "/base/area/PageGovArea": {
+            "get": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "删除行政区划信息",
+                "description": "获取行政区划信息(列表)",
                 "parameters": [
                     {
-                        "description": "区域代码",
-                        "in": "formData",
+                        "description": "第几页",
+                        "in": "query",
+                        "name": "page",
+                        "required": true,
+                        "type": "integer"
+                    },
+                    {
+                        "description": "一页显示多少条",
+                        "in": "query",
+                        "name": "limit",
+                        "required": true,
+                        "type": "integer"
+                    },
+                    {
+                        "description": "行政区划码",
+                        "in": "query",
                         "name": "areaCode",
                         "required": true,
                         "type": "string"
@@ -10064,15 +10045,22 @@ var doc = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/Model.Res"
+                            "$ref": "#/definitions/base.area.PageGovArea"
                         }
                     }
                 },
-                "summary": "删除行政区划信息",
+                "summary": "获取行政区划信息(列表)",
                 "tags": [
                     "行政区划"
                 ],
                 "x-emptylimit": [
+                    "page",
+                    "limit",
+                    "areaCode"
+                ],
+                "x-intlimit": [
+                    "page",
+                    "limit",
                     "areaCode"
                 ],
                 "x-lengthlimit": [
@@ -10088,36 +10076,46 @@ var doc = `{
                     "5",
                     "6",
                     "7"
+                ],
+                "x-tablename": [
+                    "t_gov_area"
                 ]
             }
         },
-        "/base/area/PageGovArea": {
-            "get": {
+        "/base/area/AddGovArea": {
+            "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "获取行政区划信息(列表)",
+                "description": "增加行政区划信息",
                 "parameters": [
                     {
-                        "description": "第几页",
-                        "in": "query",
-                        "name": "page",
+                        "description": "区域代码",
+                        "in": "formData",
+                        "name": "areaCode",
                         "required": true,
-                        "type": "integer"
+                        "type": "string"
                     },
                     {
-                        "description": "一页显示多少条",
-                        "in": "query",
-                        "name": "limit",
+                        "description": "区域名称",
+                        "in": "formData",
+                        "name": "areaName",
                         "required": true,
-                        "type": "integer"
+                        "type": "string"
                     },
                     {
-                        "description": "行政区划码",
-                        "in": "query",
-                        "name": "areaCode",
+                        "description": "上级代码",
+                        "in": "formData",
+                        "name": "masterCode",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "description": "区域类型",
+                        "in": "formData",
+                        "name": "areaTypeId",
+                        "required": true,
+                        "type": "integer"
                     }
                 ],
                 "produces": [
@@ -10127,27 +10125,32 @@ var doc = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/base.area.PageGovArea"
+                            "$ref": "#/definitions/Model.Res"
                         }
                     }
                 },
-                "summary": "获取行政区划信息(列表)",
+                "summary": "增加行政区划信息",
                 "tags": [
                     "行政区划"
                 ],
                 "x-emptylimit": [
-                    "page",
-                    "limit",
-                    "areaCode"
+                    "areaTypeId",
+                    "areaCode",
+                    "areaName",
+                    "masterCode"
                 ],
                 "x-intlimit": [
-                    "page",
-                    "limit",
-                    "areaCode"
+                    "areaTypeId"
                 ],
                 "x-lengthlimit": [
                     {
                         "areaCode": "6,6"
+                    },
+                    {
+                        "masterCode": "6,6"
+                    },
+                    {
+                        "areaName": "3,50"
                     }
                 ],
                 "x-rolelimit": [
@@ -10158,9 +10161,6 @@ var doc = `{
                     "5",
                     "6",
                     "7"
-                ],
-                "x-tablename": [
-                    "t_gov_area"
                 ]
             }
         },
diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json
index ab9065b1..cc21d43a 100644
--- a/dsBaseWeb/docs/swagger.json
+++ b/dsBaseWeb/docs/swagger.json
@@ -2059,12 +2059,12 @@
         "version": "1.0"
     },
     "paths": {
-        "/base/business/DeleteBaseBusiness": {
+        "/base/business/AddBaseBusiness": {
             "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "删除业务系统信息",
+                "description": "增加业务系统信息",
                 "parameters": [
                     {
                         "description": "业务系统编码",
@@ -2072,6 +2072,13 @@
                         "name": "businessCode",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "description": "业务系统名称",
+                        "in": "formData",
+                        "name": "businessName",
+                        "required": true,
+                        "type": "string"
                     }
                 ],
                 "produces": [
@@ -2085,16 +2092,20 @@
                         }
                     }
                 },
-                "summary": "删除业务系统信息",
+                "summary": "增加业务系统信息",
                 "tags": [
                     "业务系统维护"
                 ],
                 "x-emptylimit": [
-                    "businessCode"
+                    "businessCode",
+                    "businessName"
                 ],
                 "x-lengthlimit": [
                     {
-                        "businessCode": "6,6"
+                        "businessCode": "6:6"
+                    },
+                    {
+                        "businessName": "1:50"
                     }
                 ],
                 "x-rolelimit": [
@@ -2206,26 +2217,19 @@
                 ]
             }
         },
-        "/base/business/AddBaseBusiness": {
-            "post": {
+        "/base/business/GetBaseBusiness": {
+            "get": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "增加业务系统信息",
+                "description": "获取业务系统信息(单条)",
                 "parameters": [
                     {
                         "description": "业务系统编码",
-                        "in": "formData",
+                        "in": "query",
                         "name": "businessCode",
                         "required": true,
                         "type": "string"
-                    },
-                    {
-                        "description": "业务系统名称",
-                        "in": "formData",
-                        "name": "businessName",
-                        "required": true,
-                        "type": "string"
                     }
                 ],
                 "produces": [
@@ -2239,20 +2243,16 @@
                         }
                     }
                 },
-                "summary": "增加业务系统信息",
+                "summary": "获取业务系统信息(单条)",
                 "tags": [
                     "业务系统维护"
                 ],
                 "x-emptylimit": [
-                    "businessCode",
-                    "businessName"
+                    "businessCode"
                 ],
                 "x-lengthlimit": [
                     {
-                        "businessCode": "6:6"
-                    },
-                    {
-                        "businessName": "1:50"
+                        "businessCode": "6,6"
                     }
                 ],
                 "x-rolelimit": [
@@ -2260,16 +2260,16 @@
                 ]
             }
         },
-        "/base/business/GetBaseBusiness": {
-            "get": {
+        "/base/business/DeleteBaseBusiness": {
+            "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "获取业务系统信息(单条)",
+                "description": "删除业务系统信息",
                 "parameters": [
                     {
                         "description": "业务系统编码",
-                        "in": "query",
+                        "in": "formData",
                         "name": "businessCode",
                         "required": true,
                         "type": "string"
@@ -2286,7 +2286,7 @@
                         }
                     }
                 },
-                "summary": "获取业务系统信息(单条)",
+                "summary": "删除业务系统信息",
                 "tags": [
                     "业务系统维护"
                 ],
@@ -9863,12 +9863,12 @@
                 ]
             }
         },
-        "/base/area/UpdateGovArea": {
+        "/base/area/DeleteGovArea": {
             "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "修改行政区划信息",
+                "description": "删除行政区划信息",
                 "parameters": [
                     {
                         "description": "区域代码",
@@ -9876,27 +9876,6 @@
                         "name": "areaCode",
                         "required": true,
                         "type": "string"
-                    },
-                    {
-                        "description": "区域名称",
-                        "in": "formData",
-                        "name": "areaName",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "上级代码",
-                        "in": "formData",
-                        "name": "masterCode",
-                        "required": true,
-                        "type": "string"
-                    },
-                    {
-                        "description": "区域类型",
-                        "in": "formData",
-                        "name": "areaTypeId",
-                        "required": true,
-                        "type": "integer"
                     }
                 ],
                 "produces": [
@@ -9910,28 +9889,16 @@
                         }
                     }
                 },
-                "summary": "修改行政区划信息",
+                "summary": "删除行政区划信息",
                 "tags": [
                     "行政区划"
                 ],
                 "x-emptylimit": [
-                    "areaTypeId",
-                    "areaCode",
-                    "areaName",
-                    "masterCode"
-                ],
-                "x-intlimit": [
-                    "areaTypeId"
+                    "areaCode"
                 ],
                 "x-lengthlimit": [
                     {
                         "areaCode": "6,6"
-                    },
-                    {
-                        "masterCode": "6,6"
-                    },
-                    {
-                        "areaName": "3:50"
                     }
                 ],
                 "x-rolelimit": [
@@ -9945,12 +9912,12 @@
                 ]
             }
         },
-        "/base/area/AddGovArea": {
+        "/base/area/UpdateGovArea": {
             "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "增加行政区划信息",
+                "description": "修改行政区划信息",
                 "parameters": [
                     {
                         "description": "区域代码",
@@ -9992,7 +9959,7 @@
                         }
                     }
                 },
-                "summary": "增加行政区划信息",
+                "summary": "修改行政区划信息",
                 "tags": [
                     "行政区划"
                 ],
@@ -10013,7 +9980,7 @@
                         "masterCode": "6,6"
                     },
                     {
-                        "areaName": "3,50"
+                        "areaName": "3:50"
                     }
                 ],
                 "x-rolelimit": [
@@ -10027,16 +9994,30 @@
                 ]
             }
         },
-        "/base/area/DeleteGovArea": {
-            "post": {
+        "/base/area/PageGovArea": {
+            "get": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "删除行政区划信息",
+                "description": "获取行政区划信息(列表)",
                 "parameters": [
                     {
-                        "description": "区域代码",
-                        "in": "formData",
+                        "description": "第几页",
+                        "in": "query",
+                        "name": "page",
+                        "required": true,
+                        "type": "integer"
+                    },
+                    {
+                        "description": "一页显示多少条",
+                        "in": "query",
+                        "name": "limit",
+                        "required": true,
+                        "type": "integer"
+                    },
+                    {
+                        "description": "行政区划码",
+                        "in": "query",
                         "name": "areaCode",
                         "required": true,
                         "type": "string"
@@ -10049,15 +10030,22 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/Model.Res"
+                            "$ref": "#/definitions/base.area.PageGovArea"
                         }
                     }
                 },
-                "summary": "删除行政区划信息",
+                "summary": "获取行政区划信息(列表)",
                 "tags": [
                     "行政区划"
                 ],
                 "x-emptylimit": [
+                    "page",
+                    "limit",
+                    "areaCode"
+                ],
+                "x-intlimit": [
+                    "page",
+                    "limit",
                     "areaCode"
                 ],
                 "x-lengthlimit": [
@@ -10073,36 +10061,46 @@
                     "5",
                     "6",
                     "7"
+                ],
+                "x-tablename": [
+                    "t_gov_area"
                 ]
             }
         },
-        "/base/area/PageGovArea": {
-            "get": {
+        "/base/area/AddGovArea": {
+            "post": {
                 "consumes": [
                     "application/x-www-form-urlencoded"
                 ],
-                "description": "获取行政区划信息(列表)",
+                "description": "增加行政区划信息",
                 "parameters": [
                     {
-                        "description": "第几页",
-                        "in": "query",
-                        "name": "page",
+                        "description": "区域代码",
+                        "in": "formData",
+                        "name": "areaCode",
                         "required": true,
-                        "type": "integer"
+                        "type": "string"
                     },
                     {
-                        "description": "一页显示多少条",
-                        "in": "query",
-                        "name": "limit",
+                        "description": "区域名称",
+                        "in": "formData",
+                        "name": "areaName",
                         "required": true,
-                        "type": "integer"
+                        "type": "string"
                     },
                     {
-                        "description": "行政区划码",
-                        "in": "query",
-                        "name": "areaCode",
+                        "description": "上级代码",
+                        "in": "formData",
+                        "name": "masterCode",
                         "required": true,
                         "type": "string"
+                    },
+                    {
+                        "description": "区域类型",
+                        "in": "formData",
+                        "name": "areaTypeId",
+                        "required": true,
+                        "type": "integer"
                     }
                 ],
                 "produces": [
@@ -10112,27 +10110,32 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/base.area.PageGovArea"
+                            "$ref": "#/definitions/Model.Res"
                         }
                     }
                 },
-                "summary": "获取行政区划信息(列表)",
+                "summary": "增加行政区划信息",
                 "tags": [
                     "行政区划"
                 ],
                 "x-emptylimit": [
-                    "page",
-                    "limit",
-                    "areaCode"
+                    "areaTypeId",
+                    "areaCode",
+                    "areaName",
+                    "masterCode"
                 ],
                 "x-intlimit": [
-                    "page",
-                    "limit",
-                    "areaCode"
+                    "areaTypeId"
                 ],
                 "x-lengthlimit": [
                     {
                         "areaCode": "6,6"
+                    },
+                    {
+                        "masterCode": "6,6"
+                    },
+                    {
+                        "areaName": "3,50"
                     }
                 ],
                 "x-rolelimit": [
@@ -10143,9 +10146,6 @@
                     "5",
                     "6",
                     "7"
-                ],
-                "x-tablename": [
-                    "t_gov_area"
                 ]
             }
         },
diff --git a/dsBigData/Business/School/SchoolDao/SchoolDao.go b/dsBigData/Business/School/SchoolDao/SchoolDao.go
index 51998a75..5d717bce 100644
--- a/dsBigData/Business/School/SchoolDao/SchoolDao.go
+++ b/dsBigData/Business/School/SchoolDao/SchoolDao.go
@@ -20,13 +20,13 @@ func PageEduAssistInfoByDistrictCode(districtCode string, directly string) ([]Sc
 	var districtCodeTerm *elastic.TermQuery
 	if strings.HasSuffix(districtCode, "00") { //市
 		if directly == "1" {
-			districtCodeTerm = elastic.NewTermQuery("district_code", districtCode)
+			districtCodeTerm = elastic.NewTermQuery("data_content.district_code", districtCode)
 		} else {
-			districtCodeTerm = elastic.NewTermQuery("city_code", districtCode)
+			districtCodeTerm = elastic.NewTermQuery("data_content.city_code", districtCode)
 		}
 
 	} else { //区
-		districtCodeTerm = elastic.NewTermQuery("district_code", districtCode)
+		districtCodeTerm = elastic.NewTermQuery("data_content.district_code", districtCode)
 	}
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7")
 	bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
@@ -71,9 +71,9 @@ func PageSchoolInfoByDistrictCode(districtCode string, xxbxlxm string, directly
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
 	var districtCodeTerm *elastic.TermQuery
 	if strings.HasSuffix(districtCode, "00") { //市
-		districtCodeTerm = elastic.NewTermQuery("city_code", districtCode)
+		districtCodeTerm = elastic.NewTermQuery("data_content.city_code", districtCode)
 	} else { //区
-		districtCodeTerm = elastic.NewTermQuery("district_code", districtCode)
+		districtCodeTerm = elastic.NewTermQuery("data_content.district_code", districtCode)
 	}
 
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
@@ -128,13 +128,13 @@ func AggsDistrictStatEduAssist(districtCodeArr []string) ([]SchoolModel.EduAssis
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7")
 	interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
-	cityCodeTerms := elastic.NewTermsQuery("district_code", interfaceArr...)
+	cityCodeTerms := elastic.NewTermsQuery("data_content.district_code", interfaceArr...)
 
 	boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, cityCodeTerms, orgTypeTerm)
 
 	districtCodeAggs := elastic.
 		NewTermsAggregation().
-		Field("district_code").
+		Field("data_content.district_code").
 		Size(50)
 
 	result, err := esClient.Search().
@@ -169,13 +169,13 @@ func AggsDistrictStatSchoolCount(districtCodeArr []string) ([]SchoolModel.School
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
 	//directlyUnderTypeTerm := elastic.NewTermQuery("data_content.directly_under_type", "1")
 	interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
-	cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...)
+	cityCodeTerm := elastic.NewTermsQuery("data_content.district_code", interfaceArr...)
 
 	boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, cityCodeTerm, orgTypeTerm)
 
 	districtCodeAggs := elastic.
 		NewTermsAggregation().
-		Field("district_code").
+		Field("data_content.district_code").
 		Size(50)
 
 	result, err := esClient.Search().
@@ -208,7 +208,7 @@ func AggsXxbxlxStatSchoolCountByDistrictCode(districtCode string) ([]SchoolModel
 	enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
-	districtCodeTerm := elastic.NewTermQuery("district_code", districtCode)
+	districtCodeTerm := elastic.NewTermQuery("data_content.district_code", districtCode)
 
 	boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, orgTypeTerm, districtCodeTerm)
 
@@ -255,13 +255,13 @@ func GetSchoolCountAggsDistrict(districtCodeArr []string, aggsXxbxlx bool) ([]Sc
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
 	interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCodeArr)
-	cityCodeTerm := elastic.NewTermsQuery("district_code", interfaceArr...)
+	cityCodeTerm := elastic.NewTermsQuery("data_content.district_code", interfaceArr...)
 
 	boolQuery := elastic.NewBoolQuery().Must(enableFlagTerm, delFlagTerm, cityCodeTerm, orgTypeTerm)
 
 	districtCodeAggs := elastic.
 		NewTermsAggregation().
-		Field("district_code").
+		Field("data_content.district_code").
 		Size(50).
 		CollectionMode("breadth_first")
 
@@ -377,10 +377,10 @@ func GetDirectlyUnderOrgTotalCount(areaCode string, orgType string) (int, error)
 
 	var boolQuery *elastic.BoolQuery
 	if orgType == "2" {
-		cityCodeTerm := elastic.NewTermQuery("city_code", areaCode)
+		cityCodeTerm := elastic.NewTermQuery("data_content.city_code", areaCode)
 		boolQuery = elastic.NewBoolQuery().Must(cityCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
 	} else {
-		districtCodeTerm := elastic.NewTermQuery("district_code", areaCode)
+		districtCodeTerm := elastic.NewTermQuery("data_content.district_code", areaCode)
 		boolQuery = elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
 	}
 
@@ -404,9 +404,9 @@ func GetOrgTotalCount(areaCode string, orgType string) (int, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if len(areaCode) == 6 {
 		if strings.HasSuffix(areaCode, "00") { //市
-			areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 		} else { //区
-			areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 		}
 	} else {
 		areaCodeTerm = elastic.NewTermQuery("org_id", areaCode)
@@ -452,12 +452,12 @@ func GetDirectlyUnderOrgCurrentTermAddCount(areaCode string, orgType string) (in
 
 	var boolQuery *elastic.BoolQuery
 	if orgType == "2" {
-		cityCodeTerm := elastic.NewTermQuery("city_code", areaCode)
+		cityCodeTerm := elastic.NewTermQuery("data_content.city_code", areaCode)
 		//interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"2", "3", "4"})
 		//directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.directly_under_type", interfaceArr...)
 		boolQuery = elastic.NewBoolQuery().Must(cityCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, createTimeRang)
 	} else {
-		districtCodeTerm := elastic.NewTermQuery("district_code", areaCode)
+		districtCodeTerm := elastic.NewTermQuery("data_content.district_code", areaCode)
 		boolQuery = elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm, createTimeRang)
 	}
 
@@ -490,9 +490,9 @@ func GetOrgCurrentTermAddCount(areaCode string, orgType string) (int, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if len(areaCode) == 6 {
 		if strings.HasSuffix(areaCode, "00") { //市
-			areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 		} else { //区
-			areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 		}
 	} else {
 		areaCodeTerm = elastic.NewTermQuery("org_id", areaCode)
@@ -618,9 +618,9 @@ func GetBaseDirectlyUnderAccessTop(schoolIds []string, topNum string) ([]SchoolM
 func GetBaseAccessTop(areaCode string, topNum string) ([]SchoolModel.BaseAccessTopAggsOrgId, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if strings.HasSuffix(areaCode, "00") { //市
-		areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+		areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 	} else { //区
-		areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+		areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 	}
 	enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
@@ -698,7 +698,7 @@ func GetCityDirectlySchoolCount(cityCode string) (int, error) {
 	enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
 	bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
-	districtCodeTerm := elastic.NewTermQuery("city_code", cityCode)
+	districtCodeTerm := elastic.NewTermQuery("data_content.city_code", cityCode)
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "2")
 	interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr([]string{"360", "811", "821"})
 	directlyUnderTypeTerms := elastic.NewTermsQuery("data_content.xxjbzm", interfaceArr...)
@@ -725,7 +725,7 @@ func GetCityDirectlyEduAssistCount(cityCode string) (int, error) {
 	enableFlagTerm := elastic.NewTermQuery("enable_flag", 1)
 	delFlagTerm := elastic.NewTermQuery("del_flag", 0)
 	bUseTerm := elastic.NewTermQuery("data_content.b_use", 1)
-	districtCodeTerm := elastic.NewTermQuery("district_code", cityCode)
+	districtCodeTerm := elastic.NewTermQuery("data_content.district_code", cityCode)
 	orgTypeTerm := elastic.NewTermQuery("data_content.org_type", "7")
 
 	boolQuery := elastic.NewBoolQuery().Must(districtCodeTerm, orgTypeTerm, enableFlagTerm, delFlagTerm, bUseTerm)
diff --git a/dsBigData/Business/Student/StudentDao/StudentDao.go b/dsBigData/Business/Student/StudentDao/StudentDao.go
index e7e18513..1606833f 100644
--- a/dsBigData/Business/Student/StudentDao/StudentDao.go
+++ b/dsBigData/Business/Student/StudentDao/StudentDao.go
@@ -101,14 +101,14 @@ func GetStudentCountAggsXxbxlx(districtCode []string, schoolIds []string, xxbxlx
 
 	if len(districtCode) > 0 {
 		interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCode)
-		districtCodeTerms := elastic.NewTermsQuery("district_code", interfaceArr...)
+		districtCodeTerms := elastic.NewTermsQuery("data_content.district_code", interfaceArr...)
 		boolQuery = elastic.NewBoolQuery().Must(districtCodeTerms, enableFlagTerm, delFlagTerm, bUseTerm, xxbxlxTerms)
 	} else if len(schoolIds) > 0 {
 		interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(schoolIds)
 		orgIdTerms := elastic.NewTermsQuery("org_id", interfaceArr...)
 		boolQuery = elastic.NewBoolQuery().Must(orgIdTerms, enableFlagTerm, delFlagTerm, bUseTerm, xxbxlxTerms)
 	} else {
-		areaTerm := elastic.NewTermQuery("district_code", areaCode)
+		areaTerm := elastic.NewTermQuery("data_content.district_code", areaCode)
 		boolQuery = elastic.NewBoolQuery().Must(areaTerm, enableFlagTerm, delFlagTerm, bUseTerm, xxbxlxTerms)
 	}
 
@@ -279,9 +279,9 @@ func GetStudentTotalCount(areaCode string) (int, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if len(areaCode) == 6 {
 		if strings.HasSuffix(areaCode, "00") { //市
-			areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 		} else { //区
-			areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 		}
 	} else {
 		areaCodeTerm = elastic.NewTermQuery("org_id", areaCode)
@@ -353,9 +353,9 @@ func GetStudentCurrentTermAddCount(areaCode string) (int, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if len(areaCode) == 6 {
 		if strings.HasSuffix(areaCode, "00") { //市
-			areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 		} else { //区
-			areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 		}
 	} else {
 		areaCodeTerm = elastic.NewTermQuery("org_id", areaCode)
diff --git a/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go b/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go
index f68428de..2e8e1990 100644
--- a/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go
+++ b/dsBigData/Business/Teacher/TeacherDao/TeacherDao.go
@@ -104,14 +104,14 @@ func GetTeacherCountAggsXxbxlxByCityOrDistrict(districtCode []string, schoolIds
 
 	if len(districtCode) > 0 {
 		interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(districtCode)
-		districtCodeTerms := elastic.NewTermsQuery("district_code", interfaceArr...)
+		districtCodeTerms := elastic.NewTermsQuery("data_content.district_code", interfaceArr...)
 		boolQuery = elastic.NewBoolQuery().Must(districtCodeTerms, enableFlagTerm, delFlagTerm, identityIdTerm, bUseTerm, xxbxlxTerms)
 	} else if len(schoolIds) > 0 {
 		interfaceArr := CommonUtil.ConvertStringArrToInterfaceArr(schoolIds)
 		orgIdTerms := elastic.NewTermsQuery("org_id", interfaceArr...)
 		boolQuery = elastic.NewBoolQuery().Must(orgIdTerms, enableFlagTerm, delFlagTerm, identityIdTerm, bUseTerm, xxbxlxTerms)
 	} else {
-		areaTerm := elastic.NewTermQuery("district_code", areaCode)
+		areaTerm := elastic.NewTermQuery("data_content.district_code", areaCode)
 		boolQuery = elastic.NewBoolQuery().Must(areaTerm, enableFlagTerm, delFlagTerm, identityIdTerm, bUseTerm, xxbxlxTerms)
 	}
 
@@ -268,9 +268,9 @@ func GetTeacherTotalCount(areaCode string) (int, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if len(areaCode) == 6 {
 		if strings.HasSuffix(areaCode, "00") { //市
-			areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 		} else { //区
-			areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 		}
 	} else {
 		areaCodeTerm = elastic.NewTermQuery("org_id", areaCode)
@@ -347,9 +347,9 @@ func GetTeacherCurrentTermAddCount(areaCode string) (int, error) {
 	var areaCodeTerm *elastic.TermQuery
 	if len(areaCode) == 6 {
 		if strings.HasSuffix(areaCode, "00") { //市
-			areaCodeTerm = elastic.NewTermQuery("city_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.city_code", areaCode)
 		} else { //区
-			areaCodeTerm = elastic.NewTermQuery("district_code", areaCode)
+			areaCodeTerm = elastic.NewTermQuery("data_content.district_code", areaCode)
 		}
 	} else {
 		areaCodeTerm = elastic.NewTermQuery("org_id", areaCode)
diff --git a/dsBigData/Config/Config.ini b/dsBigData/Config/Config.ini
index ba6c22f3..6fcda16c 100644
--- a/dsBigData/Config/Config.ini
+++ b/dsBigData/Config/Config.ini
@@ -1,5 +1,5 @@
 [distribute]    #发布功能的配置
-ip = 10.10.14.187
+ip = 10.10.14.211
 port = 22
 user = root
 pwd = dsideal
@@ -7,7 +7,7 @@ remotePath = /usr/local/dsMin/dsBigData/
 localPath = E:/Work/dsMin/dsBigData
 
 [redis]
-ip = 10.10.14.187
+ip = 127.0.0.1
 port = 18890
 db = 0
 expireTime = 86400
@@ -21,4 +21,4 @@ port = 8004
 project_name = dsBigData
 
 [elasticsearch]
-url = http://10.10.14.188:9200
+url = http://10.10.14.212:9200
diff --git a/dsBigData/build/Config/Config.ini b/dsBigData/build/Config/Config.ini
index ba6c22f3..6fcda16c 100644
--- a/dsBigData/build/Config/Config.ini
+++ b/dsBigData/build/Config/Config.ini
@@ -1,5 +1,5 @@
 [distribute]    #发布功能的配置
-ip = 10.10.14.187
+ip = 10.10.14.211
 port = 22
 user = root
 pwd = dsideal
@@ -7,7 +7,7 @@ remotePath = /usr/local/dsMin/dsBigData/
 localPath = E:/Work/dsMin/dsBigData
 
 [redis]
-ip = 10.10.14.187
+ip = 127.0.0.1
 port = 18890
 db = 0
 expireTime = 86400
@@ -21,4 +21,4 @@ port = 8004
 project_name = dsBigData
 
 [elasticsearch]
-url = http://10.10.14.188:9200
+url = http://10.10.14.212:9200
diff --git a/dsBigData/build/dsBigData b/dsBigData/build/dsBigData
index f4141bd8..51166bae 100644
Binary files a/dsBigData/build/dsBigData and b/dsBigData/build/dsBigData differ