From 2f70e77e53f4ad111d121647cdb0a2780320584c Mon Sep 17 00:00:00 2001
From: Steve0x2a <stevesough@gmail.com>
Date: Thu, 16 Dec 2021 11:10:25 +0800
Subject: [PATCH] fix: wrong sub return and docker-compose boolean value error.
 (#375)

* 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>
---
 conf/conf.go           | 2 +-
 controllers/account.go | 2 +-
 docker-compose.yml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/conf/conf.go b/conf/conf.go
index c9d06ada..c49a9dd6 100644
--- a/conf/conf.go
+++ b/conf/conf.go
@@ -25,7 +25,7 @@ func GetBeegoConfDataSourceName() string {
 	dataSourceName := beego.AppConfig.String("dataSourceName")
 
 	runningInDocker := os.Getenv("RUNNING_IN_DOCKER")
-	if runningInDocker != "" {
+	if runningInDocker == "true" {
 		dataSourceName = strings.ReplaceAll(dataSourceName, "localhost", "host.docker.internal")
 	}
 
diff --git a/controllers/account.go b/controllers/account.go
index ea79e9a2..a7e99887 100644
--- a/controllers/account.go
+++ b/controllers/account.go
@@ -220,7 +220,7 @@ func (c *ApiController) GetAccount() {
 	organization := object.GetMaskedOrganization(object.GetOrganizationByUser(user))
 	resp := Response{
 		Status: "ok",
-		Sub:    userId,
+		Sub:    user.Id,
 		Data:   user,
 		Data2:  organization,
 	}
diff --git a/docker-compose.yml b/docker-compose.yml
index e5aba86c..9d30cb7c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     depends_on:
       - db
     environment:
-      RUNNING_IN_DOCKER: true
+      RUNNING_IN_DOCKER: "true"
     volumes:
       - ./conf:/conf/
   db: