Quellcode durchsuchen

Merge branch 'master' of http://git.shengws.com/csx/gdyb

csx vor 2 Jahren
Ursprung
Commit
fb010c824a
3 geänderte Dateien mit 15 neuen und 13 gelöschten Zeilen
  1. 5 5
      conf/app.conf
  2. 9 7
      main.go
  3. 1 1
      routers/router.go

+ 5 - 5
conf/app.conf Datei anzeigen

45
 
45
 
46
 
46
 
47
 [prod]
47
 [prod]
48
-org_id = 10217
48
+org_id = 10278
49
 mobile_token_expiration_second = 86400
49
 mobile_token_expiration_second = 86400
50
 httpdomain = https://api.xt.kuyicloud.com
50
 httpdomain = https://api.xt.kuyicloud.com
51
 sso_domain = https://sso.kuyicloud.com
51
 sso_domain = https://sso.kuyicloud.com
53
 front_end_domain = "https://xt.kuyicloud.com/#"
53
 front_end_domain = "https://xt.kuyicloud.com/#"
54
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
54
 #url  = "http://192.168.1.228:17001/szsi-portal/transData"
55
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
55
 #url = "http://192.168.1.88:6666/szsi-portal/transData"
56
-gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
56
+# gdyb_url = "http://igb.hsa.gdgov.cn/ebus/gdyb_api/prd/hsa/hgs/"
57
 #test
57
 #test
58
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
58
 # gdyb_url = http://10.97.240.206/ebus/gdyb_inf/poc/hsa/hgs/
59
-# gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
59
+gdyb_url="http://igb.hsa.gdgov.cn/ebus/sz_prd/hsa/hgs/"
60
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
60
 #gdyb_url = "http://10.97.240.206/ebus/sztest_hosp/poc/hsa/hgs/"
61
 #内蒙古
61
 #内蒙古
62
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
62
 # http://tyjk.nm.hsip.gov.cn:8090/uif-hsaf-med-api/api/medical/service
66
 #gdyb_paasid = "sg03_prd"
66
 #gdyb_paasid = "sg03_prd"
67
 # gdyb_paasid = "test_hosp"
67
 # gdyb_paasid = "test_hosp"
68
 #江门
68
 #江门
69
-gdyb_paasid = "jm_sc_yjyy"
69
+# gdyb_paasid = "jm_sc_yjyy"
70
 #珠海
70
 #珠海
71
 # gdyb_paasid="zh_prd_yrojyy"
71
 # gdyb_paasid="zh_prd_yrojyy"
72
 #深圳
72
 #深圳
73
-# gdyb_paasid = "sz_prd_yjyy"
73
+gdyb_paasid = "sz_prd_yjyy"
74
 #肇庆
74
 #肇庆
75
 #gdyb_paasid = "zq_prd_yjyy"
75
 #gdyb_paasid = "zq_prd_yjyy"
76
 # gdyb_paasid = "sztest_hosp"
76
 # gdyb_paasid = "sztest_hosp"

+ 9 - 7
main.go Datei anzeigen

6
 
6
 
7
 	//"gdyb/models"
7
 	//"gdyb/models"
8
 	_ "gdyb/routers"
8
 	_ "gdyb/routers"
9
+	"gdyb/service"
10
+
9
 	//"github.com/qiniu/api.v7/auth/qbox"
11
 	//"github.com/qiniu/api.v7/auth/qbox"
10
 	//"github.com/qiniu/api.v7/storage"
12
 	//"github.com/qiniu/api.v7/storage"
11
 
13
 
12
-	//"github.com/qiniu/api.v7/auth/qbox"
14
+	//"github.com/qiniu/roapi.v7/auth/qbox"
13
 	//"github.com/qiniu/api.v7/storage"
15
 	//"github.com/qiniu/api.v7/storage"
14
 
16
 
15
 	//"gdyb/service"
17
 	//"gdyb/service"
19
 )
21
 )
20
 
22
 
21
 func init() {
23
 func init() {
22
-	//service.ConnectDB()
23
-	//org_id, _ := beego.AppConfig.Int64("org_id")
24
-	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
24
+	service.ConnectDB()
25
+	org_id, _ := beego.AppConfig.Int64("org_id")
26
+	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
25
 	//CreateLog(miConfig)
27
 	//CreateLog(miConfig)
26
 	//UploadLog(miConfig)
28
 	//UploadLog(miConfig)
27
-	//if org_id == 10191 {
28
-	//	service.GetFjAuthorizationInfo(miConfig.Code)
29
-	//}
29
+	if org_id == 10191 {
30
+		service.GetFjAuthorizationInfo(miConfig.Code)
31
+	}
30
 }
32
 }
31
 func main() {
33
 func main() {
32
 	beego.Run()
34
 	beego.Run()

+ 1 - 1
routers/router.go Datei anzeigen

29
 	js.JSybRegistRouters()
29
 	js.JSybRegistRouters()
30
 	//nm.NmybRegistRouters()
30
 	//nm.NmybRegistRouters()
31
 	//coordinate.CoordinateRegistRouters()
31
 	//coordinate.CoordinateRegistRouters()
32
-
32
+	ro
33
 }
33
 }