liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

更新gui存储

Browse Source
This commit is contained in:
wh_zcy 2022-08-18 21:04:25 +08:00
parent 29e1cdac0a
commit 5dabbeca17
6 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/v2/FyneApp.toml
View File

@ -5,4 +5,4 @@ Website = "https://legu.com"
Name = "RobotGUI"
ID = "com.legu.app"
Version = "1.0.1"
Build = 7
Build = 8

2
cmd/v2/readme.md
View File

@ -27,7 +27,7 @@ a.SetIcon(resourceFavPng)
## package
fyne package --name robotGUI-1.0.1 -os windows -icon Icon.png
fyne package --name robotGUI-1.0.0 -os windows -icon Icon.png
## 开发协议参数表单

51
cmd/v2/service/dbServer.go
View File

@ -16,7 +16,7 @@ import (
type DbService interface {
Save(conf *model.GenTool) error
Update() error
Get() *model.GenTool
Get(key string) *model.GenTool
}
type DbServiceImpl struct {
@ -36,17 +36,24 @@ func GetDbService() DbService {
func (this *DbServiceImpl) Save(conf *model.GenTool) error {
boltDb = GetBoltDb()
defer boltDb.Close()
_ = boltDb.Update(func(tx *bolt.Tx) error {
if err := boltDb.Update(func(tx *bolt.Tx) error {
b, err2 := json.Marshal(conf)
if err2 != nil {
return err
}
return bucket.Put([]byte(common.BUCKET_CONF), b)
})
c := tx.Bucket([]byte(common.BOLTDB_BUCKETNAME))
if c == nil {
return fmt.Errorf("Bucket %s not found!", common.BOLTDB_BUCKETNAME)
}
return c.Put([]byte(common.BUCKET_CONF), b)
}); err != nil {
logrus.Errorf("save err: %v", err)
return err
}
return nil
}
func (this *DbServiceImpl) Get() *model.GenTool {
func (this *DbServiceImpl) Get(key string) *model.GenTool {
boltDb = GetBoltDb()
defer boltDb.Close()
conf := &model.GenTool{}
@ -56,7 +63,7 @@ func (this *DbServiceImpl) Get() *model.GenTool {
return fmt.Errorf("Bucket %s not found!", common.BOLTDB_BUCKETNAME)
}
val := c.Get([]byte(common.BUCKET_CONF))
val := c.Get([]byte(key))
if err := json.Unmarshal(val, conf); err != nil {
logrus.Errorf("get gen conf err:%v", err)
return err
@ -81,24 +88,24 @@ var (
)
func GetBoltDb() *bolt.DB {
once.Do(func() {
boltDb, err = bolt.Open(common.BOLTDB_NAME, 0600, &bolt.Options{Timeout: 1 * time.Second})
if err != nil {
log.Fatal(err)
}
// once.Do(func() {
boltDb, err = bolt.Open(common.BOLTDB_NAME, 0600, &bolt.Options{Timeout: 5 * time.Second})
if err != nil {
log.Fatal(err)
}
boltDb.Update(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(common.BOLTDB_BUCKETNAME))
if b != nil {
bucket = b
} else {
bucket, err = tx.CreateBucket([]byte(common.BOLTDB_BUCKETNAME))
if err != nil {
return fmt.Errorf("create bucket: %s", err)
}
boltDb.Update(func(tx *bolt.Tx) error {
b := tx.Bucket([]byte(common.BOLTDB_BUCKETNAME))
if b != nil {
bucket = b
} else {
bucket, err = tx.CreateBucket([]byte(common.BOLTDB_BUCKETNAME))
if err != nil {
return fmt.Errorf("create bucket: %s", err)
}
return nil
})
}
return nil
})
// })
return boltDb
}

11
cmd/v2/ui/app_gen.go
View File

@ -30,7 +30,7 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
this.tabItem = container.NewTabItemWithIcon(common.TOOLBAR_GEN, theme.ContentCopyIcon(), nil)
// load
gt := service.GetDbService().Get()
gt := service.GetDbService().Get(common.BUCKET_CONF)
logrus.Debugf("%v", gt)
content := container.NewMax()
@ -38,20 +38,20 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
serverAddr := widget.NewEntry()
serverAddr.PlaceHolder = "服务器地址"
serverAddr.Text = "10.0.1.11"
serverAddr.Text = gt.ServerAddr
projectDir := widget.NewEntry()
projectDir.PlaceHolder = "项目目录"
projectDir.Text = "E:\\projects\\workspace\\go_dreamfactory"
projectDir.Text = gt.ProjectDir //"E:\\projects\\workspace\\go_dreamfactory"
workDir := widget.NewEntry()
workDir.PlaceHolder = "LuBan目录"
workDir.Text = "E:\\svn\\dreamworks\\client\\dreamworks\\ExcelFile"
workDir.Text = gt.WorkDir // "E:\\svn\\dreamworks\\client\\dreamworks\\ExcelFile"
// client
client := widget.NewEntry()
client.PlaceHolder = "配置Luban Client.exe路径"
client.Text = "\\Luban.Client\\Luban.Client.exe"
client.Text = gt.Client //"\\Luban.Client\\Luban.Client.exe"
//define
define := widget.NewEntry()
@ -74,6 +74,7 @@ func (this *appGen) LazyInit(obs observer.Observer) error {
genTypeText = s
})
genType.PlaceHolder = "生成类型"
genType.Selected = gt.GenType
form := widget.NewForm(
widget.NewFormItem("服务地址", serverAddr),

2
modules/friend/api_list.go
View File

@ -72,7 +72,7 @@ func (this *apiComp) List(session comm.IUserSession, req *pb.FriendListReq) (cod
}
//判断是否已接收获赞
if _, ok := utils.Findx(self.GetZandIds, userId); ok {
if _, ok := utils.Findx(self.ZanIds, userId); ok {
base.IsGetZaned = true
}

23
modules/friend/api_zanreceive.go
View File

@ -34,26 +34,25 @@ func (this *apiComp) Zanreceive(session comm.IUserSession, req *pb.FriendZanrece
}
var (
pointTotal int32 // 累计友情值
optIds []string //本次有效操作Ids
pointTotal int32 // 累计友情值
)
// 是否已领取点赞
for _, v := range req.FriendIds {
if _, ok := utils.Find(self.GetZandIds, v); !ok {
optIds = append(optIds, v)
self.GetZandIds = append(self.GetZandIds, v)
pointTotal += 1
}
}
for _, v := range optIds {
// 修改获赞Id
if err = this.moduleFriend.modelFriend.Change(v, map[string]interface{}{
"getZandIds": v,
}); err != nil {
code = pb.ErrorCode_DBError
return
}
pointTotal += 1
// 修改获赞Id
if err = this.moduleFriend.modelFriend.Change(self.Uid, map[string]interface{}{
"getZandIds": self.GetZandIds,
}); err != nil {
code = pb.ErrorCode_DBError
return
}
//设置自己的友情值