Merge branch 'master' into kd-live
This commit is contained in:
@ -237,7 +237,7 @@ func (sh *serviceDescription) prepare(mg *Maingate) error {
|
||||
div.Maintenance.link = div.Maintenance.Notice
|
||||
} else {
|
||||
var fd FileDocumentDesc
|
||||
if err := sh.mongoClient.FindOneAs(CollectionFile, bson.M{
|
||||
if err := mg.mongoClient.FindOneAs(CollectionFile, bson.M{
|
||||
"key": div.Maintenance.Notice,
|
||||
}, &fd, options.FindOne().SetProjection(bson.M{"link": 1})); err != nil {
|
||||
logger.Println(err)
|
||||
|
||||
@ -4,24 +4,6 @@ $CurBranch = git branch --show-current
|
||||
|
||||
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:GOARCH="amd64"
|
||||
go build -ldflags="-s -w" .
|
||||
|
||||
Reference in New Issue
Block a user