Merge branch 'dev'

Author: buffge

.github/workflows/release.yml

@@ -0,0 +1,77 @@
+name: release
+run-name: release
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+on:
+  push:
+    tags:
+      - v*
+
+env:
+  GOPROXY: https://goproxy.buffge.com,direct
+  CC: x86_64-w64-mingw32-gcc
+jobs:
+  releaseApp:
+    runs-on: arc-runner-set
+    permissions:
+      contents: write
+    strategy:
+      matrix:
+        go-version: [ '1.23' ]
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - name: install go deps
+        run: |
+          go mod tidy
+      - name: go build
+        run: |
+          export BUILD_USER='${{github.actor}}'
+          make build
+      - name: upx
+        run: |
+          make upx
+      - name: package
+        run: |
+          mv bin hh-lol-prophet-${{ github.ref_name }}
+          zip -r hh-lol-prophet-${{ github.ref_name }}.zip ./hh-lol-prophet-${{ github.ref_name }}
+          mkdir release-package
+          mv hh-lol-prophet-${{ github.ref_name }}.zip release-package
+          mv hh-lol-prophet-${{ github.ref_name }}/hh-lol-prophet.exe release-package
+      - name: upload release
+        run: |
+          s3cmd sync release-package/ s3://buff-pub/hh-lol-prophet/${{ github.ref_name }}/
+      - name: generate tag message env
+        run: |
+          echo "TAG_MESSAGE=$(git tag -l --format='%(contents:subject)' ${{ github.ref_name }})" >> $GITHUB_ENV
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          body: ${{ github.env.TAG_MESSAGE }}
+          files: |
+            release-package/hh-lol-prophet-${{ github.ref_name }}.zip
+      - uses: buffge/dingtalk-action@34743c736212579f8ff99d2dca75879b56371796
+        if: ${{ success() }}
+        env:
+          DINGTALK_ACCESS_TOKEN: ${{ secrets.DINGTALK_ACCESS_TOKEN }}
+          DINGTALK_SECRET: ${{ secrets.DINGTALK_SECRET }}
+        with:
+          msgtype: markdown
+          title: " hh-lol-propher 成功"
+          text: |
+            **<font color=#54aeff size=4>az-blog 构建成功</font>**
+
+            **<font size=4>commitMsg: ${{ github.event.head_commit.message }}</font>**
+      - uses: buffge/dingtalk-action@34743c736212579f8ff99d2dca75879b56371796
+        if: ${{ failure() }}
+        env:
+          DINGTALK_ACCESS_TOKEN: ${{ secrets.DINGTALK_ACCESS_TOKEN }}
+          DINGTALK_SECRET: ${{ secrets.DINGTALK_SECRET }}
+        with:
+          msgtype: markdown
+          title: "hh-lol-propher 失败"
+          text: |
+            **<font color=#cf222e size=4>az-blog 构建失败</font>**
+
+            **<font size=4>commitMsg: ${{ github.event.head_commit.message }}</font>**

.gitignore

@@ -21,4 +21,6 @@ logs/
 #docs
 .vscode
 ttt.md
-*.db
+*.db
+cmd/dev
+bin

Makefile

@@ -1,8 +1,10 @@
-.PHONY: build mode upx doc
+.PHONY: default build mode upx doc
+
 GIT_COMMIT=`git rev-list -1 HEAD`
-BUILD_TIME=`date '+%Y-%m-%d_%H:%M:%S'`
-BUILD_USER=`whoami`
-export GOPROXY=https://goproxy.cn,direct
+BUILD_TIME=`date '+%Y-%m-%d_%H:%M:%S%z'`
+BUILD_USER?=`whoami`
+GOPROXY?=https://goproxy.cn,direct
+default: build
 build: cmd/hh-lol-prophet/main.go
 	@CGO_ENABLED=1 GOOS=windows GOARCH=amd64 go build -tags=jsoniter -ldflags "-s -w \
 -X github.com/real-web-world/hh-lol-prophet.Commit=$(GIT_COMMIT) \
@@ -14,5 +16,4 @@ doc: cmd/hh-lol-prophet/main.go
 clean: bin/
 	@rm -rf bin/hh-lol-prophet.exe
 upx : cmd/hh-lol-prophet/main.go
-	make build
 	upx -9 ./bin/hh-lol-prophet.exe

api.go

@@ -38,22 +38,22 @@ func (api Api) QueryHorseBySummonerName(c *gin.Context) {
 		return
 	}
 	summonerName := strings.TrimSpace(d.SummonerName)
-	var summonerID int64 = 0
+	var summoner *lcu.Summoner
 	if summonerName == "" {
 		if api.p.currSummoner == nil {
 			app.ErrorMsg("系统错误")
 			return
 		}
-		summonerID = api.p.currSummoner.SummonerId
+		summoner = lcu.ConvertCurrSummonerToSummoner(api.p.currSummoner)
 	} else {
 		info, err := lcu.QuerySummonerByName(summonerName)
 		if err != nil || info.SummonerId <= 0 {
 			app.ErrorMsg("未查询到召唤师")
 			return
 		}
-		summonerID = info.SummonerId
+		summoner = info
 	}
-	scoreInfo, err := GetUserScore(summonerID)
+	scoreInfo, err := GetUserScore(summoner)
 	if err != nil {
 		app.CommonError(err)
 		return

app.go

@@ -1,6 +1,7 @@
 package hh_lol_prophet
 
 import (
+	"fmt"
 	"sync"
 	"time"
 
@@ -29,9 +30,20 @@ var (
 	GetCurrConversationID = lcu.GetCurrConversationID
 	QuerySummoner         = lcu.QuerySummoner
 	QueryGameSummary      = lcu.QueryGameSummary
-	ListGamesBySummonerID = lcu.ListGamesBySummonerID
 )
 
+func listSummoner(summonerIDList []int64) (map[int64]*lcu.Summoner, error) {
+	list, err := lcu.ListSummoner(summonerIDList)
+	if err != nil {
+		return nil, err
+	}
+	res := make(map[int64]*lcu.Summoner, len(summonerIDList))
+	for _, summoner := range list {
+		summoner := summoner
+		res[summoner.SummonerId] = &summoner
+	}
+	return res, nil
+}
 func getTeamUsers() (string, []int64, error) {
 	conversationID, err := GetCurrConversationID()
 	if err != nil {
@@ -53,18 +65,13 @@ func getSummonerIDListFromConversationMsgList(msgList []lcu.ConversationMsg) []i
 	}
 	return summonerIDList
 }
-
-func GetUserScore(summonerID int64) (*lcu.UserScore, error) {
+func GetUserScore(summoner *lcu.Summoner) (*lcu.UserScore, error) {
+	summonerID := summoner.SummonerId
 	userScoreInfo := &lcu.UserScore{
 		SummonerID: summonerID,
 		Score:      defaultScore,
 	}
-	// 获取用户信息
-	summoner, err := QuerySummoner(summonerID)
-	if err != nil {
-		return nil, err
-	}
-	userScoreInfo.SummonerName = summoner.DisplayName
+	userScoreInfo.SummonerName = fmt.Sprintf("%s#%s", summoner.GameName, summoner.TagLine)
 	// 获取战绩列表
 	gameList, err := listGameHistory(summoner.Puuid)
 	if err != nil {
@@ -78,10 +85,7 @@ func GetUserScore(summonerID int64) (*lcu.UserScore, error) {
 	currKDAList := make([][3]int, len(gameList))
 	for i, info := range gameList {
 		info := info
-		// 国服
 		currKDAList[len(gameList)-i-1] = [3]int{
-			// 台服
-			// currKDAList[i] = [3]int{
 			info.Participants[0].Stats.Kills,
 			info.Participants[0].Stats.Deaths,
 			info.Participants[0].Stats.Assists,

bin/.gitignore

@@ -1,11 +1,12 @@
 package bootstrap
 
 import (
+	"crypto/sha1"
+	"encoding/binary"
+	"encoding/hex"
 	"encoding/json"
-	"io"
-	"net/http"
+	"log"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/getsentry/sentry-go"
@@ -69,6 +70,9 @@ func initClientConf() (err error) {
 	}
 	if !bdk.IsFile(dbPath) {
 		db, err = gorm.Open(sqlite.Open(dbPath), gormCfg)
+		if err != nil {
+			log.Fatalln("创建配置文件失败")
+		}
 		bts, _ := json.Marshal(global.DefaultClientConf)
 		err = db.Exec(models.InitLocalClientSql, models.LocalClientConfKey, string(bts)).Error
 		if err != nil {
@@ -77,6 +81,9 @@ func initClientConf() (err error) {
 		*global.ClientConf = global.DefaultClientConf
 	} else {
 		db, err = gorm.Open(sqlite.Open(dbPath), gormCfg)
+		if err != nil {
+			log.Fatalln("配置文件错误,请删除配置文件重试")
+		}
 		confItem := &models.Config{}
 		err = db.Table("config").Where("k = ?", models.LocalClientConfKey).First(confItem).Error
 		if err != nil {
@@ -146,8 +153,10 @@ func initAutoReloadCalcConf() {
 	ticker := time.NewTicker(time.Minute)
 	for {
 		latestScoreConf, err := buffApi.GetCurrConf()
-		if err == nil && latestScoreConf != nil && latestScoreConf.Enabled {
-			global.SetScoreConf(*latestScoreConf)
+		if err == nil {
+			if latestScoreConf.Enabled {
+				global.SetScoreConf(*latestScoreConf)
+			}
 		}
 		<-ticker.C
 	}
@@ -169,21 +178,15 @@ func initLib() {
 }
 
 func initUserInfo() {
-	resp, err := http.Get("https://api.ip.sb/ip")
-	if err != nil {
-		return
-	}
-	defer resp.Body.Close()
-	bts, _ := io.ReadAll(resp.Body)
+	sha1.New()
+	hBts := sha1.Sum(binary.LittleEndian.AppendUint64(nil, bdk.GetMac()))
 	global.SetUserInfo(global.UserInfo{
-		IP: strings.Trim(string(bts), "\n"),
-		// Mac:   windows.GetMac(),
-		// CpuID: windows.GetCpuID(),
+		MacHash: hex.EncodeToString(hBts[:]),
 	})
 }
 func initSentry(dsn string) error {
 	isDebugMode := global.IsDevMode()
-	sampleRate := 1.0
+	sampleRate := 0.1
 	if !isDebugMode {
 		sampleRate = 1.0
 	}
@@ -202,16 +205,13 @@ func initSentry(dsn string) error {
 		userInfo := global.GetUserInfo()
 		sentry.ConfigureScope(func(scope *sentry.Scope) {
 			scope.SetContext("buffgeDefault", map[string]interface{}{
-				"ip":      userInfo.IP,
+				"mac":     userInfo.MacHash,
 				"version": global.AppBuildInfo.Version,
-				// "mac":   userInfo.Mac,
-				// "cpuID": userInfo.CpuID,
 			})
 			scope.SetUser(sentry.User{
-				// ID:        userInfo.Mac,
-				IPAddress: userInfo.IP,
+				ID: userInfo.MacHash,
 			})
-			// scope.SetExtra("cpuID", userInfo.CpuID)
+			scope.SetExtra("mac", userInfo.MacHash)
 		})
 	}
 	return err

bin/.gitkeep

@@ -19,7 +19,7 @@ type (
 		BuildTime string
 	}
 	UserInfo struct {
-		IP string `json:"ip"`
+		MacHash string `json:"macHash"`
 	}
 )
 

bootstrap/init.go

@@ -1,47 +1,56 @@
 module github.com/real-web-world/hh-lol-prophet
 
-go 1.19
+go 1.23
 
 require (
 	github.com/atotto/clipboard v0.1.4
 	github.com/avast/retry-go v3.0.0+incompatible
-	github.com/getsentry/sentry-go v0.12.0
-	github.com/gin-contrib/cors v1.3.1
-	github.com/gin-contrib/pprof v1.3.0
-	github.com/gin-gonic/gin v1.7.7
-	github.com/go-playground/validator/v10 v10.10.0
-	github.com/gorilla/websocket v1.5.0
-	github.com/jinzhu/configor v1.2.1
-	github.com/jinzhu/now v1.1.4
-	github.com/joho/godotenv v1.4.0
+	github.com/getsentry/sentry-go v0.29.1
+	github.com/gin-contrib/cors v1.7.2
+	github.com/gin-contrib/pprof v1.5.0
+	github.com/gin-gonic/gin v1.10.0
+	github.com/go-playground/validator/v10 v10.22.1
+	github.com/gorilla/websocket v1.5.3
+	github.com/jinzhu/configor v1.2.2
+	github.com/jinzhu/now v1.1.5
+	github.com/joho/godotenv v1.5.1
 	github.com/pkg/errors v0.9.1
-	go.uber.org/zap v1.21.0
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158
-	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
-	gopkg.in/natefinch/lumberjack.v2 v2.0.0
-	gorm.io/driver/sqlite v1.3.1
-	gorm.io/gorm v1.23.1
+	go.uber.org/zap v1.27.0
+	golang.org/x/sync v0.8.0
+	golang.org/x/sys v0.26.0
+	golang.org/x/time v0.7.0
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1
+	gorm.io/driver/sqlite v1.5.6
+	gorm.io/gorm v1.25.12
 )
 
 require (
-	github.com/BurntSushi/toml v1.0.0 // indirect
+	github.com/BurntSushi/toml v1.4.0 // indirect
+	github.com/bytedance/sonic v1.12.3 // indirect
+	github.com/bytedance/sonic/loader v0.2.1 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.6 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
-	github.com/go-playground/locales v0.14.0 // indirect
-	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/goccy/go-json v0.10.3 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/leodido/go-urn v1.2.1 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
-	github.com/mattn/go-sqlite3 v1.14.9 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-sqlite3 v1.14.24 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/ugorji/go/codec v1.2.6 // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/arch v0.11.0 // indirect
+	golang.org/x/crypto v0.28.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	google.golang.org/protobuf v1.35.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )