1

deployment/cm.sh

@@ -20,4 +20,4 @@ docker rmi registry.cn-shenzhen.aliyuncs.com/construction_management/constructio
 docker pull registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest 
 
 
-docker run  --name construction_management --env DEBUG=$1 -v /etc/localtime:/etc/localtime -p 2020:6060 -d --restart always registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest
+docker run  --name construction_management --env DEBUG=$1 -v /etc/localtime:/etc/localtime -p 2020:6060 -d --restart always registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest

deployment/cm_uat.sh

@@ -10,22 +10,15 @@
 # 	        registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest
 
 # 
-docker image inspect construction_management
-if [ $? -ne 0 ];
-then
-  echo "construction_management is not existed"
-else
-    docker stop construction_management
-    docker rm construction_management
-    docker rmi registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management
-fi
+docker stop construction_management
 
+docker rm construction_management
 
+docker rmi registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management
 
 
 
-docker pull registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:prod 
+docker pull registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest 
 
 
-#docker run  --name construction_management -v /etc/localtime:/etc/localtime -p 2020:6060 -d --restart always registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:prod
-docker run  --name cm_uat --env DEBUG=$1 -v /etc/localtime:/etc/localtime -p 2020:6070 -d --restart always registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:prod
+docker run  --name construction_management --env DEBUG=$1 -v /etc/localtime:/etc/localtime -p 2030:6060 -d --restart always registry.cn-shenzhen.aliyuncs.com/construction_management/construction_management:latest

lib/jlzf.go

@@ -50,7 +50,7 @@ func NewJlzf() *Jlzf {
 	if debug == "qa" {
 		AuthUrl = "http://192.168.1.76:7002"
 	} else if debug == "uat" {
-		AuthUrl = "https://jluat.smartcost.com.cn"
+		AuthUrl = "http://jluat.smartcost.com.cn"
 	}
 	return &Jlzf{
 		AuthUrl: AuthUrl,

web/external/jl_ex.go

@@ -116,7 +116,7 @@ func (c *JlEx) PostAuthLogin() {
 	if debug == "qa" {
 		AuthUrl = "http://jlqa.smartcost.com.cn:7002"
 	} else if debug == "uat" {
-		AuthUrl = "https://jluat.smartcost.com.cn"
+		AuthUrl = "http://jluat.smartcost.com.cn"
 	}
 
 	// 1.获得数据