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

main.go

@@ -1,8 +1,9 @@
 package main
 
 import (
-	"context"
 	"gdyb/service"
+	"github.com/qiniu/api.v7/auth/qbox"
+	"github.com/qiniu/api.v7/storage"
 
 	//"gdyb/service"
 
@@ -10,8 +11,8 @@ import (
 	"fmt"
 	"gdyb/models"
 	//"gdyb/service"
-	"github.com/qiniu/api.v7/auth/qbox"
-	"github.com/qiniu/api.v7/storage"
+	//"github.com/qiniu/api.v7/auth/qbox"
+	//"github.com/qiniu/api.v7/storage"
 	"strconv"
 	"time"
 
@@ -34,13 +35,13 @@ import (
 
 func init() {
 	service.ConnectDB()
-	org_id, _ := beego.AppConfig.Int64("org_id")
-	miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
-	CreateLog(miConfig)
-	UploadLog(miConfig)
-	if org_id == 10191 {
-		service.GetFjAuthorizationInfo(miConfig.Code)
-	}
+	//org_id, _ := beego.AppConfig.Int64("org_id")
+	//miConfig, _ := service.FindMedicalInsuranceInfo(org_id)
+	//CreateLog(miConfig)
+	//UploadLog(miConfig)
+	//if org_id == 10191 {
+	//	service.GetFjAuthorizationInfo(miConfig.Code)
+	//}
 }
 func main() {
 	beego.Run()
@@ -861,7 +862,7 @@ func UploadLog(miConfig models.MedicalInsuranceOrgConfig) {
 		//判断本地文件是否存在，存在则执行上传操作
 		exist, _ := PathExists(miConfig.OrgName + "日志" + "/" + file_key)
 		if exist {
-			upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
+			//upload_qiniu(miConfig.OrgName+"日志"+"/"+file_key, file_key)
 		} else {
 			fmt.Println("本地文件不存在")
 
@@ -901,39 +902,39 @@ func PathExists(path string) (bool, error) {
 	return false, err
 }
 
-func upload_qiniu(filePath string, keys string) {
-	key := keys
-	//上传凭证,关于凭证这块大家可以去看看官方文档
-	putPolicy := storage.PutPolicy{
-		Scope: beego.AppConfig.String("qiniu_bucket"),
-	}
-	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
-	upToken := putPolicy.UploadToken(mac)
-	cfg := storage.Config{}
-	//空间对应机房
-	//其中关于Zone对象和机房的关系如下：
-	//    机房    Zone对象
-	//    华东    storage.ZoneHuadong
-	//    华北    storage.ZoneHuabei
-	//    华南    storage.ZoneHuanan
-	//    北美    storage.ZoneBeimei
-	//七牛云存储空间设置首页有存储区域
-	cfg.Zone = &storage.ZoneHuadong
-	//不启用HTTPS域名
-	cfg.UseHTTPS = false
-	//不使用CND加速
-	cfg.UseCdnDomains = false
-	//构建上传表单对象
-	formUploader := storage.NewFormUploader(&cfg)
-	ret := storage.PutRet{}
-	// 可选
-	putExtra := storage.PutExtra{
-		Params: map[string]string{},
-	}
-	err := formUploader.PutFile(context.Background(), &ret, upToken, key, filePath, &putExtra)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-	fmt.Println(ret.Key, ret.Hash)
-}
+//func upload_qiniu(filePath string, keys string) {
+//	key := keys
+//	//上传凭证,关于凭证这块大家可以去看看官方文档
+//	putPolicy := storage.PutPolicy{
+//		Scope: beego.AppConfig.String("qiniu_bucket"),
+//	}
+//	mac := qbox.NewMac(beego.AppConfig.String("qiniu_accesskey"), beego.AppConfig.String("qiniu_secretkey"))
+//	upToken := putPolicy.UploadToken(mac)
+//	cfg := storage.Config{}
+//	//空间对应机房
+//	//其中关于Zone对象和机房的关系如下：
+//	//    机房    Zone对象
+//	//    华东    storage.ZoneHuadong
+//	//    华北    storage.ZoneHuabei
+//	//    华南    storage.ZoneHuanan
+//	//    北美    storage.ZoneBeimei
+//	//七牛云存储空间设置首页有存储区域
+//	cfg.Zone = &storage.ZoneHuadong
+//	//不启用HTTPS域名
+//	cfg.UseHTTPS = false
+//	//不使用CND加速
+//	cfg.UseCdnDomains = false
+//	//构建上传表单对象
+//	formUploader := storage.NewFormUploader(&cfg)
+//	ret := storage.PutRet{}
+//	// 可选
+//	putExtra := storage.PutExtra{
+//		Params: map[string]string{},
+//	}
+//	err := formUploader.PutFile(context.Background(), &ret, upToken, key, filePath, &putExtra)
+//	if err != nil {
+//		fmt.Println(err)
+//		return
+//	}
+//	fmt.Println(ret.Key, ret.Hash)
+//}