合并分支 'dev' 到 'test'

fix:修复根据项目编号、订单编号获取详情数据权限



查看合并请求 !65

@@ -11,6 +11,11 @@
 - [APP端原型地址](https://9cnuol.axshare.com/)
 - [WEB端原型地址](https://eq4yc2.axshare.com/)
 
+## 开发环境服务地址
+- [后端地址](http://allied-creation-cooperation-dev.fjmaimaimai.com/)
+- [前端地址](http://allied-creation-standard-dev.fjmaimaimai.com/)
+- [H5地址(app)](http://allied-creation-h5-dev.fjmaimaimai.com)
+
 ## 项目规范
 - 领域描述语言文档位置：document/allied-creation-cooperation/
 - GIT流程：里程碑->问题->功能分支->代码审查->合并分支

@@ -62,6 +62,8 @@ spec:
           value: "1"
         - name: ERROR_BASE_CODE_MULTIPLE
           value: "1000"
+        - name: ENABLE_HTTPS
+          value: "true"
         - name: ENABLE_KAFKA_LOG
           value: "false"
         - name: USER_MODULE_HOST

@@ -54,6 +54,8 @@ spec:
         env:
         - name: LOG_LEVEL
           value: "debug"
+        - name: ENABLE_HTTPS
+          value: "true"
         - name: ERROR_BASE_CODE
           value: "1"
         - name: ERROR_BASE_CODE_MULTIPLE

@@ -66,6 +66,8 @@ spec:
           value: "1"
         - name: ERROR_BASE_CODE_MULTIPLE
           value: "1000"
+        - name: ENABLE_HTTPS
+          value: "true"
         - name: ENABLE_KAFKA_LOG
           value: "false"
         - name: USER_MODULE_HOST

@@ -17,6 +17,10 @@ var USER_MODULE_HOST = "http://127.0.0.1:8081"
 // BASIC_MODULE_HOST 基础服务模块
 var BASIC_MODULE_HOST = "http://127.0.0.1:8080"
 
+
+// ENABLE_HTTPS 是否开启https访问
+var ENABLE_HTTPS = "false"
+
 func init() {
 	if os.Getenv("LOG_TYPE") != "" {
 		LOG_TYPE = os.Getenv("LOG_TYPE")
@@ -39,4 +43,7 @@ func init() {
 	if os.Getenv("BASIC_MODULE_HOST") != "" {
 		BASIC_MODULE_HOST = os.Getenv("BASIC_MODULE_HOST")
 	}
+	if os.Getenv("ENABLE_HTTPS") != "" {
+		ENABLE_HTTPS = os.Getenv("ENABLE_HTTPS")
+	}
 }

@@ -32,7 +32,16 @@ func init() {
 		}
 	}
 	//https支持
-	web.BConfig.Listen.EnableHTTPS = false
+	if os.Getenv("ENABLE_HTTPS") != "" {
+		enableHTTPS := os.Getenv("ENABLE_HTTPS")
+		if enableHTTPS == "true" {
+			web.BConfig.Listen.EnableHTTPS = true
+		} else {
+			web.BConfig.Listen.EnableHTTPS = false
+		}
+	} else {
+		web.BConfig.Listen.EnableHTTPS = false
+	}
 	web.BConfig.Listen.HTTPSPort = 443
 	web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt"
 	web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key"

@@ -55,14 +55,18 @@ func (controller *CooperationProjectController) GetCooperationProject() {
 	cooperationProjectService := service.NewCooperationProjectService(nil)
 	getCooperationProjectQuery := &query.GetCooperationProjectQuery{}
 	header := controller.GetRequestHeader(controller.Ctx)
-	getCooperationProjectQuery.CompanyId = header.CompanyId
-	getCooperationProjectQuery.OrgId = header.OrgId
+	//getCooperationProjectQuery.CompanyId = header.CompanyId
+	//getCooperationProjectQuery.OrgId = header.OrgId
 	getCooperationProjectQuery.UserId = header.UserId
 	getCooperationProjectQuery.UserBaseId = header.UserBaseId
 	cooperationProjectId, _ := controller.GetInt64(":cooperationProjectId")
 	getCooperationProjectQuery.CooperationProjectId = cooperationProjectId
 	cooperationProjectNumber := controller.GetString("cooperationProjectNumber")
 	getCooperationProjectQuery.CooperationProjectNumber = cooperationProjectNumber
+	companyId, _ := controller.GetInt64("companyId")
+	getCooperationProjectQuery.CompanyId = companyId
+	orgId, _ := controller.GetInt64("orgId")
+	getCooperationProjectQuery.OrgId = orgId
 	data, err := cooperationProjectService.GetCooperationProject(getCooperationProjectQuery)
 	controller.Response(data, err)
 }

@@ -55,14 +55,18 @@ func (controller *DividendsOrderController) GetDividendsOrder() {
 	dividendsOrderService := service.NewDividendsOrderService(nil)
 	getDividendsOrderQuery := &query.GetDividendsOrderQuery{}
 	header := controller.GetRequestHeader(controller.Ctx)
-	getDividendsOrderQuery.CompanyId = header.CompanyId
-	getDividendsOrderQuery.OrgId = header.OrgId
+	//getDividendsOrderQuery.CompanyId = header.CompanyId
+	//getDividendsOrderQuery.OrgId = header.OrgId
 	getDividendsOrderQuery.UserId = header.UserId
 	getDividendsOrderQuery.UserBaseId = header.UserBaseId
 	dividendsOrderId, _ := controller.GetInt64(":dividendsOrderId")
 	getDividendsOrderQuery.DividendsOrderId = dividendsOrderId
 	dividendsOrderNumber := controller.GetString("dividendsOrderNumber")
 	getDividendsOrderQuery.DividendsOrderNumber = dividendsOrderNumber
+	companyId, _ := controller.GetInt64("companyId")
+	getDividendsOrderQuery.CompanyId = companyId
+	orgId, _ := controller.GetInt64("orgId")
+	getDividendsOrderQuery.OrgId = orgId
 	data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery)
 	controller.Response(data, err)
 }