no message

src/service/repair_service.go

@@ -8,7 +8,6 @@ import (
 	"github.com/tealeg/xlsx"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"io"
 	"io/ioutil"
 	"log"
 	mu "mfw/util"
@@ -28,6 +27,7 @@ import (
 
 var (
 	rpre          = regexp.MustCompile("https://www.jianyu360.cn/article/content/")
+	rpre1         = regexp.MustCompile("https://www.jianyu360.cn/article/bdprivate/")
 	rsuf          = regexp.MustCompile("(.html).*")
 	AddSpiderCode = "sdxzbiddingsjzypc" // 新增bidding数据spider_code
 )
@@ -623,9 +623,16 @@ func (jy *RepairRule) SearchJyurl() {
 	if jy.Method() == "POST" {
 
 		jyurl := jy.GetString("jyurl")
-		jyurl = rpre.ReplaceAllString(jyurl, "")
-		jyurl = rsuf.ReplaceAllString(jyurl, "")
-		new_id := qu.CommonDecodeArticle("content", jyurl)[0]
+		new_id := ""
+		if strings.Contains(jyurl, "content") {
+			jyurl1 := rpre.ReplaceAllString(jyurl, "")
+			jyurl1 = rsuf.ReplaceAllString(jyurl1, "")
+			new_id = qu.CommonDecodeArticle("content", jyurl1)[0]
+		} else if strings.Contains(jyurl, "bdprivate") {
+			jyurl1 := rpre1.ReplaceAllString(jyurl, "")
+			jyurl1 = rsuf.ReplaceAllString(jyurl1, "")
+			new_id = qu.CommonDecodeArticle("bdprivate", jyurl1)[0]
+		}
 		qu.Debug(new_id)
 		if !mongodb.IsObjectIdHex(new_id) {
 			jy.ServeJson(map[string]interface{}{
@@ -1144,6 +1151,7 @@ func (jy *RepairRule) UpFileRecord() {
 func (jy *RepairRule) UpFile() {
 	defer qu.Catch()
 	if jy.Method() == "POST" {
+		user := jy.GetSession("user").(map[string]interface{})
 		identity := jy.GetString("identity")
 		var id string
 		if len(identity) == 24 {
@@ -1180,12 +1188,12 @@ func (jy *RepairRule) UpFile() {
 			}
 			bt, _ := ioutil.ReadAll(res.Body)
 			key := GetHashKey(bt) + TypeByExt(filename)
-			b, err := OssPutObject(key, io.Reader(res.Body))
+			b, err := OssPutObject(key, bytes.NewReader(bt))
 			if b {
 				tmp := make(map[string]interface{})
 				tmp["org_url"] = download
 				tmp["filename"] = filename
-				tmp["ftype"] = TypeByExt(filename)
+				tmp["ftype"] = strings.Replace(TypeByExt(filename), ".", "", -1)
 				tmp["fid"] = key
 				tmp["url"] = "oss"
 				br := bytes.NewReader(bt)
@@ -1225,7 +1233,7 @@ func (jy *RepairRule) UpFile() {
 				} else {
 					tmp := make(map[string]interface{})
 					for i, att := range atts {
-						tmp[strconv.Itoa(i)] = att
+						tmp[strconv.Itoa(i+1)] = att
 					}
 					attsMap["attachments"] = tmp
 				}
@@ -1253,7 +1261,7 @@ func (jy *RepairRule) UpFile() {
 		jy.ServeJson(map[string]interface{}{
 			"rep": true,
 		})
-		Mgo.Save("jy_upfile_log", bson.M{"infoid": id, "value": "上传附件", "createtime": time.Now().Unix()})
+		Mgo.Save("jy_upfile_log", bson.M{"infoid": id, "value": "上传附件", "createtime": time.Now().Unix(), "modifyuser": user["name"]})
 
 	} else {
 		_ = jy.Render("repair/jy_file_upload.html")

src/util/ossclient.go

@@ -16,7 +16,7 @@ var (
 	ossEndpoint        = "oss-cn-beijing.aliyuncs.com" //正式环境用：oss-cn-beijing-internal.aliyuncs.com 测试：oss-cn-beijing.aliyuncs.com
 	ossAccessKeyId     = "LTAI4G5x9aoZx8dDamQ7vfZi"
 	ossAccessKeySecret = "Bk98FsbPYXcJe72n1bG3Ssf73acuNh"
-	ossBucketName      = "jy-editor" //topjy
+	ossBucketName      = "jy-datafile" //jy-datafile
 	ossclient          *oss.Client
 )
 
@@ -84,7 +84,7 @@ func GetHashKey(bs []byte) string {
 func TypeByExt(path string) string {
 	for i := len(path) - 1; i >= 0 && path[i] != '/'; i-- {
 		if path[i] == '.' {
-			return path[i+1:]
+			return path[i:]
 		}
 	}
 	return ""

src/web/templates/repair/jy_file_upload.html

@@ -64,6 +64,7 @@
                             <th>数据id</th>
                             <th>修改类型</th>
                             <th>操作时间</th>
+                            <th>修改人</th>
                         </tr>
                         </thead>
                     </table>
@@ -115,7 +116,8 @@
                         var dt = new Date()
                         dt.setTime(parseInt(val) * 1000);
                         return dt.format("yyyy-MM-dd hh:mm")
-                    }}
+                    }},
+                {"data": "modifyuser"}
             ]
         });
     });