Merge branch 'master' into hotfix/v1.3.9.1

core/proxy/broker/outServer/SussBi.go

@@ -21,15 +21,16 @@ import (
 )
 
 type sussBi struct {
-	addr       string
-	loginAddr  string
-	user       string
-	pwd        string
-	Url        *url.URL
-	cookiePath string
-	jar        *cookiejar.Jar
-	succbiJar  *cookiejar.Jar
-	prm        *ParamReplaceManager
+	addr           string
+	loginAddr      string
+	user           string
+	pwd            string
+	Url            *url.URL
+	cookiePath     string
+	jar            *cookiejar.Jar
+	succbiJar      *cookiejar.Jar
+	prm            *ParamReplaceManager
+	singlePointUrl *regexp.Regexp
 }
 
 // 参数替换
@@ -110,15 +111,16 @@ func InitSussBi(config map[string]interface{}) (*sussBi, error) {
 	}
 	u, _ := url.Parse(address)
 	return &sussBi{
-		addr:       address,
-		user:       user,
-		Url:        u,
-		pwd:        password,
-		loginAddr:  loginAddr,
-		cookiePath: cookiePath,
-		jar:        sussCookie,
-		succbiJar:  sussCookie2,
-		prm:        prManager,
+		addr:           address,
+		user:           user,
+		Url:            u,
+		pwd:            password,
+		loginAddr:      loginAddr,
+		cookiePath:     cookiePath,
+		jar:            sussCookie,
+		succbiJar:      sussCookie2,
+		prm:            prManager,
+		singlePointUrl: regexp.MustCompile(gconv.String(config["singlePointUrl"])),
 	}, nil
 }
 
@@ -147,7 +149,7 @@ func (s *sussBi) AutoLogin() error {
 
 // RequestLogin 装配登录状态
 func (s *sussBi) RequestLogin(r *ghttp.Request) error {
-	if strings.HasPrefix(r.RequestURI, "/succbi/crm_system") {
+	if s.singlePointUrl.MatchString(r.RequestURI) {
 		ctx := router.GetGContext(r.GetCtx())
 		md5Val := common.GetMd5String(fmt.Sprintf("%s_%s_%d_%d_%d_%d_%d_%d_%s_%d_%s_%d", ctx.Sess.NickName, ctx.Sess.YyName, ctx.Sess.EntRole, ctx.Sess.EntNicheDis, ctx.Sess.PositionId, ctx.Sess.AccountId, ctx.Sess.EntAccountId, ctx.Sess.EntId, ctx.Sess.EntName, ctx.Sess.EntDeptId, ctx.Sess.EntUserName, ctx.Sess.EntUserId))
 		c := &http.Cookie{

etc/config.yaml

@@ -106,6 +106,7 @@ outServer:
     addr: http://192.168.3.11:8012
     user: jianyuweb
     password: 111111
+    singlePointUrl: "^/succbi/(crm_system|yyssjdz)"
     paramReplace:
       "/succbi/api/meta/services/convertFileToPDF/*":
         replace: