no message

src/config.json

@@ -1,15 +1,15 @@
 {
   "port": "7000",
   "udpport": ":11117",
-  "mgodb": "192.168.3.207:27092",
+  "mgodb": "192.168.3.207:29099",
   "dbsize": 5,
   "dbname": "datatag",
   "uname": "",
   "upwd": "",
-  "mgodben": "192.168.3.207:27092",
+  "mgodben": "192.168.3.207:29099",
   "dbnameen": "enterprise",
   "mongoenc": "winner_enterprise",
-  "elasticsearch": "http://192.168.3.128:9800",
+  "elasticsearch": "http://127.0.0.1:19800",
   "elasticsearch_index": "bidding",
   "elasticsearch_type": "bidding",
   "elasticPoolSize": 10,
@@ -20,7 +20,7 @@
   "jy_info_back": "jy_modify_log",
   "jy_pro_back": "jy_pro_modify_log",
   "jymgo": {
-    "jyaddr": "192.168.3.207:27092",
+    "jyaddr": "192.168.3.207:29099",
     "jydbsize": 5,
     "jydbname": "wjh",
     "jycollname1": "bidding",
@@ -42,13 +42,13 @@
     "172.17.4.84:2379"
   ],
   "jy_pro": {
-    "mgodb": "192.168.3.207:27092",
+    "mgodb": "192.168.3.207:29099",
     "dbsize": 5,
     "dbname": "wjh",
     "coll": "jh_project"
   },
   "oprd_db": {
-    "addr": "192.168.3.207:27092",
+    "addr": "192.168.3.207:29099",
     "dbsize": 5,
     "dbname": "wjh"
   },
@@ -58,17 +58,17 @@
     "memo": "修改项目"
   },
   "lua_db": {
-    "addr": "192.168.3.207:27092",
+    "addr": "192.168.3.207:29099",
     "dbsize": 5,
     "dbname": "spider"
   },
   "python_db": {
-    "addr": "192.168.3.207:27092",
+    "addr": "192.168.3.207:29099",
     "dbsize": 5,
     "dbname": "py_spider"
   },
   "edit_db": {
-    "addr": "192.168.3.207:27092",
+    "addr": "192.168.3.207:29099",
     "dbsize": 5,
     "dbname": "edit"
   },

src/service/repair_service.go

@@ -61,8 +61,10 @@ type RepairRule struct {
 	repairProSave   xweb.Mapper `xweb:"/service/jy/repair/pro/save"`
 	repairProRecord xweb.Mapper `xweb:"/service/jy/repair/pro/record"`
 
-	repairNewAdd xweb.Mapper `xweb:"/service/jy/repair/newAdd"`
-	repairPub    xweb.Mapper `xweb:"/service/jy/repair/pubSave"`
+	repairNewAdd     xweb.Mapper `xweb:"/service/jy/repair/newAdd"`
+	repairPub        xweb.Mapper `xweb:"/service/jy/repair/pubSave"`
+	repairBulkAddImp xweb.Mapper `xweb:"/service/jy/repair/bulkAdd/imp"`
+	repairBulkAdd    xweb.Mapper `xweb:"/service/jy/repair/bulkAdd"`
 
 	redisRepair  xweb.Mapper `xweb:"/service/jy/repair/redis"`
 	upFile       xweb.Mapper `xweb:"/service/jy/repair/upfile"`
@@ -201,6 +203,34 @@ func (jy *RepairRule) RepairNewAdd() {
 	jy.Render("repair/jy_create_new.html", &jy.T)
 }
 
+func (jy *RepairRule) RepairBulkAddImp() {
+	defer qu.Catch()
+	if jy.Method() == "POST" {
+		mf, _, err := jy.GetFile("xlsx")
+		if err == nil {
+			binary, err := ioutil.ReadAll(mf)
+			if err == nil {
+				data, err := ParsJyData(binary)
+				if err == nil {
+					jy.ServeJson(map[string]interface{}{
+						"data": data,
+						"rep":  true,
+					})
+					return
+				}
+			}
+		}
+		jy.ServeJson(map[string]interface{}{
+			"rep": false,
+		})
+	}
+}
+
+func (jy *RepairRule) RepairBulkAdd() {
+	defer qu.Catch()
+
+}
+
 func (jy *RepairRule) RepairPub() {
 	defer qu.Catch()
 	request_data := GetPostForm(jy.Request)
@@ -801,7 +831,14 @@ func ParsJyData(filebyte []byte) ([]map[string]interface{}, error) {
 				keyName = append(keyName, vv.Value)
 			} else {
 				if vv.Value != "" {
-					data[keyName[ii]] = vv.Value
+					if keyName[ii] == "infoformat" {
+						data[keyName[ii]] = qu.IntAllDef(vv.Value, 1)
+					} else if keyName[ii] == "detail" {
+						data[keyName[ii]] = vv.Value
+						data["contenthtml"] = vv.Value
+					} else {
+						data[keyName[ii]] = vv.Value
+					}
 				}
 			}
 		}

src/util/config.go

@@ -149,7 +149,7 @@ func initCitys() {
 	if CityDistricts == nil {
 		CityDistricts = make(map[string][]string)
 	}
-	datas, _ := Mgo.Find("code_city", `{}`, `{"_id":1}`, `{}`, false, -1, -1)
+	datas, _ := Mgo.Find("code_city", nil, `{"_id":1}`, nil, false, -1, -1)
 	for _, data := range *datas {
 		brief := data["brief"].(string)
 		Province = append(Province, brief)

src/web/templates/repair/jy_repair.html

@@ -89,6 +89,39 @@
     </section>
 </div>
 
+
+<!-- 导入新增数据model -->
+<div class="modal fade" id="modal-data" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog" style="width: 70%">
+        <div class="modal-content">
+            <div class="modal-header">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                    <div class="edit-form">
+                        <div class="edit-info">
+                            <span class="info"><i class="fa fa-fw fa-tags fa-lg"></i>修改数据</span>
+                        </div>
+                        <div class="content modal-content">
+                            <table id="modifyData" class="table table-bordered" >
+                                <thead>
+                                <tr>
+                                    <th>编号</th>
+                                    <th>修改内容</th>
+                                </tr>
+                                </thead>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <input type="button" onclick="saveModify()" class="btn btn-primary saveBtn" value="保存">
+                    <input type="button" onclick="cancelModel()" class="btn btn-default" style="margin-left: 24px" value="取消">
+                </div>
+            </div>
+        </div>
+    </div><!-- /.modal -->
+</div>
+
 {{include "com/footer.html"}}
 <script>
     menuActive("/jy/repair");
@@ -151,6 +184,7 @@
                     }}
             ]
         });
+
     });
 
     function idSearch() {
@@ -225,8 +259,4 @@
     }
 
 
-
-
-
-
 </script>