.gitignore

@@ -1 +0,0 @@
-.idea

.idea/.gitignore

@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 数据源本地存储已忽略文件
+/../../../../../../:\gocode\src\b612.me\astro\.idea/dataSources/
+/dataSources.local.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/

.idea/astro.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/astro.iml" filepath="$PROJECT_DIR$/.idea/astro.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

basic/calendar_test.go

@@ -5,12 +5,8 @@ import (
 	"fmt"
 	"math"
 	"os"
-	"testing"
 )
 
-func TestGenerateMagic(t *testing.T) {
-	generateMagicNumber()
-}
 func generateMagicNumber() {
 	//0月份 00000 日期 0000闰月 0000000000000 农历信息
 	var tz = 8.0000 / 24.000
@@ -18,7 +14,6 @@ func generateMagicNumber() {
 	spYear := make(map[int][]int)
 	var upper []uint16
 	var lower []uint16
-	var full []uint32
 	//var info uint32 = 0
 	for year := 1899; year <= 2401; year++ {
 		fmt.Println(year)
@@ -94,16 +89,13 @@ func generateMagicNumber() {
 	}
 	for year := 1900; year <= 2400; year++ {
 		fmt.Println(year)
-		magic := magicNumber(yearMap[year], spYear[year])
+		up, low := magicNumberSpilt(magicNumber(yearMap[year], spYear[year]))
-		up, low := magicNumberSpilt(magic)
 		upper = append(upper, up)
 		lower = append(lower, uint16(low))
-		full = append(full, uint32(magic))
 	}
 	res := make(map[string]interface{})
 	res["up"] = upper
 	res["low"] = lower
-	res["full"] = full
 	d, _ := json.Marshal(res)
 	os.WriteFile("test.json", d, 0644)
 }

basic/sun_test.go

@@ -4,7 +4,6 @@ import (
 	"b612.me/astro/tools"
 	"fmt"
 	"math"
-	"os"
 	"testing"
 	"time"
 )
@@ -163,20 +162,17 @@ func TestJQDate(t *testing.T) {
 		return math.Floor(d) + 0.5
 	}
 	c := 0
-	var info string
 	for year := 1900; year <= 2600; year++ {
 		for pos := 0; pos < 360; pos += 15 {
-			n := newGetJQTime(year, pos) + 8.0/24.000000
+			n := newGetJQTime(year, pos)
-			o := GetJQTime(year, pos) + 8.0/24.0000000
+			o := GetJQTime(year, pos)
 			if trimDay(n) != trimDay(o) {
 				c++
-				fmt.Printf("\"%d%03d\"=>%v  %v\n", year, pos, JDE2Date(trimDay(o)), JDE2Date(trimDay(n)))
+				fmt.Printf("\"%d%03d\":%.0f,", year, pos, trimDay(o)-trimDay(n))
-				info += fmt.Sprintf("\"%d%03d\"=>%.0f,", year, pos, trimDay(o)-trimDay(n))
 			}
 		}
 	}
 	fmt.Println(c)
-	os.WriteFile("test.txt", []byte(info), 0644)
 }
 
 func newGetJQTime(Year, Angle int) float64 { //节气时间

tools/math.go

@@ -34,8 +34,10 @@ func FloatRound(f float64, n int) float64 {
 }
 
 func Limit360(x float64) float64 {
-	x = math.Mod(x, 360)
+	for x > 360 {
-	if x < 0 {
+		x -= 360
+	}
+	for x < 0 {
 		x += 360
 	}
 	return x