feat:一键登录配置调整

src/jfw/modules/publicapply/src/oneclick/entity/entity.go

@@ -53,7 +53,6 @@ var (
 	RegLock   = sync.Mutex{}
 	RegMap    = map[string]*RegStruct{}
 	kickedTip = "您的账号在其他设备登录，如有需要请重新登录。"
-	MergeUrl  = "/weixin/frontPage/userMerge/free/index"
 )
 
 func init() {
@@ -173,8 +172,20 @@ type authToken struct {
 	JwtToken    string `json:"jwtToken"`
 }
 
-func GetAuthTokenWithOptions() (_err error, token *authToken) {
-	redisKey := "oneclick_token"
+func GetAuthTokenWithOptions(host string) (_err error, token *authToken) {
+	// 判断是微信还是h5的域名
+	origin, url := "", ""
+	if strings.Contains(initjson.OneClick.H5.Origin, host) {
+		origin = initjson.OneClick.H5.Origin
+		url = initjson.OneClick.H5.Url
+	} else if strings.Contains(initjson.OneClick.Wx.Origin, host) {
+		origin = initjson.OneClick.Wx.Origin
+		url = initjson.OneClick.Wx.Url
+	} else {
+		log.Println("未匹配到host:", host)
+		return errors.New("host未匹配到"), token
+	}
+	redisKey := fmt.Sprintf("oneclick_token_%s", origin)
 	// 查缓存
 	if reidsCatche, redisErr := redis.GetBytes("other", redisKey); redisErr == nil && reidsCatche != nil {
 		errs := json.Unmarshal(*reidsCatche, &token)
@@ -191,8 +202,8 @@ func GetAuthTokenWithOptions() (_err error, token *authToken) {
 		return
 	}
 	getAuthTokenRequest := &dypnsapi20170525.GetAuthTokenRequest{
-		Origin: tea.String(initjson.OneClick.Origin),
-		Url:    tea.String(initjson.OneClick.Url),
+		Origin: tea.String(origin),
+		Url:    tea.String(url),
 	}
 	runtime := &util.RuntimeOptions{}
 	tryErr := func() (_e error) {

src/jfw/modules/publicapply/src/oneclick/initjson/oc.go

@@ -7,8 +7,14 @@ import (
 type oneClick struct {
 	AccessKeyId     string `json:"accessKeyId"`
 	AccessKeySecret string `json:"accessKeySecret"`
-	Origin          string `json:"origin"`
-	Url             string `json:"url"`
+	H5              struct {
+		Origin string `json:"origin"`
+		Url    string `json:"url"`
+	} `json:"h5"`
+	Wx struct {
+		Origin string `json:"origin"`
+		Url    string `json:"url"`
+	} `json:"wx"`
 }
 
 var (

src/jfw/modules/publicapply/src/oneclick/oneClick.json

@@ -1,6 +1,12 @@
 {
   "accessKeyId": "LTAIjtDusUKp6XEw",
   "accessKeySecret": "DWAt7v7HtfpJcJzRjzWOoPZ0D4oSRu",
-  "origin": "https://webdev-webtest.jydev.jianyu360.com",
-  "url": "https://webdev-webtest.jydev.jianyu360.com/"
+  "h5": {
+    "origin": "https://apph3-jytest.jydev.jianyu360.com",
+    "url": "https://apph3-jytest.jydev.jianyu360.com/"
+  },
+  "wx": {
+    "origin": "https://jybx-webtest.jydev.jianyu360.com",
+    "url": "https://jybx-webtest.jydev.jianyu360.com/"
+  }
 }

src/jfw/modules/publicapply/src/oneclick/service/service.go

@@ -56,7 +56,7 @@ func (o *OneClick) GetAuthToken() {
 		if o.Method() != "POST" {
 			return Result{Data: nil, Error_msg: Error_msg_1005}
 		}
-		err, token := entity.GetAuthTokenWithOptions()
+		err, token := entity.GetAuthTokenWithOptions(o.Request.Host)
 		if err != nil {
 			log.Println("err:", err)
 			return Result{Data: nil, Error_msg: Error_msg_1003}