正在显示
4 个修改的文件
包含
4 行增加
和
4 行删除
@@ -7,6 +7,8 @@ ENV APP_DIR $GOPATH/src/oppmg | @@ -7,6 +7,8 @@ ENV APP_DIR $GOPATH/src/oppmg | ||
7 | # RUN CGO_ENABLED=0 go install -a std | 7 | # RUN CGO_ENABLED=0 go install -a std |
8 | 8 | ||
9 | RUN mkdir -p $APP_DIR | 9 | RUN mkdir -p $APP_DIR |
10 | +RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \ | ||
11 | + && echo 'Asia/Shanghai' > /etc/timezone | ||
10 | # Set the entrypoint | 12 | # Set the entrypoint |
11 | #ENTRYPOINT (cd $APP_DIR && ./\src\oppmg) | 13 | #ENTRYPOINT (cd $APP_DIR && ./\src\oppmg) |
12 | ADD . $APP_DIR | 14 | ADD . $APP_DIR |
@@ -324,7 +324,7 @@ func (c *CompanyController) UserAllowForbid() { | @@ -324,7 +324,7 @@ func (c *CompanyController) UserAllowForbid() { | ||
324 | c.ResposeJson(msg) | 324 | c.ResposeJson(msg) |
325 | }() | 325 | }() |
326 | type Parameter struct { | 326 | type Parameter struct { |
327 | - UserCompanyIds []int64 `json:"ids"` | 327 | + UserCompanyIds []int64 `json:"user_company_ids"` |
328 | Status int `json:"status"` // [1:执行禁用操作][2:执行启用操作] | 328 | Status int `json:"status"` // [1:执行禁用操作][2:执行启用操作] |
329 | } | 329 | } |
330 | var param Parameter | 330 | var param Parameter |
@@ -213,7 +213,6 @@ func LoginAuthByUCenter(account, password string) (protocol.LoginAuthToken, erro | @@ -213,7 +213,6 @@ func LoginAuthByUCenter(account, password string) (protocol.LoginAuthToken, erro | ||
213 | return logintoken, protocol.NewErrWithMessage("10021") | 213 | return logintoken, protocol.NewErrWithMessage("10021") |
214 | } | 214 | } |
215 | //更新用户数据 | 215 | //更新用户数据 |
216 | - _ = uclientReturn | ||
217 | userdata.Accid = uclientReturn.Data.Accid | 216 | userdata.Accid = uclientReturn.Data.Accid |
218 | userdata.Icon = uclientReturn.Data.Avatar | 217 | userdata.Icon = uclientReturn.Data.Avatar |
219 | userdata.ImToken = uclientReturn.Data.Imtoken | 218 | userdata.ImToken = uclientReturn.Data.Imtoken |
@@ -43,8 +43,7 @@ func InitCompanyInfo(centerCompany protocol.CenterCompanyInfo) error { | @@ -43,8 +43,7 @@ func InitCompanyInfo(centerCompany protocol.CenterCompanyInfo) error { | ||
43 | // return protocol.NewErrWithMessage("10051") | 43 | // return protocol.NewErrWithMessage("10051") |
44 | // } | 44 | // } |
45 | var ( | 45 | var ( |
46 | - newDeparment *models.Department | ||
47 | - //newUserDepart = &models.UserDepartment{} | 46 | + newDeparment *models.Department |
48 | newRoleGroup *models.Role | 47 | newRoleGroup *models.Role |
49 | newRole *models.Role | 48 | newRole *models.Role |
50 | newUser *models.User | 49 | newUser *models.User |
-
请 注册 或 登录 后发表评论