feat:合并

src/jfw/front/shorturl.go

@@ -4,7 +4,6 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/config"
 	"jy/src/jfw/wx"
 	"log"
@@ -12,6 +11,8 @@ import (
 	"net/url"
 	"strconv"
 
+	"github.com/gogf/gf/v2/util/gconv"
+
 	"jy/src/jfw/jyutil"
 
 	"app.yhyue.com/moapp/jypkg/public"
@@ -21,11 +22,12 @@ import (
 
 	. "app.yhyue.com/moapp/jybase/mongodb"
 
-	elastic "app.yhyue.com/moapp/jybase/es"
 	"regexp"
 	"strings"
 	"time"
 
+	elastic "app.yhyue.com/moapp/jybase/es"
+
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"app.yhyue.com/moapp/jybase/go-xweb/xweb"
 	"app.yhyue.com/moapp/jybase/redis"
@@ -42,7 +44,6 @@ type Short struct {
 	nologinArticle xweb.Mapper `xweb:"/nologin/(\\w+)/(.*).html"`   //([pm]) 无需登录
 }
 
-<<<<<<< HEAD
 var (
 	mobileReg      = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
 	DateFullLayout = "2006-01-02 15:04:05"
@@ -57,46 +58,30 @@ var (
 	}
 	seoAgentReg      = regexp.MustCompile("Baiduspider|360Spider|bingbot|Googlebot")
 	detailNeedMosaic map[string]interface{}
+	TypeCodeMap      = map[string]string{
+		"拟建":   "拟建项目",
+		"采购意向": "采购意向",
+		"预告":   "招标预告",
+		"预审":   "资格预审",
+		"预审结果": "资格预审结果",
+		"论证意见": "论证意见",
+		"需求公示": "需求公示",
+		"招标":   "公开招标",
+		"邀标":   "邀请招标",
+		"询价":   "询价采购",
+		"竞谈":   "竞争性谈判",
+		"单一":   "单一来源采购",
+		"竞价":   "竞价公告",
+		"变更":   "变更公告",
+		"中标":   "中标公示",
+		"成交":   "成交公告",
+		"废标":   "废标公告",
+		"流标":   "流标公告",
+		"合同":   "合同公告信息",
+		"验收":   "验收公告信息",
+		"违规":   "违规信息",
+	}
 )
-=======
-var mobileReg = regexp.MustCompile("(?i)(Android|Mobile|Phone)")
-var DateFullLayout = "2006-01-02 15:04:05"
-var Map_stype = map[string]bool{
-	"content":         true,
-	"entservice":      true,
-	"bdprivate":       true,
-	"mailprivate":     true,
-	"bdcontent":       true,
-	"indexcontent":    true,
-	"advancedProject": true,
-}
-
-var TypeCodeMap = map[string]string{
-	"拟建":   "拟建项目",
-	"采购意向": "采购意向",
-	"预告":   "招标预告",
-	"预审":   "资格预审",
-	"预审结果": "资格预审结果",
-	"论证意见": "论证意见",
-	"需求公示": "需求公示",
-	"招标":   "公开招标",
-	"邀标":   "邀请招标",
-	"询价":   "询价采购",
-	"竞谈":   "竞争性谈判",
-	"单一":   "单一来源采购",
-	"竞价":   "竞价公告",
-	"变更":   "变更公告",
-	"中标":   "中标公示",
-	"成交":   "成交公告",
-	"废标":   "废标公告",
-	"流标":   "流标公告",
-	"合同":   "合同公告信息",
-	"验收":   "验收公告信息",
-	"违规":   "违规信息",
-}
-
-var seoAgentReg = regexp.MustCompile("Baiduspider|360Spider|bingbot|Googlebot")
->>>>>>> master
 
 func (s *Short) Article(stype, id string) error {
 	userId, _ := s.GetSession("userId").(string)

src/jfw/modules/app/src/app/front/shorturl.go

@@ -15,6 +15,7 @@ import (
 
 	"app.yhyue.com/moapp/jybase/date"
 	"app.yhyue.com/moapp/jybase/encrypt"
+
 	//"math/rand"
 	. "jy/src/jfw/modules/app/src/app/jyutil"
 	"log"
@@ -306,8 +307,6 @@ func (s *Short) Article(stype, id string) error {
 	return s.Redirect("/jyapp/free/mob/err")
 }
 
-<<<<<<< HEAD
-=======
 func NoLoginArticle(stype, sid string) map[string]interface{} {
 	obj := make(map[string]interface{})
 	catchKey := fmt.Sprintf("jypcdetail_nologin_app_%s_%s", stype, sid)
@@ -368,7 +367,6 @@ func NoLoginArticle(stype, sid string) map[string]interface{} {
 	return obj
 }
 
->>>>>>> master
 // 未登录用户进行数据过滤
 func Filter(obj map[string]interface{}) map[string]interface{} {
 	detail := fmt.Sprint(obj["detail"])