mmm-go / oppmg · 提交

转到一个项目

作者 唐旭辉
提交 4798f4a3badad5c4ed35346a54689366aa249c65 1 个父辈 35f36a3c

配置修改

内嵌 并排对比
正在显示 10 个修改的文件 包含 443 行增加 和 7 行删除
package config
import (
"fmt"
"github.com/astaxie/beego"
)
... ... @@ -20,9 +22,17 @@ type MyConfig struct {
var MConfig *MyConfig
func RestMyConfig() *MyConfig {
mysqlHost := beego.AppConfig.String("mysql_host")
mysqlPort := beego.AppConfig.String("mysql_port")
mysqlUser := beego.AppConfig.String("mysql_user")
mysqlPassword := beego.AppConfig.String("mysql_password")
mysqlDBname := beego.AppConfig.String("mysql_db_name")
sqlconn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s",
mysqlUser, mysqlPassword, mysqlHost, mysqlPort, mysqlDBname)
sqlconn = sqlconn + "?charset=utf8&loc=Asia%2FShanghai"
MConfig = &MyConfig{
ConfigName: beego.AppConfig.String("config_name"),
SqlConn: beego.AppConfig.String("sqlconn"),
SqlConn: sqlconn,
RedisAddPort: beego.AppConfig.String("redis_add_port"),
RedisAuth: beego.AppConfig.DefaultString("redis_auth", ""),
RedisDB: beego.AppConfig.DefaultString("redis_db", "0"),
... ... @@ -30,6 +40,5 @@ func RestMyConfig() *MyConfig {
LogFilename: beego.AppConfig.DefaultString("log_filename", "./log/ability.log"),
LogLevel: beego.AppConfig.DefaultString("log_Level", "debug"),
}
return MConfig
}
... ...
... ... @@ -10,14 +10,18 @@ AdminPort = 8088
#---自定义配置 开始----
##数据库连接
# sqlconn ="${MYSQL_CONN||root:root@tcp(127.0.0.1:3306)/opportunity_dev?charset=utf8}"
sqlconn ="${MYSQL_CONN||root:sutianxia2015@tcp(115.29.205.99:3306)/opportunity?charset=utf8&loc=Asia%2FShanghai}"
# sqlconn ="${MYSQL_CONN||root:sutianxia2015@tcp(115.29.205.99:3306)/opportunity?charset=utf8&loc=Asia%2FShanghai}"
mysql_user = "${MYSQL_USER||root}"
mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"
mysql_host = "${MYSQL_HOST||115.29.205.99}"
mysql_port = "${MYSQL_PORT||3306}"
mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
##redis相关配置
redis_add_port = "127.0.0.1:6379"
redis_auth = ""
##log相关配置
##out_put:"console","file"
log_output = "file"
log_filename = "${LOG_FILENAME||./log/ability.log}"
log_filename = "${aliyun_logs_access||./log/ability.log}"
log_level = "${LOG_LEVEL||debug}"
#---自定义配置 结束----
\ No newline at end of file
... ...
... ... @@ -10,7 +10,12 @@ AdminPort = 8088
#---自定义配置 开始----
#数据库连接
sqlconn = "root:root@tcp(127.0.0.1:3306)/ability_display?charset=utf8&loc=Asia%2FShanghai"
# sqlconn = "root:root@tcp(127.0.0.1:3306)/ability_display?charset=utf8&loc=Asia%2FShanghai"
mysql_user = "${MYSQL_USER||root}"
mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"
mysql_host = "${MYSQL_HOST||115.29.205.99}"
mysql_port = "${MYSQL_PORT||3306}"
mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
#redis相关配置
redis_add_port = "127.0.0.1:6379"
redis_auth = ""
... ...
... ... @@ -8,7 +8,12 @@ httpport = 8080
#---自定义配置 开始----
#数据库连接
sqlconn = "${MYSQL_CONN||root:sutianxia2015@tcp(115.29.205.99:3306)/opportunity?charset=utf8&loc=Asia%2FShanghai}"
# sqlconn = "${MYSQL_CONN||root:sutianxia2015@tcp(115.29.205.99:3306)/opportunity?charset=utf8&loc=Asia%2FShanghai}"
mysql_user = "${MYSQL_USER||root}"
mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"
mysql_host = "${MYSQL_HOST||115.29.205.99}"
mysql_port = "${MYSQL_PORT||3306}"
mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
#redis相关配置
redis_add_port = "127.0.0.1:6379"
redis_auth = ""
... ...
#!/bin/bash
export PATH=/root/local/bin:$PATH
kubectl -n mmm-suplus-dev get pods | grep -q oppmg
if [ "$?" == "1" ];then
kubectl create -f /tmp/dev/oppmgmg/oppmg.yaml --record
kubectl -n mmm-suplus-dev get svc | grep -q oppmg
if [ "$?" == "0" ];then
echo "oppmg service install success!"
else
echo "oppmg service install fail!"
fi
kubectl -n mmm-suplus-dev get pods | grep -q oppmg
if [ "$?" == "0" ];then
echo "oppmg deployment install success!"
else
echo "oppmg deployment install fail!"
fi
else
kubectl delete -f /tmp/dev/oppmg/oppmg.yaml
kubectl -n mmm-suplus-dev get svc | grep -q oppmg
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-dev get svc | grep -q oppmg
done
kubectl -n mmm-suplus-dev get pods | grep -q oppmg
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-dev get pods | grep -q oppmg
done
kubectl create -f /tmp/dev/oppmg/oppmg.yaml --record
kubectl -n mmm-suplus-dev get svc | grep -q oppmg
if [ "$?" == "0" ];then
echo "oppmg service update success!"
else
echo "oppmg service update fail!"
fi
kubectl -n mmm-suplus-dev get pods | grep -q oppmg
if [ "$?" == "0" ];then
echo "oppmg deployment update success!"
else
echo "oppmg deployment update fail!"
fi
fi
\ No newline at end of file
... ...
apiVersion: v1
kind: Service
metadata:
name: oppmg
namespace: mmm-suplus-dev
labels:
k8s-app: oppmg
spec:
ports:
- name: "http"
port: 80
targetPort: 8080
selector:
k8s-app: oppmg
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: oppmg
namespace: mmm-suplus-dev
labels:
k8s-app: oppmg
spec:
replicas: 1
template:
metadata:
labels:
k8s-app: oppmg
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- cn-hangzhou.i-bp1djh1xn7taumbue1ze
- cn-hangzhou.i-bp1djh1xn7taumbue1zd
- cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
- cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
containers:
- name: oppmg
image: 192.168.0.243:5000/mmm/oppmg:dev
imagePullPolicy: Always
ports:
- containerPort: 8080
volumeMounts:
- mountPath: /opt/logs
name: accesslogs
env:
- name: ENTERPRISE_SERVICE_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: service.enterprise
- name: MYSQL_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.host
- name: MYSQL_PORT
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.port
- name: MYSQL_USER
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.user
- name: MYSQL_PASSWORD
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.password
- name: MYSQL_DB_NAME
value: "opportunity_dev"
- name: LOG_LEVEL
value: "debug"
- name: RUN_MODE
value: "test"
- name: aliyun_logs_suplus
value: "stdout"
- name: aliyun_logs_access
value: "/opt/logs/oppmg.log"
volumes:
- name: accesslogs
emptyDir: {}
... ...
#!/bin/bash
export PATH=/root/local/bin:$PATH
kubectl -n mmm-suplus-prd get pods | grep -q opp
if [ "$?" == "1" ];then
kubectl create -f /tmp/prd/opp/opp.yaml --record
kubectl -n mmm-suplus-prd get svc | grep -q opp
if [ "$?" == "0" ];then
echo "opp service install success!"
else
echo "opp service install fail!"
fi
kubectl -n mmm-suplus-prd get pods | grep -q opp
if [ "$?" == "0" ];then
echo "opp deployment install success!"
else
echo "opp deployment install fail!"
fi
else
kubectl delete -f /tmp/prd/opp/opp.yaml
kubectl -n mmm-suplus-prd get svc | grep -q opp
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-prd get svc | grep -q opp
done
kubectl -n mmm-suplus-prd get pods | grep -q opp
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-prd get pods | grep -q opp
done
kubectl create -f /tmp/prd/opp/opp.yaml --record
kubectl -n mmm-suplus-prd get svc | grep -q opp
if [ "$?" == "0" ];then
echo "opp service update success!"
else
echo "opp service update fail!"
fi
kubectl -n mmm-suplus-prd get pods | grep -q opp
if [ "$?" == "0" ];then
echo "opp deployment update success!"
else
echo "opp deployment update fail!"
fi
fi
\ No newline at end of file
... ...
apiVersion: v1
kind: Service
metadata:
name: opp
namespace: mmm-suplus-prd
labels:
k8s-app: opp
spec:
ports:
- name: "http"
port: 80
targetPort: 8082
selector:
k8s-app: opp
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: opp
namespace: mmm-suplus-prd
labels:
k8s-app: opp
spec:
replicas: 1
template:
metadata:
labels:
k8s-app: opp
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- cn-hangzhou.i-bp1djh1xn7taumbue1ze
- cn-hangzhou.i-bp1djh1xn7taumbue1zd
- cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
- cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
containers:
- name: opp
image: 192.168.0.243:5000/mmm/opp:master
imagePullPolicy: Always
ports:
- containerPort: 8082
volumeMounts:
- mountPath: /opt/logs
name: accesslogs
env:
- name: ENTERPRISE_SERVICE_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: service.enterprise
- name: MYSQL_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.host
- name: MYSQL_PORT
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.port
- name: MYSQL_USER
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.user
- name: MYSQL_PASSWORD
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.password
- name: MYSQL_DB_NAME
value: "opp"
- name: LOG_LEVEL
value: "debug"
- name: ERROR_BASE_CODE
value: "9"
- name: ERROR_BASE_CODE_MULTIPLE
value: "1000"
- name: RUN_MODE
value: "prod"
- name: aliyun_logs_suplus
value: "stdout"
- name: aliyun_logs_access
value: "/opt/logs/app.log"
volumes:
- name: accesslogs
emptyDir: {}
\ No newline at end of file
... ...
#!/bin/bash
export PATH=/root/local/bin:$PATH
kubectl -n mmm-suplus-test get pods | grep -q opp
if [ "$?" == "1" ];then
kubectl create -f /tmp/test/opp/opp.yaml --record
kubectl -n mmm-suplus-test get svc | grep -q opp
if [ "$?" == "0" ];then
echo "opp service install success!"
else
echo "opp service install fail!"
fi
kubectl -n mmm-suplus-test get pods | grep -q opp
if [ "$?" == "0" ];then
echo "opp deployment install success!"
else
echo "opp deployment install fail!"
fi
else
kubectl delete -f /tmp/test/opp/opp.yaml
kubectl -n mmm-suplus-test get svc | grep -q opp
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-test get svc | grep -q opp
done
kubectl -n mmm-suplus-test get pods | grep -q opp
while [ "$?" == "0" ]
do
kubectl -n mmm-suplus-test get pods | grep -q opp
done
kubectl create -f /tmp/test/opp/opp.yaml --record
kubectl -n mmm-suplus-test get svc | grep -q opp
if [ "$?" == "0" ];then
echo "opp service update success!"
else
echo "opp service update fail!"
fi
kubectl -n mmm-suplus-test get pods | grep -q opp
if [ "$?" == "0" ];then
echo "opp deployment update success!"
else
echo "opp deployment update fail!"
fi
fi
\ No newline at end of file
... ...
apiVersion: v1
kind: Service
metadata:
name: opp
namespace: mmm-suplus-test
labels:
k8s-app: opp
spec:
ports:
- name: "http"
port: 80
targetPort: 8082
selector:
k8s-app: opp
---
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: opp
namespace: mmm-suplus-test
labels:
k8s-app: opp
spec:
replicas: 1
template:
metadata:
labels:
k8s-app: opp
spec:
affinity:
nodeAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- preference: {}
weight: 100
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- cn-hangzhou.i-bp1djh1xn7taumbue1ze
- cn-hangzhou.i-bp1djh1xn7taumbue1zd
- cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
- cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
containers:
- name: opp
image: 192.168.0.243:5000/mmm/opp:test
imagePullPolicy: Always
ports:
- containerPort: 8082
volumeMounts:
- mountPath: /opt/logs
name: accesslogs
env:
- name: ENTERPRISE_SERVICE_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: service.enterprise
- name: MYSQL_HOST
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.host
- name: MYSQL_PORT
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.port
- name: MYSQL_USER
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.user
- name: MYSQL_PASSWORD
valueFrom:
configMapKeyRef:
name: suplus-config
key: mysql.password
- name: MYSQL_DB_NAME
value: "opp_test"
- name: LOG_LEVEL
value: "debug"
- name: ERROR_BASE_CODE
value: "9"
- name: ERROR_BASE_CODE_MULTIPLE
value: "1000"
- name: RUN_MODE
value: "prod"
- name: aliyun_logs_suplus
value: "stdout"
- name: aliyun_logs_access
value: "/opt/logs/app.log"
volumes:
- name: accesslogs
emptyDir: {}
\ No newline at end of file
... ...