Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

@@ -170,6 +170,7 @@ func (srv CompanyStatisticsService) CooperationPersonStatistics(cmd *command.Coo
 		cmd.Operator)
 		cmd.Operator)
 	cooperationUserModeStatistics, err := gateway.CooperationStatistics(allied_creation_cooperation.CooperationUserModeStatistics, map[string]interface{}{
 	cooperationUserModeStatistics, err := gateway.CooperationStatistics(allied_creation_cooperation.CooperationUserModeStatistics, map[string]interface{}{
 		"userId": cmd.UserId,
 		"userId": cmd.UserId,
+		"orgId":  cmd.Operator.OrgId,
 	})
 	})
 	if err != nil {
 	if err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())

@@ -37,6 +37,12 @@ func init() {
 	web.BConfig.Listen.HTTPSPort = 443
 	web.BConfig.Listen.HTTPSPort = 443
 	web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt"
 	web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt"
 	web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key"
 	web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key"
+	if os.Getenv("HTTPS_PORT") != "" {
+		portStr := os.Getenv("HTTPS_PORT")
+		if port, err := strconv.Atoi(portStr); err == nil {
+			web.BConfig.Listen.HTTPSPort = port
+		}
+	}
 
 
 	filters.SecureKeyMap["token"] = "x-mmm-accesstoken"
 	filters.SecureKeyMap["token"] = "x-mmm-accesstoken"
 	web.InsertFilter("/*", web.BeforeRouter, filters.AllowCors())
 	web.InsertFilter("/*", web.BeforeRouter, filters.AllowCors())