|
|
@@ -1,38 +1,36 @@
|
|
|
package front
|
|
|
|
|
|
import (
|
|
|
- "database/sql"
|
|
|
- "errors"
|
|
|
- "fmt"
|
|
|
- "jy/src/jfw/config"
|
|
|
- "jy/src/jfw/wx"
|
|
|
- "log"
|
|
|
- "math/rand"
|
|
|
- "net/url"
|
|
|
- "strconv"
|
|
|
+ "database/sql"
|
|
|
+ "errors"
|
|
|
+ "fmt"
|
|
|
+ "jy/src/jfw/config"
|
|
|
+ "jy/src/jfw/wx"
|
|
|
+ "log"
|
|
|
+ "math/rand"
|
|
|
+ "net/url"
|
|
|
+ "strconv"
|
|
|
|
|
|
- "github.com/gogf/gf/v2/util/gconv"
|
|
|
+ "github.com/gogf/gf/v2/util/gconv"
|
|
|
|
|
|
- "jy/src/jfw/jyutil"
|
|
|
+ "jy/src/jfw/jyutil"
|
|
|
|
|
|
- "app.yhyue.com/moapp/jypkg/public"
|
|
|
+ "app.yhyue.com/moapp/jypkg/public"
|
|
|
|
|
|
- util "app.yhyue.com/moapp/jybase/common"
|
|
|
- "app.yhyue.com/moapp/jybase/date"
|
|
|
+ util "app.yhyue.com/moapp/jybase/common"
|
|
|
+ "app.yhyue.com/moapp/jybase/date"
|
|
|
|
|
|
- . "app.yhyue.com/moapp/jybase/mongodb"
|
|
|
+ elastic "app.yhyue.com/moapp/jybase/es"
|
|
|
+ "regexp"
|
|
|
+ "strings"
|
|
|
+ "time"
|
|
|
|
|
|
- elastic "app.yhyue.com/moapp/jybase/es"
|
|
|
- "regexp"
|
|
|
- "strings"
|
|
|
- "time"
|
|
|
-
|
|
|
- "app.yhyue.com/moapp/jybase/encrypt"
|
|
|
- "app.yhyue.com/moapp/jybase/go-xweb/xweb"
|
|
|
- "app.yhyue.com/moapp/jybase/redis"
|
|
|
- "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
|
- "github.com/SKatiyar/qr"
|
|
|
- "go.mongodb.org/mongo-driver/bson"
|
|
|
+ "app.yhyue.com/moapp/jybase/encrypt"
|
|
|
+ "app.yhyue.com/moapp/jybase/go-xweb/xweb"
|
|
|
+ "app.yhyue.com/moapp/jybase/redis"
|
|
|
+ "app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
|
+ "github.com/SKatiyar/qr"
|
|
|
+ "go.mongodb.org/mongo-driver/bson"
|
|
|
)
|
|
|
|
|
|
type Short struct {
|
|
|
@@ -955,11 +953,7 @@ func ReplaceStringByRegex(str, rule, replace string) (string, error) {
|
|
|
// 未登录用户进行数据过滤 name 配置文件
|
|
|
func Filter(obj map[string]interface{}) map[string]interface{} {
|
|
|
detail := fmt.Sprint(obj["detail"])
|
|
|
-<<<<<<< HEAD
|
|
|
mosaicText := fmt.Sprintf(`<span style="cursor:pointer;color: #1D1D1D;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
|
|
|
-=======
|
|
|
- mosaicText := fmt.Sprintf(`<span onclick="openLoginDig(true)" style="cursor:pointer;color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
|
|
|
->>>>>>> 2edc07f75dceab84c0ffe0d67cdc109f7f869c59
|
|
|
detailText := fmt.Sprintf(`<span class="noLoginMosaic" style="color: #2ABED1;">%s</span>`, util.ObjToString(config.Sysconfig["detailMosaic"]))
|
|
|
//for k, _ := range obj {
|
|
|
// if ok, _ := detailNeedMosaic[k].(bool); ok {
|
