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

@@ -46,19 +46,14 @@ spec:
         - name: opp
         - name: opp
           image: 192.168.0.243:5000/mmm/opp:dev
           image: 192.168.0.243:5000/mmm/opp:dev
           imagePullPolicy: Always
           imagePullPolicy: Always
-        ports:
-        - containerPort: 8080
           volumeMounts:
           volumeMounts:
             - mountPath:  /opt/logs
             - mountPath:  /opt/logs
               name: accesslogs
               name: accesslogs
             - mountPath: /var/www/opp/file
             - mountPath: /var/www/opp/file
-            name: mmmjihuitest-pvc
+              name: mmmjihuitest-pvc1
+          ports:
+            - containerPort: 8080
           env:
           env:
-        - name: ENTERPRISE_SERVICE_HOST
-          valueFrom:
-            configMapKeyRef:
-              name: suplus-config
-              key: service.enterprise
             - name: MYSQL_HOST
             - name: MYSQL_HOST
               valueFrom:
               valueFrom:
                 configMapKeyRef:
                 configMapKeyRef:
@@ -79,31 +74,15 @@ spec:
                 configMapKeyRef:
                 configMapKeyRef:
                   name: suplus-config
                   name: suplus-config
                   key: mysql.password
                   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
             - name: MYSQL_DB_NAME
               value: "opportunity_dev"
               value: "opportunity_dev"
-        - name: LOG_LEVEL
-          value: "debug"
-        - name: RUN_MODE
-          value: "test"
-        - name: aliyun_logs_suplus
+            - name: aliyun_logs_suplusfile
               value: "stdout"
               value: "stdout"
             - name: aliyun_logs_access
             - name: aliyun_logs_access
-          value: "/opt/logs/opp_app.log"
-        - name: aliyun_file_access
-          value: "/var/www/opp/file"
+              value: " /opt/logs/app.log"
       volumes:
       volumes:
         - name: accesslogs
         - name: accesslogs
           emptyDir: {}
           emptyDir: {}
-      - name: suplusupload-pvc1
+        - name: mmmjihuitest-pvc1
           persistentVolumeClaim:
           persistentVolumeClaim:
-            claimName: suplusupload-pvc
+            claimName: mmmjihuitest-pvc