Merge branch 'dev' of http://gitlab.fjmaimaimai.com/mmm-go/opp into dev

@@ -7,9 +7,9 @@ metadata:
     k8s-app: opp
 spec:
   ports:
-     - name: "http"
-       port: 80
-       targetPort: 8080
+    - name: "http"
+      port: 80
+      targetPort: 8080
   selector:
     k8s-app: opp
 ---
@@ -43,67 +43,46 @@ spec:
                       - cn-hangzhou.i-bp1euf5u1ph9kbhtndhb
                       - cn-hangzhou.i-bp1hyp5oips9cdwxxgxy
       containers:
-      - name: opp
-        image: 192.168.0.243:5000/mmm/opp:dev
-        imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
-        volumeMounts:
-        - mountPath: /opt/logs
-          name: accesslogs
-        - mountPath: /var/www/opp/file
-            name: mmmjihuitest-pvc
-        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: REDIS_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: suplus-config
-              key: redis.ip
-        - name: REDIS_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: suplus-config
-              key: redis.port
-        - 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/opp_app.log"
-        - name: aliyun_file_access
-          value: "/var/www/opp/file"
+        - name: opp
+          image: 192.168.0.243:5000/mmm/opp:dev
+          imagePullPolicy: Always
+          volumeMounts:
+            - mountPath:  /opt/logs
+              name: accesslogs
+            - mountPath: /var/www/opp/file
+              name: mmmjihuitest-pvc1
+          ports:
+            - containerPort: 8080
+          env:
+            - 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: aliyun_logs_suplusfile
+              value: "stdout"
+            - name: aliyun_logs_access
+              value: " /opt/logs/app.log"
       volumes:
-      - name: accesslogs
-        emptyDir: {}
-      - name: suplusupload-pvc1
+        - name: accesslogs
+          emptyDir: {}
+        - name: mmmjihuitest-pvc1
           persistentVolumeClaim:
-            claimName: suplusupload-pvc
\ No newline at end of file
+            claimName: mmmjihuitest-pvc