mmm-go / oppmg · 提交

转到一个项目

作者 唐旭辉
提交 f5a50c513ff581026b71764a92601e7bc22d53c8 1 个父辈 379c8b96

配置文件修改

内嵌 并排对比
正在显示 3 个修改的文件 包含 90 行增加 和 42 行删除
  1 +[dev]
  2 +config_name = "test"
  3 +#----beego的默认配置 开始---
  4 +#端口号
  5 +httpport = 8080
  6 +#开启应用内监控
  7 +EnableAdmin = false
  8 +AdminPort = 8088
  9 +#---beego的默认配置 结束---
  10 +
  11 +#---自定义配置 开始----
  12 +##数据库连接
  13 +# sqlconn ="${MYSQL_CONN||root:sutianxia2015@tcp(115.29.205.99:3306)/opportunity?charset=utf8&loc=Asia%2FShanghai}"
  14 +mysql_user = "${MYSQL_USER||root}"
  15 +mysql_password = "${MYSQL_PASSWORD||sutianxia2015}"
  16 +mysql_host = "${MYSQL_HOST||115.29.205.99}"
  17 +mysql_port = "${MYSQL_PORT||3306}"
  18 +mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
  19 +##redis相关配置
  20 +redis_add = "${REDIS_HOST||127.0.0.1}"
  21 +redis_add_port = "${REDIS_PORT||6379}"
  22 +redis_auth = ""
  23 +##log相关配置
  24 +##out_put:"console","file"
  25 +log_output = "file"
  26 +log_filename = "${aliyun_logs_access||./log/ability.log}"
  27 +log_level = "${LOG_LEVEL||debug}"
  28 +
  29 +##统一用户中心相关配置
  30 +ucenter_check_alt = "rsF0pL!6DwjBO735"
  31 +ucenter_base_url = "http://suplus-ucenter-test.fjmaimaimai.com"
  32 +ucenter_app_key = "39aefef9e22744a3b2d2d3791824ae7b"
  33 +ucenter_secret = "cykbjnfqgctn"
  34 +
  35 +# 上传文件保存路径
  36 +file_save_path = "${aliyun_file_access||~/www/opp}"
  37 +file_host = "http://192.168.139.137:8080/"
  38 +file_host_path = "file/opp"
  39 +# 审批流程修改 消息发布
  40 +message_publish = "audit_change"
  41 +#---自定义配置 结束----
1 apiVersion: v1 1 apiVersion: v1
2 kind: Service 2 kind: Service
3 metadata: 3 metadata:
4 - name: opp 4 + name: mmm-oppmg
5 namespace: mmm-suplus-test 5 namespace: mmm-suplus-test
6 labels: 6 labels:
7 - k8s-app: opp 7 + k8s-app: mmm-oppmg
8 spec: 8 spec:
9 ports: 9 ports:
10 - name: "http" 10 - name: "http"
11 port: 80 11 port: 80
12 - targetPort: 8082 12 + targetPort: 8080
13 selector: 13 selector:
14 - k8s-app: opp 14 + k8s-app: mmm-oppmg
15 --- 15 ---
16 apiVersion: extensions/v1beta1 16 apiVersion: extensions/v1beta1
17 kind: Deployment 17 kind: Deployment
18 metadata: 18 metadata:
19 - name: opp 19 + name: mmm-oppmg
20 namespace: mmm-suplus-test 20 namespace: mmm-suplus-test
21 labels: 21 labels:
22 - k8s-app: opp 22 + k8s-app: mmm-oppmg
23 spec: 23 spec:
24 replicas: 1 24 replicas: 1
25 template: 25 template:
26 metadata: 26 metadata:
27 labels: 27 labels:
28 - k8s-app: opp 28 + k8s-app: mmm-oppmg
29 spec: 29 spec:
30 affinity: 30 affinity:
31 nodeAffinity: 31 nodeAffinity:
@@ -43,20 +43,17 @@ spec: @@ -43,20 +43,17 @@ spec:
43 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb 43 - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
44 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy 44 - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
45 containers: 45 containers:
46 - - name: opp  
47 - image: 192.168.0.243:5000/mmm/opp:test 46 + - name: mmm-oppmg
  47 + image: 192.168.0.243:5000/mmm/mmm-oppmg:test
48 imagePullPolicy: Always 48 imagePullPolicy: Always
49 - ports:  
50 - - containerPort: 8082  
51 volumeMounts: 49 volumeMounts:
52 - mountPath: /opt/logs 50 - mountPath: /opt/logs
53 name: accesslogs 51 name: accesslogs
  52 + - mountPath: /var/www/oppmg/file
  53 + name: mmmjihuitest-pvc1
  54 + ports:
  55 + - containerPort: 8080
54 env: 56 env:
55 - - name: ENTERPRISE_SERVICE_HOST  
56 - valueFrom:  
57 - configMapKeyRef:  
58 - name: suplus-config  
59 - key: service.enterprise  
60 - name: MYSQL_HOST 57 - name: MYSQL_HOST
61 valueFrom: 58 valueFrom:
62 configMapKeyRef: 59 configMapKeyRef:
@@ -67,6 +64,16 @@ spec: @@ -67,6 +64,16 @@ spec:
67 configMapKeyRef: 64 configMapKeyRef:
68 name: suplus-config 65 name: suplus-config
69 key: mysql.port 66 key: mysql.port
  67 + - name: REDIS_HOST
  68 + valueFrom:
  69 + configMapKeyRef:
  70 + name: suplus-config
  71 + key: redis.ip
  72 + - name: REDIS_PORT
  73 + valueFrom:
  74 + configMapKeyRef:
  75 + name: suplus-config
  76 + key: redis.port
70 - name: MYSQL_USER 77 - name: MYSQL_USER
71 valueFrom: 78 valueFrom:
72 configMapKeyRef: 79 configMapKeyRef:
@@ -78,19 +85,18 @@ spec: @@ -78,19 +85,18 @@ spec:
78 name: suplus-config 85 name: suplus-config
79 key: mysql.password 86 key: mysql.password
80 - name: MYSQL_DB_NAME 87 - name: MYSQL_DB_NAME
81 - value: "opp_test" 88 + value: "opportunity_test"
  89 + - name: RUN_MODE
  90 + value: "test"
82 - name: LOG_LEVEL 91 - name: LOG_LEVEL
83 value: "debug" 92 value: "debug"
84 - - name: ERROR_BASE_CODE  
85 - value: "9"  
86 - - name: ERROR_BASE_CODE_MULTIPLE  
87 - value: "1000"  
88 - - name: RUN_MODE  
89 - value: "prod"  
90 - - name: aliyun_logs_suplus 93 + - name: aliyun_logs_suplusfile
91 value: "stdout" 94 value: "stdout"
92 - name: aliyun_logs_access 95 - name: aliyun_logs_access
93 - value: "/opt/logs/app.log" 96 + value: " /opt/logs/app.log"
94 volumes: 97 volumes:
95 - name: accesslogs 98 - name: accesslogs
96 emptyDir: {} 99 emptyDir: {}
  100 + - name: mmmjihuitest-pvc1
  101 + persistentVolumeClaim:
  102 + claimName: mmmjihuitest-pvc
@@ -8,6 +8,7 @@ import ( @@ -8,6 +8,7 @@ import (
8 "oppmg/common/log" 8 "oppmg/common/log"
9 "oppmg/models" 9 "oppmg/models"
10 "oppmg/protocol" 10 "oppmg/protocol"
  11 + "oppmg/services/ucenter"
11 "oppmg/storage/redisdata" 12 "oppmg/storage/redisdata"
12 "oppmg/utils" 13 "oppmg/utils"
13 "strings" 14 "strings"
@@ -206,23 +207,23 @@ func LoginAuthByUCenter(account, password string) (protocol.LoginAuthToken, erro @@ -206,23 +207,23 @@ func LoginAuthByUCenter(account, password string) (protocol.LoginAuthToken, erro
206 } else { 207 } else {
207 companyid = companys[0].Id 208 companyid = companys[0].Id
208 } 209 }
209 - // var uclientReturn *ucenter.ResponseLogin  
210 - // uclientReturn, err = ucenter.RequestUCenterLogin(account, password)  
211 - // if err != nil {  
212 - // return logintoken, protocol.NewErrWithMessage("10021")  
213 - // }  
214 - // //更新用户数据  
215 - // _ = uclientReturn  
216 - // userdata.Accid = uclientReturn.Data.Accid  
217 - // userdata.Icon = uclientReturn.Data.Avatar  
218 - // userdata.ImToken = uclientReturn.Data.Imtoken  
219 - // userdata.NickName = uclientReturn.Data.NickName  
220 - // userdata.CsAccount = uclientReturn.Data.CustomerAccount  
221 - // userdata.LastLoginTime = time.Now()  
222 - // err = models.UpdateUserById(userdata, []string{"Accid", "Icon", "ImToken", "NickName", "CsAccount", "LastLoginTime"})  
223 - // if err != nil {  
224 - // log.Error("更新用户数据失败：%s", err)  
225 - // } 210 + var uclientReturn *ucenter.ResponseLogin
  211 + uclientReturn, err = ucenter.RequestUCenterLogin(account, password)
  212 + if err != nil {
  213 + return logintoken, protocol.NewErrWithMessage("10021")
  214 + }
  215 + //更新用户数据
  216 + _ = uclientReturn
  217 + userdata.Accid = uclientReturn.Data.Accid
  218 + userdata.Icon = uclientReturn.Data.Avatar
  219 + userdata.ImToken = uclientReturn.Data.Imtoken
  220 + userdata.NickName = uclientReturn.Data.NickName
  221 + userdata.CsAccount = uclientReturn.Data.CustomerAccount
  222 + userdata.LastLoginTime = time.Now()
  223 + err = models.UpdateUserById(userdata, []string{"Accid", "Icon", "ImToken", "NickName", "CsAccount", "LastLoginTime"})
  224 + if err != nil {
  225 + log.Error("更新用户数据失败：%s", err)
  226 + }
226 logintoken, _ = GenerateAuthToken(userdata.Id, companyid) 227 logintoken, _ = GenerateAuthToken(userdata.Id, companyid)
227 return logintoken, err 228 return logintoken, err
228 } 229 }