allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 9a160cdddf2713a5b4812c52d43afcc4772edcfe 2 个父辈 619c2ce6 4a45ce45

合并分支 'dev' 到 'test' 

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



查看合并请求 !65
内嵌 并排对比
正在显示 8 个修改的文件 包含 39 行增加 和 4 行删除
@@ -11,6 +11,11 @@ @@ -11,6 +11,11 @@
11 - [APP端原型地址](https://9cnuol.axshare.com/) 11 - [APP端原型地址](https://9cnuol.axshare.com/)
12 - [WEB端原型地址](https://eq4yc2.axshare.com/) 12 - [WEB端原型地址](https://eq4yc2.axshare.com/)
13 13
  14 +## 开发环境服务地址
  15 +- [后端地址](http://allied-creation-cooperation-dev.fjmaimaimai.com/)
  16 +- [前端地址](http://allied-creation-standard-dev.fjmaimaimai.com/)
  17 +- [H5地址(app)](http://allied-creation-h5-dev.fjmaimaimai.com)
  18 +
14 ## 项目规范 19 ## 项目规范
15 - 领域描述语言文档位置：document/allied-creation-cooperation/ 20 - 领域描述语言文档位置：document/allied-creation-cooperation/
16 - GIT流程：里程碑->问题->功能分支->代码审查->合并分支 21 - GIT流程：里程碑->问题->功能分支->代码审查->合并分支
@@ -62,6 +62,8 @@ spec: @@ -62,6 +62,8 @@ spec:
62 value: "1" 62 value: "1"
63 - name: ERROR_BASE_CODE_MULTIPLE 63 - name: ERROR_BASE_CODE_MULTIPLE
64 value: "1000" 64 value: "1000"
  65 + - name: ENABLE_HTTPS
  66 + value: "true"
65 - name: ENABLE_KAFKA_LOG 67 - name: ENABLE_KAFKA_LOG
66 value: "false" 68 value: "false"
67 - name: USER_MODULE_HOST 69 - name: USER_MODULE_HOST
@@ -54,6 +54,8 @@ spec: @@ -54,6 +54,8 @@ spec:
54 env: 54 env:
55 - name: LOG_LEVEL 55 - name: LOG_LEVEL
56 value: "debug" 56 value: "debug"
  57 + - name: ENABLE_HTTPS
  58 + value: "true"
57 - name: ERROR_BASE_CODE 59 - name: ERROR_BASE_CODE
58 value: "1" 60 value: "1"
59 - name: ERROR_BASE_CODE_MULTIPLE 61 - name: ERROR_BASE_CODE_MULTIPLE
@@ -66,6 +66,8 @@ spec: @@ -66,6 +66,8 @@ spec:
66 value: "1" 66 value: "1"
67 - name: ERROR_BASE_CODE_MULTIPLE 67 - name: ERROR_BASE_CODE_MULTIPLE
68 value: "1000" 68 value: "1000"
  69 + - name: ENABLE_HTTPS
  70 + value: "true"
69 - name: ENABLE_KAFKA_LOG 71 - name: ENABLE_KAFKA_LOG
70 value: "false" 72 value: "false"
71 - name: USER_MODULE_HOST 73 - name: USER_MODULE_HOST
@@ -17,6 +17,10 @@ var USER_MODULE_HOST = "http://127.0.0.1:8081" @@ -17,6 +17,10 @@ var USER_MODULE_HOST = "http://127.0.0.1:8081"
17 // BASIC_MODULE_HOST 基础服务模块 17 // BASIC_MODULE_HOST 基础服务模块
18 var BASIC_MODULE_HOST = "http://127.0.0.1:8080" 18 var BASIC_MODULE_HOST = "http://127.0.0.1:8080"
19 19
  20 +
  21 +// ENABLE_HTTPS 是否开启https访问
  22 +var ENABLE_HTTPS = "false"
  23 +
20 func init() { 24 func init() {
21 if os.Getenv("LOG_TYPE") != "" { 25 if os.Getenv("LOG_TYPE") != "" {
22 LOG_TYPE = os.Getenv("LOG_TYPE") 26 LOG_TYPE = os.Getenv("LOG_TYPE")
@@ -39,4 +43,7 @@ func init() { @@ -39,4 +43,7 @@ func init() {
39 if os.Getenv("BASIC_MODULE_HOST") != "" { 43 if os.Getenv("BASIC_MODULE_HOST") != "" {
40 BASIC_MODULE_HOST = os.Getenv("BASIC_MODULE_HOST") 44 BASIC_MODULE_HOST = os.Getenv("BASIC_MODULE_HOST")
41 } 45 }
  46 + if os.Getenv("ENABLE_HTTPS") != "" {
  47 + ENABLE_HTTPS = os.Getenv("ENABLE_HTTPS")
  48 + }
42 } 49 }
@@ -32,7 +32,16 @@ func init() { @@ -32,7 +32,16 @@ func init() {
32 } 32 }
33 } 33 }
34 //https支持 34 //https支持
  35 + if os.Getenv("ENABLE_HTTPS") != "" {
  36 + enableHTTPS := os.Getenv("ENABLE_HTTPS")
  37 + if enableHTTPS == "true" {
  38 + web.BConfig.Listen.EnableHTTPS = true
  39 + } else {
35 web.BConfig.Listen.EnableHTTPS = false 40 web.BConfig.Listen.EnableHTTPS = false
  41 + }
  42 + } else {
  43 + web.BConfig.Listen.EnableHTTPS = false
  44 + }
36 web.BConfig.Listen.HTTPSPort = 443 45 web.BConfig.Listen.HTTPSPort = 443
37 web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt" 46 web.BConfig.Listen.HTTPSCertFile = "./config/fjmaimaimai.com_bundle.crt"
38 web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key" 47 web.BConfig.Listen.HTTPSKeyFile = "./config/fjmaimaimai.com.key"
@@ -55,14 +55,18 @@ func (controller *CooperationProjectController) GetCooperationProject() { @@ -55,14 +55,18 @@ func (controller *CooperationProjectController) GetCooperationProject() {
55 cooperationProjectService := service.NewCooperationProjectService(nil) 55 cooperationProjectService := service.NewCooperationProjectService(nil)
56 getCooperationProjectQuery := &query.GetCooperationProjectQuery{} 56 getCooperationProjectQuery := &query.GetCooperationProjectQuery{}
57 header := controller.GetRequestHeader(controller.Ctx) 57 header := controller.GetRequestHeader(controller.Ctx)
58 - getCooperationProjectQuery.CompanyId = header.CompanyId  
59 - getCooperationProjectQuery.OrgId = header.OrgId 58 + //getCooperationProjectQuery.CompanyId = header.CompanyId
  59 + //getCooperationProjectQuery.OrgId = header.OrgId
60 getCooperationProjectQuery.UserId = header.UserId 60 getCooperationProjectQuery.UserId = header.UserId
61 getCooperationProjectQuery.UserBaseId = header.UserBaseId 61 getCooperationProjectQuery.UserBaseId = header.UserBaseId
62 cooperationProjectId, _ := controller.GetInt64(":cooperationProjectId") 62 cooperationProjectId, _ := controller.GetInt64(":cooperationProjectId")
63 getCooperationProjectQuery.CooperationProjectId = cooperationProjectId 63 getCooperationProjectQuery.CooperationProjectId = cooperationProjectId
64 cooperationProjectNumber := controller.GetString("cooperationProjectNumber") 64 cooperationProjectNumber := controller.GetString("cooperationProjectNumber")
65 getCooperationProjectQuery.CooperationProjectNumber = cooperationProjectNumber 65 getCooperationProjectQuery.CooperationProjectNumber = cooperationProjectNumber
  66 + companyId, _ := controller.GetInt64("companyId")
  67 + getCooperationProjectQuery.CompanyId = companyId
  68 + orgId, _ := controller.GetInt64("orgId")
  69 + getCooperationProjectQuery.OrgId = orgId
66 data, err := cooperationProjectService.GetCooperationProject(getCooperationProjectQuery) 70 data, err := cooperationProjectService.GetCooperationProject(getCooperationProjectQuery)
67 controller.Response(data, err) 71 controller.Response(data, err)
68 } 72 }
@@ -55,14 +55,18 @@ func (controller *DividendsOrderController) GetDividendsOrder() { @@ -55,14 +55,18 @@ func (controller *DividendsOrderController) GetDividendsOrder() {
55 dividendsOrderService := service.NewDividendsOrderService(nil) 55 dividendsOrderService := service.NewDividendsOrderService(nil)
56 getDividendsOrderQuery := &query.GetDividendsOrderQuery{} 56 getDividendsOrderQuery := &query.GetDividendsOrderQuery{}
57 header := controller.GetRequestHeader(controller.Ctx) 57 header := controller.GetRequestHeader(controller.Ctx)
58 - getDividendsOrderQuery.CompanyId = header.CompanyId  
59 - getDividendsOrderQuery.OrgId = header.OrgId 58 + //getDividendsOrderQuery.CompanyId = header.CompanyId
  59 + //getDividendsOrderQuery.OrgId = header.OrgId
60 getDividendsOrderQuery.UserId = header.UserId 60 getDividendsOrderQuery.UserId = header.UserId
61 getDividendsOrderQuery.UserBaseId = header.UserBaseId 61 getDividendsOrderQuery.UserBaseId = header.UserBaseId
62 dividendsOrderId, _ := controller.GetInt64(":dividendsOrderId") 62 dividendsOrderId, _ := controller.GetInt64(":dividendsOrderId")
63 getDividendsOrderQuery.DividendsOrderId = dividendsOrderId 63 getDividendsOrderQuery.DividendsOrderId = dividendsOrderId
64 dividendsOrderNumber := controller.GetString("dividendsOrderNumber") 64 dividendsOrderNumber := controller.GetString("dividendsOrderNumber")
65 getDividendsOrderQuery.DividendsOrderNumber = dividendsOrderNumber 65 getDividendsOrderQuery.DividendsOrderNumber = dividendsOrderNumber
  66 + companyId, _ := controller.GetInt64("companyId")
  67 + getDividendsOrderQuery.CompanyId = companyId
  68 + orgId, _ := controller.GetInt64("orgId")
  69 + getDividendsOrderQuery.OrgId = orgId
66 data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery) 70 data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery)
67 controller.Response(data, err) 71 controller.Response(data, err)
68 } 72 }