Browse Source

wip:生产环境嵌入两套赛思环境

wangkaiyue 1 year ago
parent
commit
5e2e00ef6b
3 changed files with 22 additions and 10 deletions
  1. 11 0
      src/config.json
  2. 9 8
      src/outProxy/manager.go
  3. 2 2
      src/outProxy/outServer/succBi.go

+ 11 - 0
src/config.json

@@ -198,6 +198,17 @@
         "/succbi/JYYSJH/ana",
         "/succbi/JYYSJH/ana",
         "/succbi/JYYSJH/ana/财务分析"
         "/succbi/JYYSJH/ana/财务分析"
       ]
       ]
+    },
+    "/succbi2/": {
+      "addr": "http://192.168.3.11:8012",
+      "user": "jianyuback",
+      "password": "jianyuback.123456",
+      "blackUrl": [
+        "/succbi/",
+        "/succbi/JYYSJH/",
+        "/succbi/JYYSJH/ana",
+        "/succbi/JYYSJH/ana/财务分析"
+      ]
     }
     }
   },
   },
   "convertlabUserMysql": {
   "convertlabUserMysql": {

+ 9 - 8
src/outProxy/manager.go

@@ -28,16 +28,17 @@ type OutServerInterface interface {
 }
 }
 
 
 func init() {
 func init() {
+	// TODO :因需要配置多套赛思程序,此处只兼容代理赛思后端。如需要代理其他程序,自行开发
 	for name, conf := range config.SysConfigs.OutServer {
 	for name, conf := range config.SysConfigs.OutServer {
-		if name == "/succbi/" {
-			configMap, _ := conf.(map[string]interface{})
-			outServerObj, err := outServer.InitSuccBi(name, configMap)
-			if err != nil {
-				log.Println("Error", err)
-				break
-			}
-			BManager.RegisterOutServer(name, outServerObj)
+		//if name == "/succbi/" {
+		configMap, _ := conf.(map[string]interface{})
+		outServerObj, err := outServer.InitSuccBi(name, configMap)
+		if err != nil {
+			log.Println("Error", err)
+			break
 		}
 		}
+		BManager.RegisterOutServer(name, outServerObj)
+		//}
 	}
 	}
 }
 }
 
 

+ 2 - 2
src/outProxy/outServer/succBi.go

@@ -74,8 +74,8 @@ func (s *succBi) AutoLogin() error {
 	client := &http.Client{
 	client := &http.Client{
 		Jar: s.jar,
 		Jar: s.jar,
 	}
 	}
-	fmt.Println(fmt.Sprintf("%s/succbi/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
-	resp, err := client.Get(fmt.Sprintf("%s/succbi/?:user=%s&:password=%s", s.addr, s.user, s.pwd))
+	fmt.Println(fmt.Sprintf("%s%s?:user=%s&:password=%s", s.addr, s.prefix, s.user, s.pwd))
+	resp, err := client.Get(fmt.Sprintf("%s%s?:user=%s&:password=%s", s.addr, s.prefix, s.user, s.pwd))
 	if err != nil {
 	if err != nil {
 		return err
 		return err
 	}
 	}