-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4 from mgr9525/dev
update ui
- Loading branch information
Showing
6 changed files
with
183 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,5 +12,7 @@ var ( | |
| Gin *gin.Engine | ||
| Db *xorm.Engine | ||
|
|
||
| Dbold *xorm.Engine | ||
|
|
||
| RunTaskLen int = 5 | ||
| ) | ||
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "gokins/comm" | ||
| "gokins/service/dbService" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/go-xorm/xorm" | ||
| ) | ||
|
|
||
| func ClearUPass(nm string) { | ||
| if nm == "" { | ||
| return | ||
| } | ||
| usr := dbService.FindUserName(nm) | ||
| if usr == nil { | ||
| fmt.Printf("user(%s) not found\n", nm) | ||
| } else { | ||
| usr.Pass = "" | ||
| _, err := comm.Db.Cols("pass").Where("id=?", usr.Id).Update(usr) | ||
| if err != nil { | ||
| fmt.Println("clear password err:" + err.Error()) | ||
| } else { | ||
| fmt.Println("clear password ok") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func MoveData(pth string) { | ||
| if pth == "" { | ||
| return | ||
| } | ||
| pths, err := filepath.Abs(pth) | ||
| if err != nil { | ||
| fmt.Println("old db path err:" + err.Error()) | ||
| return | ||
| } | ||
| stat, err := os.Stat(pths) | ||
| if err != nil { | ||
| fmt.Println("old db path err:" + err.Error()) | ||
| return | ||
| } | ||
| if stat.IsDir() { | ||
| pths += "/db.dat" | ||
| stat, err = os.Stat(pths) | ||
| if err != nil { | ||
| fmt.Println("find old db path err:" + err.Error()) | ||
| return | ||
| } | ||
| if stat.IsDir() { | ||
| fmt.Println("find old db path err:is dir") | ||
| return | ||
| } | ||
| } | ||
|
|
||
| db, err := xorm.NewEngine("sqlite3", pths) | ||
| if err != nil { | ||
| fmt.Println("old db path err:" + err.Error()) | ||
| return | ||
| } | ||
| comm.Dbold = db | ||
|
|
||
| MoveModels() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| package service | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "gokins/comm" | ||
| "gokins/model" | ||
| "time" | ||
|
|
||
| ruisUtil "github.com/mgr9525/go-ruisutil" | ||
| ) | ||
|
|
||
| func MoveModels() { | ||
| var olds []*ruisUtil.Map | ||
| err := comm.Dbold.SQL("select * from t_model").Find(&olds) | ||
| if err != nil { | ||
| fmt.Println("find model err:" + err.Error()) | ||
| return | ||
| } | ||
| for _, v := range olds { | ||
| id, err := v.GetInt("id") | ||
| if err != nil { | ||
| continue | ||
| } | ||
| del, err := v.GetInt("del") | ||
| if err != nil { | ||
| continue | ||
| } | ||
| clrdir, err := v.GetInt("clrdir") | ||
| if err != nil { | ||
| continue | ||
| } | ||
| ne := &model.TModel{} | ||
| ne.Uid = v.GetString("uid") | ||
| ne.Title = v.GetString("title") | ||
| ne.Desc = v.GetString("desc") | ||
| ne.Del = int(del) | ||
| ne.Clrdir = int(clrdir) | ||
| ne.Envs = v.GetString("envs") | ||
| ne.Wrkdir = v.GetString("wrkdir") | ||
| if tm, ok := v.Get("times").(time.Time); ok { | ||
| ne.Times = tm | ||
| } | ||
| _, err = comm.Db.Insert(ne) | ||
| if err == nil { | ||
| mvPlugin(id, ne) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func mvPlugin(tid int64, md *model.TModel) { | ||
| var olds []*ruisUtil.Map | ||
| err := comm.Dbold.SQL("select * from t_plugin where tid=?", tid).Find(&olds) | ||
| if err != nil { | ||
| fmt.Println("find model err:" + err.Error()) | ||
| return | ||
| } | ||
| for _, v := range olds { | ||
| del, err := v.GetInt("del") | ||
| if err != nil { | ||
| continue | ||
| } | ||
| typ, err := v.GetInt("type") | ||
| if err != nil { | ||
| continue | ||
| } | ||
| sort, err := v.GetInt("sort") | ||
| if err != nil { | ||
| break | ||
| } | ||
| exend, err := v.GetInt("exend") | ||
| if err != nil { | ||
| continue | ||
| } | ||
| ne := &model.TPlugin{} | ||
| ne.Tid = md.Id | ||
| ne.Title = v.GetString("title") | ||
| ne.Type = int(typ) | ||
| ne.Del = int(del) | ||
| ne.Sort = int(sort) | ||
| ne.Exend = int(exend) | ||
| ne.Para = v.GetString("para") | ||
| ne.Cont = v.GetString("cont") | ||
| if tm, ok := v.Get("times").(time.Time); ok { | ||
| ne.Times = tm | ||
| } | ||
| _, err = comm.Db.Insert(ne) | ||
| if err != nil { | ||
| fmt.Sprintf("insert plug err:" + err.Error()) | ||
| break | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters