Merge branch 'dev/v4.8.83_dx' of qmx/jy into feature/v4.8.83

src/config.yaml

@@ -10,6 +10,6 @@ publicserviceKey: "publicservice.rpc"
 
 
 database:
-  clickhouse:
-    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo_test?dial_timeout=2000ms&max_execution_time=60"
+  default:
+    link: "clickhouse:jianyu_appl:Cli3#fkh4ouSe@tcp(cc-2zelp3xmkmsrtjhgp.public.clickhouse.ads.aliyuncs.com:9000)/jyseo?dial_timeout=2000ms&max_execution_time=60"
     debug: true

src/jfw/config/config.go

@@ -66,7 +66,6 @@ func init() {
 	util.ReadConfig("./export.json", &ExportConfig)
 	IpInit()
 	util.ReadConfig("./dataService.json", &IndustryTrendConfig)
-	//ClickhouseInit()
 	//log.Println("sysconfig:", Sysconfig)
 	WeixinConfig, _ = Sysconfig["wxJianyu"].(map[string]interface{})
 	Wxoauth = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=` + util.ObjToString(WeixinConfig["appid"]) + `&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect`

src/jfw/front/dataServiceArea.go

@@ -5,6 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/redis"
 	"app.yhyue.com/moapp/jypkg/public"
 	"fmt"
+	//_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/util/gconv"
@@ -101,14 +102,9 @@ func GovernmentTender() {
 			}
 		} else {
 			for code, node := range siteCodeMap {
-				var tagName string
-				if specialArea[name] {
-					tagName = fmt.Sprintf("%s%s", name, node.CitySpecialKeyWord)
-				} else {
-					tagName = fmt.Sprintf("%s%s", name, node.AreaKeyWord)
-				}
+				tagName := common.If(specialArea[name], node.CitySpecialKeyWord, node.AreaKeyWord).(string)
 				data = append(data, argument{
-					tagName,
+					fmt.Sprintf("%s%s", name, tagName),
 					fmt.Sprintf("/list/area/%s_%s", acronym, code),
 				})
 				break

src/main.go

@@ -1,15 +1,15 @@
 package main
 
 import (
+	"app.yhyue.com/moapp/jybase/fsw"
 	"app.yhyue.com/moapp/jylog"
+	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	_ "jy/src/jfw/active"
 	"jy/src/jfw/config"
 	. "jy/src/jfw/config"
 	_ "jy/src/jfw/site"
-
-	"app.yhyue.com/moapp/jybase/fsw"
 	// _ "jy/src/jfw/modules/app/src/jfw/course"  线下课程 dev3.5.2 21年2.24 下线
-	_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
+
 	_ "jy/src/jfw/filter"
 	"jy/src/jfw/front"
 	_ "jy/src/jfw/nodemgr"