feat(完善启动参数): 完善启动参数

charts/commander-dataprocess-service/templates/configmap.yaml

@@ -10,8 +10,6 @@ data:
   {{ $key }}: {{ $val | quote }}
 {{- end }}
 {{- end }}
-  SLB_IP: {{ .Values.global.nacos.ip | quote }}
-  SLB_PORT: {{ .Values.global.nacos.port | quote }}
-  NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
-  SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
+{{- $db := (index .Values.global .Chart.Name "database") }}
+  ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
 

charts/commander-dataprocess-service/templates/deployment.yaml

@@ -23,9 +23,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Chart.Name }}-config
-          env:
-            - name: TARGET
-              value: "{{ .Chart.Name }}"
           ports:
             - containerPort: {{ index .Values.global .Chart.Name "port" }}
               protocol: TCP

charts/commander-dataprocess-service/values.yaml

@@ -13,18 +13,16 @@ global:
     namespace: commander-standard-dev
     replicas: 1
     imageUrl: k8s-t0.tencentcloudcr.com/commander/
-    apiHost: commander-api.aipark.com
-  nacos:
-    ip: "nacos-headless.nacos.svc.cluster.local"
-    port: "8848"
-    pass: "zhht2023"
   profiles_active: "prod"
   # ------------------------------------------------------------------------------
   commander-dataprocess-service:
     imageVersion: "2.1.2"
-    port: 5610
-    env:
-      rocketmq_log_level: "ERROR"
-      rocketmq_log_file_maxIndex: "1"
-      SWAGGER_ENABLE: "false"
-      AIOT_AO_CAPTCHA_ENABLE: "true"
+    port: 10080
+    database:
+      server: "10.100.16.66"
+      database: "db_data_change"
+      uid: "admin"
+      pwd: "superadmin"
+      charset: "utf8"
+      sslmode: "none"
+      allowUserVariables: "true"

charts/commander-dsi-service/templates/configmap.yaml

@@ -10,8 +10,6 @@ data:
   {{ $key }}: {{ $val | quote }}
 {{- end }}
 {{- end }}
-  SLB_IP: {{ .Values.global.nacos.ip | quote }}
-  SLB_PORT: {{ .Values.global.nacos.port | quote }}
-  NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
-  SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
+{{- $db := (index .Values.global .Chart.Name "database") }}
+  ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
 

charts/commander-dsi-service/templates/deployment.yaml

@@ -23,9 +23,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Chart.Name }}-config
-          env:
-            - name: TARGET
-              value: "{{ .Chart.Name }}"
           ports:
             - containerPort: {{ index .Values.global .Chart.Name "port" }}
               protocol: TCP

charts/commander-dsi-service/values.yaml

@@ -13,18 +13,16 @@ global:
     namespace: commander-standard-dev
     replicas: 1
     imageUrl: k8s-t0.tencentcloudcr.com/commander/
-    apiHost: commander-api.aipark.com
-  nacos:
-    ip: "nacos-headless.nacos.svc.cluster.local"
-    port: "8848"
-    pass: "zhht2023"
   profiles_active: "prod"
   # ------------------------------------------------------------------------------
   commander-dsi-service:
     imageVersion: "2.1.2"
-    port: 5610
-    env:
-      rocketmq_log_level: "ERROR"
-      rocketmq_log_file_maxIndex: "1"
-      SWAGGER_ENABLE: "false"
-      AIOT_AO_CAPTCHA_ENABLE: "true"
+    port: 10080
+    database:
+      server: "10.100.16.66"
+      database: "db_data_change"
+      uid: "admin"
+      pwd: "superadmin"
+      charset: "utf8"
+      sslmode: "none"
+      allowUserVariables: "true"

charts/commander-ifs-service/templates/configmap.yaml

@@ -10,8 +10,6 @@ data:
   {{ $key }}: {{ $val | quote }}
 {{- end }}
 {{- end }}
-  SLB_IP: {{ .Values.global.nacos.ip | quote }}
-  SLB_PORT: {{ .Values.global.nacos.port | quote }}
-  NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
-  SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
+{{- $db := (index .Values.global .Chart.Name "database") }}
+  ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
 

charts/commander-ifs-service/templates/deployment.yaml

@@ -23,9 +23,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Chart.Name }}-config
-          env:
-            - name: TARGET
-              value: "{{ .Chart.Name }}"
           ports:
             - containerPort: {{ index .Values.global .Chart.Name "port" }}
               protocol: TCP

charts/commander-ifs-service/values.yaml

@@ -13,18 +13,16 @@ global:
     namespace: commander-standard-dev
     replicas: 1
     imageUrl: k8s-t0.tencentcloudcr.com/commander/
-    apiHost: commander-api.aipark.com
-  nacos:
-    ip: "nacos-headless.nacos.svc.cluster.local"
-    port: "8848"
-    pass: "zhht2023"
   profiles_active: "prod"
   # ------------------------------------------------------------------------------
   commander-ifs-service: 
     imageVersion: "2.1.2"
-    port: 5610
-    env:
-      rocketmq_log_level: "ERROR"
-      rocketmq_log_file_maxIndex: "1"
-      SWAGGER_ENABLE: "false"
-      AIOT_AO_CAPTCHA_ENABLE: "true"
+    port: 8090
+    database:
+      server: "10.100.16.66"
+      database: "db_commander_2.0.8"
+      uid: "admin"
+      pwd: "superadmin"
+      charset: "utf8"
+      sslmode: "none"
+      allowUserVariables: "true"

charts/commander-plateform-api/templates/configmap.yaml

@@ -10,8 +10,6 @@ data:
   {{ $key }}: {{ $val | quote }}
 {{- end }}
 {{- end }}
-  SLB_IP: {{ .Values.global.nacos.ip | quote }}
-  SLB_PORT: {{ .Values.global.nacos.port | quote }}
-  NACOS_PASS: {{ .Values.global.nacos.pass | quote }}
-  SPRING_PROFILES_ACTIVE: {{ .Values.global.profiles_active | quote }}
+{{- $db := (index .Values.global .Chart.Name "database") }}
+  ConnectionStrings__Conn: "server={{ $db.server }};database={{ $db.database }};uid={{ $db.uid }};pwd={{ $db.pwd }};charset={{ $db.charset }};sslmode={{ $db.sslmode }};allow user variables={{ $db.allowUserVariables }};"
 

charts/commander-plateform-api/templates/deployment.yaml

@@ -23,9 +23,6 @@ spec:
           envFrom:
             - configMapRef:
                 name: {{ .Chart.Name }}-config
-          env:
-            - name: TARGET
-              value: "{{ .Chart.Name }}"
           ports:
             - containerPort: {{ index .Values.global .Chart.Name "port" }}
               protocol: TCP

charts/commander-plateform-api/values.yaml

@@ -13,18 +13,16 @@ global:
     namespace: commander-standard-dev
     replicas: 1
     imageUrl: k8s-t0.tencentcloudcr.com/commander/
-    apiHost: commander-api.aipark.com
-  nacos:
-    ip: "nacos-headless.nacos.svc.cluster.local"
-    port: "8848"
-    pass: "zhht2023"
   profiles_active: "prod"
   # ------------------------------------------------------------------------------
   commander-plateform-api:
     imageVersion: "2.1.2"
-    port: 5610
-    env:
-      rocketmq_log_level: "ERROR"
-      rocketmq_log_file_maxIndex: "1"
-      SWAGGER_ENABLE: "false"
-      AIOT_AO_CAPTCHA_ENABLE: "true"
+    port: 8084
+    database:
+      server: "10.100.16.66"
+      database: "db_commander_2.0.8"
+      uid: "admin"
+      pwd: "superadmin"
+      charset: "utf8"
+      sslmode: "none"
+      allowUserVariables: "true"