Commit 5c682e14 authored by brent's avatar brent

modify id

parent 098c045c
...@@ -2243,6 +2243,19 @@ func (server *TaskController) GetLevelsByTypeId() { ...@@ -2243,6 +2243,19 @@ func (server *TaskController) GetLevelsByTypeId() {
server.respond(http.StatusOK, "", types) server.respond(http.StatusOK, "", types)
} }
func (server *TaskController) AllCategorys() {
var category []*models.Category
qs := mysql.GetMysqlInstace().Ormer.QueryTable("category").
Filter("deleted", 0).
OrderBy("sort")
count, _ := qs.Count()
logs.Debug("types = ", count)
if count > 0 {
qs.All(&category)
}
server.respond(http.StatusOK, "", category)
}
func (server *TaskController) Enumeration() { func (server *TaskController) Enumeration() {
_, err := server.Check() _, err := server.Check()
if err != nil { if err != nil {
......
...@@ -16,7 +16,7 @@ import ( ...@@ -16,7 +16,7 @@ import (
//} //}
type ApiKey struct { type ApiKey struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Name string `json:"name,omitempty";orm:"column(name)"` Name string `json:"name,omitempty";orm:"column(name)"`
ApiKey string `json:"api_key";orm:"column(api_key);size(255)"` ApiKey string `json:"api_key";orm:"column(api_key);size(255)"`
ApiKeyId string `json:"api_key_id";orm:"column(api_key_id);size(255)"` ApiKeyId string `json:"api_key_id";orm:"column(api_key_id);size(255)"`
...@@ -27,7 +27,7 @@ type ApiKey struct { ...@@ -27,7 +27,7 @@ type ApiKey struct {
} }
type JwtToken struct { type JwtToken struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Name string `json:"name,omitempty";orm:"column(name)"` Name string `json:"name,omitempty";orm:"column(name)"`
JwtCredential string `json:"jwt_credential,omitempty";orm:"column(jwt_credential)"` JwtCredential string `json:"jwt_credential,omitempty";orm:"column(jwt_credential)"`
JwtToken string `json:"jwt_token";orm:"column(jwt_token)"` JwtToken string `json:"jwt_token";orm:"column(jwt_token)"`
......
...@@ -210,7 +210,7 @@ type ChargeRequest struct { ...@@ -210,7 +210,7 @@ type ChargeRequest struct {
} }
type ChargeRecord struct { type ChargeRecord struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
UserId int `json:"user_id";orm:"column(user_id)"` UserId int `json:"user_id";orm:"column(user_id)"`
Amount int64 `json:"amount";orm:"column(amount);size(7)"` Amount int64 `json:"amount";orm:"column(amount);size(7)"`
PayMethod int `json:"pay_method";orm:"column(pay_method);size(1)"` PayMethod int `json:"pay_method";orm:"column(pay_method);size(1)"`
......
...@@ -32,16 +32,17 @@ type ExampleType struct { ...@@ -32,16 +32,17 @@ type ExampleType struct {
} }
type Category struct { type Category struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Desc string `json:"desc";orm:"column(desc);size(20)"` Desc string `json:"desc";orm:"column(desc);size(20)"`
EnDesc string `json:"en_desc";orm:"column(en_desc);size(20)"` EnDesc string `json:"en_desc";orm:"column(en_desc);size(20)"`
Sort int `json:"sort";orm:"column(sort)"`
CreatedTime time.Time `json:"created_time";orm:"column(created_time);type(datetime)"` CreatedTime time.Time `json:"created_time";orm:"column(created_time);type(datetime)"`
UpdatedTime time.Time `json:"updated_time";orm:"column(updated_time);type(datetime)"` UpdatedTime time.Time `json:"updated_time";orm:"column(updated_time);type(datetime)"`
Deleted int `json:"deleted";orm:"column(deleted);size(1)"` Deleted int `json:"deleted";orm:"column(deleted);size(1)"`
} }
type Computility struct { type Computility struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Model string `json:"model";orm:"column(model)"` Model string `json:"model";orm:"column(model)"`
Series string `json:"series";orm:"column(series)"` Series string `json:"series";orm:"column(series)"`
Cuda string `json:"cuda";orm:"column(cuda)"` Cuda string `json:"cuda";orm:"column(cuda)"`
...@@ -56,7 +57,7 @@ type Computility struct { ...@@ -56,7 +57,7 @@ type Computility struct {
} }
type TaskType struct { type TaskType struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Name string `json:"name";orm:"column(name);size(20)"` Name string `json:"name";orm:"column(name);size(20)"`
Version string `json:"version,omitempty";orm:"column(version)"` Version string `json:"version,omitempty";orm:"column(version)"`
Desc string `json:"desc";orm:"column(desc);size(20)"` Desc string `json:"desc";orm:"column(desc);size(20)"`
...@@ -93,7 +94,7 @@ type TaskType struct { ...@@ -93,7 +94,7 @@ type TaskType struct {
} }
type NewTaskType struct { type NewTaskType struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Name string `json:"name";orm:"column(desc)"` Name string `json:"name";orm:"column(desc)"`
BaseModel string `json:"base_model";orm:"column(desc)"` BaseModel string `json:"base_model";orm:"column(desc)"`
Model string `json:"model";orm:"column(model)"` Model string `json:"model";orm:"column(model)"`
...@@ -133,7 +134,7 @@ type NewTaskType struct { ...@@ -133,7 +134,7 @@ type NewTaskType struct {
} }
type Model struct { type Model struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Tit string `json:"tit";orm:"column(tit);size(20)"` Tit string `json:"tit";orm:"column(tit);size(20)"`
Version string `json:"version,omitempty";orm:"column(version)"` Version string `json:"version,omitempty";orm:"column(version)"`
Content string `json:"content";orm:"column(content);size(20)"` Content string `json:"content";orm:"column(content);size(20)"`
......
...@@ -40,7 +40,7 @@ type LoginRequest struct { ...@@ -40,7 +40,7 @@ type LoginRequest struct {
} }
type UserLevel struct { type UserLevel struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
Desc string `json:"desc";orm:"column(desc);size(20)"` Desc string `json:"desc";orm:"column(desc);size(20)"`
CreditQuota int64 `json:"credit_quota";orm:"column(credit_quota)"` CreditQuota int64 `json:"credit_quota";orm:"column(credit_quota)"`
FreeCallCountDay int `json:"free_call_count_day";orm:"column(free_call_count_day)"` FreeCallCountDay int `json:"free_call_count_day";orm:"column(free_call_count_day)"`
...@@ -62,7 +62,7 @@ type UserLevel struct { ...@@ -62,7 +62,7 @@ type UserLevel struct {
} }
type UserLevelTaskType struct { type UserLevelTaskType struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
FreeCallCountDay int `json:"free_call_count_day"orm:"column(free_call_count_day)"` FreeCallCountDay int `json:"free_call_count_day"orm:"column(free_call_count_day)"`
FreeCallCountMonth int `json:"free_call_count_month"orm:"column(free_call_count_month)"` FreeCallCountMonth int `json:"free_call_count_month"orm:"column(free_call_count_month)"`
FreeCallCountYear int `json:"free_call_count_year"orm:"column(free_call_count_year)"` FreeCallCountYear int `json:"free_call_count_year"orm:"column(free_call_count_year)"`
......
...@@ -3,7 +3,7 @@ package models ...@@ -3,7 +3,7 @@ package models
import "time" import "time"
type Whitelist struct { type Whitelist struct {
Id int `orm:"column(id);auto"` Id int `json:"id";orm:"column(id);auto"`
ProfitAddress string `json:"profit_address";orm:"column(profit_address)"` ProfitAddress string `json:"profit_address";orm:"column(profit_address)"`
NodeNum int `json:"node_num";orm:"column(node_num)"` NodeNum int `json:"node_num";orm:"column(node_num)"`
CreatedTime time.Time `json:"created_time";orm:"column(created_time);type(datetime)"` CreatedTime time.Time `json:"created_time";orm:"column(created_time);type(datetime)"`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment