导出

src/dashoo.cn/backend/api/business/workflow/ActivitiService.go

@@ -33,11 +33,11 @@ func GetActivitiService(xormEngine *xorm.Engine) *ActivitiService {
 	s.DBE = xormEngine
 	//s.BaseUrl = "http://123.56.168.26:8080/activiti-rest/service"
 	//s.BaseUrl = "http://192.168.0.120:8081/api/acti"
-	s.BaseUrl = "http://localhost:8080/acti-api/api/acti"
+	s.BaseUrl = utils.Cfg.MustValue("workflow", "BaseUrl")
 	//s.BaseUrl = "http://localhost:8081/api/acti"
-	s.AposeUrl = "http://localhost:8080/acti-api/api/apose"
+	s.AposeUrl = utils.Cfg.MustValue("workflow", "AposeUrl")
 	//s.OriginUrl = "http://192.168.0.120:8081/api"
-	s.OriginUrl = "http://localhost:8080/acti-api/api"
+	s.OriginUrl = utils.Cfg.MustValue("workflow", "OriginUrl")
 	//s.AposeUrl = "http://192.168.0.120:8081/api/apose"
 	//s.AposeUrl = "http://192.168.0.171:8081/api/apose"
 	s.Username = "leader"

src/dashoo.cn/backend/api/conf/app.conf

@@ -73,6 +73,9 @@ domain=oil_supplier
 
 [workflow]
 callbackHost=http://36dcae10.ngrok.io
-goodsModuleHost=http://10.76.248.23/upfile/dc1/6,013f668850dd
-basisModuleHost=http://10.76.248.23/upfile/dc1/3,013d0a64349e
-techModuleHost=http://10.76.248.23/upfile/dc1/1,013e04254881
+goodsModuleHost=http://weed1.labsop.cn:9390/1,248318341f7c
+basisModuleHost=http://weed1.labsop.cn:9390/5,2479ad04d28b
+techModuleHost=http://weed1.labsop.cn:9390/2,247af827d5ac
+OriginUrl=http://47.92.212.59:8080/acti-api/api
+AposeUrl=http://47.92.212.59:8080/acti-api/api/apose
+BaseUrl=http://47.92.212.59:8080/acti-api/api/acti

src/dashoo.cn/frontend_web/src/pages/select/companyselect/index.vue

@@ -885,7 +885,12 @@ export default {
               message: res.data.message
             })
             let docurl = res.data.item
-            location.href = 'http://' + docurl
+            // 内网服务器专用
+            if (process.client) {
+              const myDomain = window.location.host
+              location.href = 'http://' + myDomain + '/' + docurl
+            }
+            // location.href = 'http://' + docurl
           }
         }).catch(err => {
           console.error(err)