Merge remote-tracking branch 'origin/crm1.0' into debug

controllers/base_common.go

@@ -6,20 +6,8 @@ import (
 	"github.com/beego/beego/v2/server/web"
 	"hongze/hongze_mobile_admin/utils"
 	"net/url"
-	"rdluck_tools/log"
 )
 
-var apiLog *log.Log
-
-func init() {
-	if utils.RunMode == "release" {
-		logDir := `/data/rdlucklog/hongze_mobile_admin`
-		apiLog = log.Init("20060102.api", logDir)
-	} else {
-		apiLog = log.Init("20060102.api")
-	}
-}
-
 //不需要授权的基类
 type BaseCommon struct {
 	web.Controller
@@ -52,7 +40,7 @@ func (c BaseCommon) Result() {
 		fmt.Println("base auth url.QueryUnescape Err:", err.Error())
 		requestBody = string(c.Ctx.Input.RequestBody)
 	}
-	apiLog.Println("请求地址：", c.Ctx.Input.URI(), "Authorization:", c.Ctx.Input.Header("Authorization"), "RequestBody：", requestBody, "ResponseBody", string(content), "IP：", ip)
+	utils.ApiLog.Println("请求地址：", c.Ctx.Input.URI(), "Authorization:", c.Ctx.Input.Header("Authorization"), "RequestBody：", requestBody, "ResponseBody", string(content), "IP：", ip)
 
 	c.Controller.Data["json"] = c.Response
 	c.Controller.ServeJSON()

services/contract/contract_approval.go

@@ -687,7 +687,6 @@ func messageToUser(contractApprovalRecordList []*contract_approval_record.Contra
 func AfterApproved(contractId int) (err error) {
 	defer func() {
 		if err != nil {
-			fmt.Println("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
 			go utils.SendEmail("异常提醒:"+utils.RunMode, "合同审批通过后，生成pdf失败，ERR:"+err.Error()+"", utils.EmailSendToUsers)
 		}
 
@@ -718,7 +717,7 @@ func AfterApproved(contractId int) (err error) {
 		//defer os.Remove(pdfPath)
 
 		//生成word
-		wordPath := fmt.Sprint("./static/word/系统生成合同_", contractDetail.ContractId, ".docx")
+		wordPath := fmt.Sprint("./static/系统生成合同_", contractDetail.ContractId, ".docx")
 		tmpErr := services.GenerateWordV2(contractDetail, wordPath)
 		if tmpErr != nil {
 			err = tmpErr

services/word.go

@@ -588,7 +588,7 @@ func GetHtmlByContractDetail(contractDetail *contract.ContractDetail, htmlType s
 		////合同有效期
 		//data.NumYear = numYearDecimal.String()
 
-		tmpPrintContent, tmpErr := CalculationDate(contractDetail.StartDate, contractDetail.EndDate)
+		tmpPrintContent, tmpErr := utils.CalculationDate(contractDetail.StartDate, contractDetail.EndDate)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -1590,7 +1590,7 @@ func getPrintData(data WordElement, contractDetail *contract.ContractDetail) (is
 		//	numYearDecimal = minDecimal
 		//}
 		//printContent = numYearDecimal.String()
-		tmpPrintContent, tmpErr := CalculationDate(contractDetail.StartDate, contractDetail.EndDate)
+		tmpPrintContent, tmpErr := utils.CalculationDate(contractDetail.StartDate, contractDetail.EndDate)
 		if tmpErr != nil {
 			err = tmpErr
 			return
@@ -1846,93 +1846,3 @@ func FuncDocs2Pdf(command string, fileSrcPath string, fileOutDir string, convert
 	//fmt.Println("文件转换成功...", string(byteByStat))
 	return fileOutPath, nil
 }
-
-// CalculationDate 计算两个日期之间相差n年m月y天
-func CalculationDate(startDate, endDate time.Time) (beetweenDay string, err error) {
-	//startDate := time.Date(2021, 3, 28, 0, 0, 0, 0, time.Now().Location())
-	//endDate := time.Date(2022, 3, 31, 0, 0, 0, 0, time.Now().Location())
-	numYear := endDate.Year() - startDate.Year()
-
-	numMonth := int(endDate.Month()) - int(startDate.Month())
-
-	numDay := 0
-	//获取截止月的总天数
-	endDateDays := getMonthDay(endDate.Year(), int(endDate.Month()))
-
-	//获取截止月的前一个月
-	endDatePrevMonthDate := endDate.AddDate(0, -1, 0)
-	//获取截止日期的上一个月的总天数
-	endDatePrevMonthDays := getMonthDay(endDatePrevMonthDate.Year(), int(endDatePrevMonthDate.Month()))
-	//获取开始日期的的月份总天数
-	startDateMonthDays := getMonthDay(startDate.Year(), int(startDate.Month()))
-
-	//判断，截止月是否完全被选中，如果相等，那么代表截止月份全部天数被选择
-	if endDate.Day() == endDateDays {
-		numDay = startDateMonthDays - startDate.Day() + 1
-
-		//如果剩余天数正好与开始日期的天数是一致的，那么月份加1
-		if numDay == startDateMonthDays {
-			numMonth++
-			numDay = 0
-			//超过月份了，那么年份加1
-			if numMonth == 12 {
-				numYear++
-				numMonth = 0
-			}
-		}
-	} else {
-		numDay = endDate.Day() - startDate.Day() + 1
-	}
-
-	//天数小于0，那么向月份借一位
-	if numDay < 0 {
-		//向上一个月借一个月的天数
-		numDay += endDatePrevMonthDays
-
-		//总月份减去一个月
-		numMonth = numMonth - 1
-	}
-
-	//月份小于0，那么向年份借一位
-	if numMonth < 0 {
-		//向上一个年借12个月
-		numMonth += 12
-
-		//总年份减去一年
-		numYear = numYear - 1
-	}
-	if numYear < 0 {
-		err = errors.New("日期异常")
-		return
-	}
-
-	if numYear > 0 {
-		beetweenDay += fmt.Sprint(numYear, "年")
-	}
-	if numMonth > 0 {
-		beetweenDay += fmt.Sprint(numMonth, "个月")
-	}
-	if numDay > 0 {
-		beetweenDay += fmt.Sprint(numDay, "天")
-	}
-	return
-}
-
-// getMonthDay 获取某年某月有多少天
-func getMonthDay(year, month int) (days int) {
-	if month != 2 {
-		if month == 4 || month == 6 || month == 9 || month == 11 {
-			days = 30
-
-		} else {
-			days = 31
-		}
-	} else {
-		if ((year%4) == 0 && (year%100) != 0) || (year%400) == 0 {
-			days = 29
-		} else {
-			days = 28
-		}
-	}
-	return
-}

utils/common.go

@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"image"
 	"image/png"
@@ -592,3 +593,93 @@ func ConvertNumToCny(num float64) (str string, err error) {
 	str = reg.ReplaceAllString(str, "零")
 	return
 }
+
+// CalculationDate 计算两个日期之间相差n年m月y天
+func CalculationDate(startDate, endDate time.Time) (beetweenDay string, err error) {
+	//startDate := time.Date(2021, 3, 28, 0, 0, 0, 0, time.Now().Location())
+	//endDate := time.Date(2022, 3, 31, 0, 0, 0, 0, time.Now().Location())
+	numYear := endDate.Year() - startDate.Year()
+
+	numMonth := int(endDate.Month()) - int(startDate.Month())
+
+	numDay := 0
+	//获取截止月的总天数
+	endDateDays := getMonthDay(endDate.Year(), int(endDate.Month()))
+
+	//获取截止月的前一个月
+	endDatePrevMonthDate := endDate.AddDate(0, -1, 0)
+	//获取截止日期的上一个月的总天数
+	endDatePrevMonthDays := getMonthDay(endDatePrevMonthDate.Year(), int(endDatePrevMonthDate.Month()))
+	//获取开始日期的的月份总天数
+	startDateMonthDays := getMonthDay(startDate.Year(), int(startDate.Month()))
+
+	//判断，截止月是否完全被选中，如果相等，那么代表截止月份全部天数被选择
+	if endDate.Day() == endDateDays {
+		numDay = startDateMonthDays - startDate.Day() + 1
+
+		//如果剩余天数正好与开始日期的天数是一致的，那么月份加1
+		if numDay == startDateMonthDays {
+			numMonth++
+			numDay = 0
+			//超过月份了，那么年份加1
+			if numMonth == 12 {
+				numYear++
+				numMonth = 0
+			}
+		}
+	} else {
+		numDay = endDate.Day() - startDate.Day() + 1
+	}
+
+	//天数小于0，那么向月份借一位
+	if numDay < 0 {
+		//向上一个月借一个月的天数
+		numDay += endDatePrevMonthDays
+
+		//总月份减去一个月
+		numMonth = numMonth - 1
+	}
+
+	//月份小于0，那么向年份借一位
+	if numMonth < 0 {
+		//向上一个年借12个月
+		numMonth += 12
+
+		//总年份减去一年
+		numYear = numYear - 1
+	}
+	if numYear < 0 {
+		err = errors.New("日期异常")
+		return
+	}
+
+	if numYear > 0 {
+		beetweenDay += fmt.Sprint(numYear, "年")
+	}
+	if numMonth > 0 {
+		beetweenDay += fmt.Sprint(numMonth, "个月")
+	}
+	if numDay > 0 {
+		beetweenDay += fmt.Sprint(numDay, "天")
+	}
+	return
+}
+
+// getMonthDay 获取某年某月有多少天
+func getMonthDay(year, month int) (days int) {
+	if month != 2 {
+		if month == 4 || month == 6 || month == 9 || month == 11 {
+			days = 30
+
+		} else {
+			days = 31
+		}
+	} else {
+		if ((year%4) == 0 && (year%100) != 0) || (year%400) == 0 {
+			days = 29
+		} else {
+			days = 28
+		}
+	}
+	return
+}

utils/config.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
+	"rdluck_tools/log"
 )
 
 var (
@@ -33,6 +34,7 @@ var (
 var (
 	STATIC_DIR string
 )
+var ApiLog *log.Log
 
 // LibreOfficePath LibreOfficePath的地址
 var LibreOfficePath string
@@ -102,6 +104,14 @@ func init() {
 		panic("配置文件读取libreOfficePath错误 " + err.Error())
 	}
 	LibreOfficePath = tmpLibreOfficePath
+
+	//日志类
+	if RunMode == "release" {
+		logDir := `/data/rdlucklog/hongze_mobile_admin`
+		ApiLog = log.Init("20060102.api", logDir)
+	} else {
+		ApiLog = log.Init("20060102.api")
+	}
 }
 
 //http://webapi.brilliantstart.cn/api/

utils/email.go

@@ -6,8 +6,9 @@ import (
 )
 
 //发送邮件
-func SendEmail(title, content string, touser string)bool {
+func SendEmail(title, content string, touser string) bool {
 	if RunMode == "debug" {
+		ApiLog.Println("title：", title, "content:", content)
 		return false
 	}
 	var arr []string
@@ -17,7 +18,7 @@ func SendEmail(title, content string, touser string)bool {
 		for _, v := range spArr {
 			arr = append(arr, v)
 		}
-	}else{
+	} else {
 		arr = append(arr, touser)
 	}
 	m := gomail.NewMessage()