update

app/router/admin_router.go

@@ -105,8 +105,10 @@ func AdminRoute(r *gin.RouterGroup) {
 	rHomePage(r.Group("/homePage"))     //首页
 	rCompany(r.Group("/company"))       //公司管理
 	rBanner(r.Group("/banner"))         //轮播图管理
-	rEnterprise(r.Group("/enterprise")) //校企管理
-	rRole(r.Group("/role"))             //权限管理
-	rSetCenter(r.Group("/setCenter"))   //设置中心
-	rUser(r.Group("/user"))             //用户管理
+	rEnterprise(r.Group("/enterprise")) //校企
+
+	// 管理
+	rRole(r.Group("/role"))           //权限管理
+	rSetCenter(r.Group("/setCenter")) //设置中心
+	rUser(r.Group("/user"))           //用户管理
 }

k8s/deployment-dev.yaml

@@ -0,0 +1,47 @@
+kind: Deployment
+apiVersion: apps/v1
+metadata:
+  name: app-bakery
+  namespace: develop
+  labels:
+    app: app-bakery
+  annotations:
+    kubesphere.io/creator: dengbiao
+    kubesphere.io/description: 面包店
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: app-bakery
+  template:
+    metadata:
+      labels:
+        app: app-bakery
+    spec:
+      volumes:
+        - name: host-time
+          hostPath:
+            path: /etc/localtime
+            type: ''
+        - name: app-bakery
+          configMap:
+            name: app-bakery
+            defaultMode: 420
+      containers:
+        - name: container-app-comm-one-circles
+          image: 'registry-vpc.cn-shenzhen.aliyuncs.com/fnuoos-prd/app-bakery:0.0.1'
+          ports:
+            - name: httpcomm4001
+              containerPort: 4001
+              protocol: TCP
+          volumeMounts:
+            - name: host-time
+              readOnly: true
+              mountPath: /etc/localtime
+            - name: app-comm-one-circles
+              readOnly: true
+              mountPath: /var/zyos
+          imagePullPolicy: Always
+      restartPolicy: Always
+      terminationGracePeriodSeconds: 30
+      dnsPolicy: ClusterFirst

k8s/mall-task-prd.yaml

@@ -1,56 +0,0 @@
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: mall-task
-  namespace: zhios
-  labels:
-    app: mall-task
-  annotations:
-    kubesphere.io/creator: wuhanqin
-    kubesphere.io/description: 自营商城go定时任务
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mall-task
-  template:
-    metadata:
-      labels:
-        app: mall-task
-    spec:
-      volumes:
-        - name: host-time
-          hostPath:
-            path: /etc/localtime
-            type: ''
-        - name: mall-task-cfg1
-          configMap:
-            name: zhios-mall-task
-            items:
-              - key: task.yml
-                path: task.yml
-            defaultMode: 420
-      containers:
-        - name: container-mall-task
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-mall-task:0.3'
-          resources:
-            limits:
-              cpu: '1'
-              memory: 1000Mi
-            requests:
-              cpu: 200m
-              memory: 1000Mi
-          volumeMounts:
-            - name: host-time
-              readOnly: true
-              mountPath: /etc/localtime
-            - name: mall-task-cfg1
-              readOnly: true
-              mountPath: /var/zyos/task.yml
-              subPath: task.yml
-          terminationMessagePath: /dev/termination-log
-          terminationMessagePolicy: File
-          imagePullPolicy: Always
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: ClusterFirst

k8s/mall-task.yaml

@@ -1,56 +0,0 @@
-kind: Deployment
-apiVersion: apps/v1
-metadata:
-  name: mall-task
-  namespace: dev
-  labels:
-    app: mall-task
-  annotations:
-    kubesphere.io/creator: wuhanqin
-    kubesphere.io/description: 自营商城go定时任务
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: mall-task
-  template:
-    metadata:
-      labels:
-        app: mall-task
-    spec:
-      volumes:
-        - name: host-time
-          hostPath:
-            path: /etc/localtime
-            type: ''
-        - name: mall-task-cfg1
-          configMap:
-            name: mall-task-cfg
-            items:
-              - key: task.yml
-                path: task.yml
-            defaultMode: 420
-      containers:
-        - name: container-mall-task
-          image: 'registry.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-mall-task:0.1'
-          resources:
-            limits:
-              cpu: '1'
-              memory: 1000Mi
-            requests:
-              cpu: 200m
-              memory: 1000Mi
-          volumeMounts:
-            - name: host-time
-              readOnly: true
-              mountPath: /etc/localtime
-            - name: mall-task-cfg1
-              readOnly: true
-              mountPath: /var/zyos/task.yml
-              subPath: task.yml
-          terminationMessagePath: /dev/termination-log
-          terminationMessagePolicy: File
-          imagePullPolicy: Always
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
-      dnsPolicy: ClusterFirst

k8s/zyos-mall-deployment_prd.yaml

@@ -1,49 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: zhios
-  name: zhios-mall
-  labels:
-    app: zhios-mall
-spec:
-  replicas: 1
-  template:
-    metadata:
-      name: zhios-mall
-      labels:
-        app: zhios-mall
-    spec:
-      containers:
-        - name: zhios-mall-container
-          image: registry-vpc.cn-shenzhen.aliyuncs.com/fnuoos-prd/zyos-mall:0.1
-          ports:
-            - containerPort: 5002
-              name: 5002tcp
-              protocol: TCP
-          resources:
-            limits:
-              cpu: "1"
-              memory: 256Mi
-            requests:
-              cpu: 200m
-              memory: 128Mi
-          imagePullPolicy: IfNotPresent
-      restartPolicy: Always
-      volumes:
-        - name: host-time
-          hostPath:
-            path: /etc/localtime
-            type: ''
-        - name: mall-cfg
-          configMap:
-            name: zhios-mall-cfg
-            defaultMode: 420
-  selector:
-    matchLabels:
-      app: zhios-mall
-
-  strategy:
-    type: RollingUpdate
-    rollingUpdate:
-      maxUnavailable: 25%
-      maxSurge: 25%