ayo/maingate
8
1
Fork 3
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into kd-live

Browse Source
This commit is contained in:
mountain
2023-06-29 21:32:19 +09:00
parent 2b4becdb61 ed85918e7f
commit 97636ce31d
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/service.go
View File

@ -237,7 +237,7 @@ func (sh *serviceDescription) prepare(mg *Maingate) error {
div.Maintenance.link = div.Maintenance.Notice div.Maintenance.link = div.Maintenance.Notice
} else { } else {
var fd FileDocumentDesc var fd FileDocumentDesc
if err := sh.mongoClient.FindOneAs(CollectionFile, bson.M{ if err := mg.mongoClient.FindOneAs(CollectionFile, bson.M{
"key": div.Maintenance.Notice, "key": div.Maintenance.Notice,
}, &fd, options.FindOne().SetProjection(bson.M{"link": 1})); err != nil { }, &fd, options.FindOne().SetProjection(bson.M{"link": 1})); err != nil {
logger.Println(err) logger.Println(err)

18
make_maingate_package.ps1
View File

@ -4,24 +4,6 @@ $CurBranch = git branch --show-current
Remove-Item maingate.zip -Force -Recurse -ErrorAction SilentlyContinue Remove-Item maingate.zip -Force -Recurse -ErrorAction SilentlyContinue
cd ..
cd maingate-console
git switch $CurBranch
git pull
npm install
npm run build
Remove-Item console -Force -Recurse -ErrorAction SilentlyContinue
Copy-Item build console -Recurse
Compress-Archive -Path console -DestinationPath ..\maingate\maingate.zip -Force
Remove-Item console -Force -Recurse
cd ..
cd maingate
$Env:GOOS="linux" $Env:GOOS="linux"
$Env:GOARCH="amd64" $Env:GOARCH="amd64"
go build -ldflags="-s -w" . go build -ldflags="-s -w" .