llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-24 08:20:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: wrong sub return and docker-compose boolean value error. (#375)

Browse Source 
* fix: wrong sub return

Signed-off-by: 0x2a <stevesough@gmail.com>

* fix: yaml bool value must be enclosed in quotes

Signed-off-by: 0x2a <stevesough@gmail.com>
This commit is contained in:
Steve0x2a 2021-12-16 11:10:25 +08:00 committed by GitHub
parent 98f6cc0085
commit 2f70e77e53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/conf.go
View File

@ -25,7 +25,7 @@ func GetBeegoConfDataSourceName() string {
dataSourceName := beego.AppConfig.String("dataSourceName") dataSourceName := beego.AppConfig.String("dataSourceName")
runningInDocker := os.Getenv("RUNNING_IN_DOCKER") runningInDocker := os.Getenv("RUNNING_IN_DOCKER")
if runningInDocker != "" { if runningInDocker == "true" {
dataSourceName = strings.ReplaceAll(dataSourceName, "localhost", "host.docker.internal") dataSourceName = strings.ReplaceAll(dataSourceName, "localhost", "host.docker.internal")
} }

2
controllers/account.go
View File

@ -220,7 +220,7 @@ func (c *ApiController) GetAccount() {
organization := object.GetMaskedOrganization(object.GetOrganizationByUser(user)) organization := object.GetMaskedOrganization(object.GetOrganizationByUser(user))
resp := Response{ resp := Response{
Status: "ok", Status: "ok",
Sub: userId, Sub: user.Id,
Data: user, Data: user,
Data2: organization, Data2: organization,
} }

2
docker-compose.yml
View File

@ -9,7 +9,7 @@ services:
depends_on: depends_on:
- db - db
environment: environment:
RUNNING_IN_DOCKER: true RUNNING_IN_DOCKER: "true"
volumes: volumes:
- ./conf:/conf/ - ./conf:/conf/
db: db: