From efb77f550df8e843f83d6a331581c5ed9264f71f Mon Sep 17 00:00:00 2001 From: wujiawei <1207537021@qq.com> Date: Mon, 29 Jan 2024 10:38:17 +0800 Subject: [PATCH] add ui --- k8s-on.yaml | 152 ----------------- k8s-under.yaml | 154 ------------------ wu-lazy-cloud-heartbeat-client/README.md | 4 +- .../README.md | 4 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-dev.yml | 6 - .../src/main/resources/application-prod.yml | 4 +- 7 files changed, 7 insertions(+), 319 deletions(-) delete mode 100644 k8s-on.yaml delete mode 100644 k8s-under.yaml diff --git a/k8s-on.yaml b/k8s-on.yaml deleted file mode 100644 index 1e10f39..0000000 --- a/k8s-on.yaml +++ /dev/null @@ -1,152 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - k8s.kuboard.cn/displayName: 【云上云下】云上心跳服务端（新） - labels: - k8s.kuboard.cn/layer: monitor - k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-server - name: wu-lazy-cloud-heartbeat-server - namespace: middleground-management -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s.kuboard.cn/layer: monitor - k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-server - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - k8s.kuboard.cn/layer: monitor - k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-server - spec: - containers: - - envFrom: - - configMapRef: - name: common-cnf - image: >- - docker-registry.laihui.com/middleground/wu-lazy-cloud-heartbeat-server:master_latest - imagePullPolicy: Always - name: wu-lazy-cloud-heartbeat-server - resources: - limits: - memory: 512Mi - requests: - memory: 512Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - k8s.kuboard.cn/displayName: 【云上云下】云上中心网关（新） - labels: - k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-central-gateway - name: wu-lazy-cloud-central-gateway - namespace: middleground-management -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-central-gateway - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-central-gateway - spec: - containers: - - envFrom: - - configMapRef: - name: common-cnf - image: >- - docker-registry.laihui.com/middleground/wu-lazy-cloud-central-gateway:master_latest - imagePullPolicy: Always - name: wu-lazy-cloud-central-gateway - resources: - limits: - memory: 384Mi - requests: - memory: 384Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - k8s.kuboard.cn/displayName: 【云上云下】暂存服务（新） - labels: - k8s.kuboard.cn/layer: svc - k8s.kuboard.cn/name: wu-lazy-cloud-staging-provider - name: wu-lazy-cloud-staging-provider - namespace: middleground-management -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s.kuboard.cn/layer: svc - k8s.kuboard.cn/name: wu-lazy-cloud-staging-provider - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - k8s.kuboard.cn/layer: svc - k8s.kuboard.cn/name: wu-lazy-cloud-staging-provider - spec: - containers: - - envFrom: - - configMapRef: - name: common-cnf - image: >- - docker-registry.laihui.com/middleground/wu-lazy-cloud-staging-provider:master_latest - imagePullPolicy: Always - name: wu-lazy-cloud-staging-provider - resources: - limits: - memory: 384Mi - requests: - memory: 384Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 diff --git a/k8s-under.yaml b/k8s-under.yaml deleted file mode 100644 index 008516b..0000000 --- a/k8s-under.yaml +++ /dev/null @@ -1,154 +0,0 @@ - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - k8s.kuboard.cn/displayName: 【云上云下】云下心跳客户端（新） - labels: - k8s.kuboard.cn/layer: monitor - k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-client - name: wu-lazy-cloud-heartbeat-client - namespace: middleground-tenant-share -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s.kuboard.cn/layer: monitor - k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-client - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - k8s.kuboard.cn/layer: monitor - k8s.kuboard.cn/name: wu-lazy-cloud-heartbeat-client - spec: - containers: - - envFrom: - - configMapRef: - name: common-cnf - image: >- - docker-registry.laihui.com/middleground/wu-lazy-cloud-heartbeat-client:master_latest - imagePullPolicy: Always - name: wu-lazy-cloud-heartbeat-client - resources: - limits: - memory: 384Mi - requests: - memory: 384Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - k8s.kuboard.cn/displayName: 【云上云下】云下中心网关（新） - labels: - k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-central-gateway - name: wu-lazy-cloud-central-gateway - namespace: middleground-tenant-share -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-central-gateway - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - k8s.kuboard.cn/layer: gateway - k8s.kuboard.cn/name: wu-lazy-cloud-central-gateway - spec: - containers: - - envFrom: - - configMapRef: - name: common-cnf - image: >- - docker-registry.laihui.com/middleground/wu-lazy-cloud-central-gateway:master_latest - imagePullPolicy: Always - name: wu-lazy-cloud-central-gateway - resources: - limits: - memory: 384Mi - requests: - memory: 384Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - k8s.kuboard.cn/displayName: 【云上云下】云下暂存服务（新） - labels: - k8s.kuboard.cn/layer: svc - k8s.kuboard.cn/name: wu-lazy-cloud-staging-provider - name: wu-lazy-cloud-staging-provider - namespace: middleground-tenant-share -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - k8s.kuboard.cn/layer: svc - k8s.kuboard.cn/name: wu-lazy-cloud-staging-provider - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - labels: - k8s.kuboard.cn/layer: svc - k8s.kuboard.cn/name: wu-lazy-cloud-staging-provider - spec: - containers: - - envFrom: - - configMapRef: - name: common-cnf - image: >- - docker-registry.laihui.com/middleground/wu-lazy-cloud-staging-provider:master_latest - imagePullPolicy: Always - name: wu-lazy-cloud-staging-provider - resources: - limits: - memory: 384Mi - requests: - memory: 384Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - dnsPolicy: ClusterFirst - restartPolicy: Always - schedulerName: default-scheduler - securityContext: {} - terminationGracePeriodSeconds: 30 - diff --git a/wu-lazy-cloud-heartbeat-client/README.md b/wu-lazy-cloud-heartbeat-client/README.md index a1ee668..cc418fe 100644 --- a/wu-lazy-cloud-heartbeat-client/README.md +++ b/wu-lazy-cloud-heartbeat-client/README.md @@ -10,8 +10,8 @@ mvn native:build -Pnative ### 构建docker镜像 ```shell -docker build -t docker-registry.laihui.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest -f Native-Dockerfile . -docker push docker-registry.laihui.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest +docker build -t docker-registry.wujiawei.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest -f Native-Dockerfile . +docker push docker-registry.wujiawei.com/lazy/lazy-under-cloud-heartbeat-client:lazy-2.4.2-native-SNAPSHOT_latest ``` ## BUILD IMAGE diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/README.md b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/README.md index 6892470..2c66b66 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/README.md +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/README.md @@ -9,8 +9,8 @@ mvn native:build -Pnative ``` ### 构建docker镜像 ```shell -docker build -t docker-registry.laihui.com/middleground/wu-lazy-cloud-heartbeat-client:1.2.2-JDK17-SNAPSHOT-native-SNAPSHOT_latest -f Native-Dockerfile . -docker push docker-registry.laihui.com/middleground/wu-lazy-cloud-heartbeat-client:1.2.2-JDK17-SNAPSHOT-native-SNAPSHOT_latest +docker build -t docker-registry.wujiawei.com/middleground/wu-lazy-cloud-heartbeat-client:1.2.2-JDK17-SNAPSHOT-native-SNAPSHOT_latest -f Native-Dockerfile . +docker push docker-registry.wujiawei.com/middleground/wu-lazy-cloud-heartbeat-client:1.2.2-JDK17-SNAPSHOT-native-SNAPSHOT_latest ``` diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml index e86a75b..a433864 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-client-sample/src/main/resources/application-dev.yml @@ -12,6 +12,6 @@ spring: redis: host: 192.168.17.221 port: 30553 - password: laihui + password: wujiawei database: 2 diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml index 3b5149b..475f70d 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-dev.yml @@ -1,10 +1,4 @@ spring: - data: - redis: - host: 192.168.17.221 - port: 30553 - password: laihui - database: 2 datasource: url: jdbc:mysql://124.222.48.62:30512/wu_lazy_cloud_netty_server?allowMultiQueries=true&useUnicode=true&autoReconnect=true&useAffectedRows=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&databaseTerm=SCHEMA username: root diff --git a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-prod.yml b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-prod.yml index 865e25e..e9f3704 100644 --- a/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-prod.yml +++ b/wu-lazy-cloud-heartbeat-sample/wu-lazy-cloud-heartbeat-server-sample/src/main/resources/application-prod.yml @@ -1,8 +1,8 @@ spring: datasource: url: jdbc:mysql://${MAIN_DB_HOST}/wu_lazy_cloud_netty_server?allowMultiQueries=true&useUnicode=true&autoReconnect=true&useAffectedRows=true&useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&databaseTerm=SCHEMA - username: middleground_cloud_netty_server - password: laihui + username: root + password: wujiawei driver-class-name: com.mysql.cj.jdbc.Driver main: allow-bean-definition-overriding: true \ No newline at end of file