Selaa lähdekoodia

ci(other): CICD

Yi 1 vuosi sitten
vanhempi
commit
402e5d96b0

+ 123 - 0
.drone.yml

@@ -0,0 +1,123 @@
+kind: pipeline
+type: docker
+name: test
+
+steps:
+  - name: build
+    image: plugins/docker:20.14.2
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      username:
+        from_secret: aliyuncs_username
+      password:
+        from_secret: aliyuncs_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-system-web
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tags: [test]
+  - name: ssh commands
+    image: appleboy/drone-ssh
+    settings:
+      host: 192.168.1.70
+      username: tmrwatch
+      password:
+        from_secret: ssh_password
+      port: 22
+      script:
+        - cd /data/docker-compose/kpt-system-web/
+        - echo "123456" | ./restart.sh
+trigger:
+  branch:
+    include:
+      - feature/*
+  event:
+    include:
+      - push
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock
+---
+kind: pipeline
+type: docker
+name: product
+steps:
+  - name: build
+    image: plugins/docker:20.14.2
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      username:
+        from_secret: aliyuncs_username
+      password:
+        from_secret: aliyuncs_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-system-web
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tag:
+        - latest
+        - ${DRONE_BRANCH##release/}
+trigger:
+  branch:
+    include:
+      - release/*
+  event:
+    include:
+      - push
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock
+---
+kind: pipeline
+type: docker
+name: hotfix
+
+steps:
+  - name: build
+    image: plugins/docker:20.14.2
+    volumes:
+      - name: hosts
+        path: /etc/hosts
+      - name: docker-ca
+        path: /etc/docker
+      - name: docker-sock
+        path: /var/run/docker.sock
+    settings:
+      username:
+        from_secret: aliyuncs_username
+      password:
+        from_secret: aliyuncs_password
+      repo: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-system-web
+      registry: registry.cn-hangzhou.aliyuncs.com
+      tag:
+        - latest
+trigger:
+  branch:
+    include:
+      - hotfix/*
+  event:
+    include:
+      - push
+volumes:
+  - name: docker-ca
+    host:
+      path: /etc/docker
+  - name: docker-sock
+    host:
+      path: /var/run/docker.sock

+ 3 - 3
.env

@@ -2,15 +2,15 @@ VITE_BASE_URL=/
 
 VITE_APP_NAME=CopartnerAdmin
 
-VITE_APP_TITLE=Copartner事件驱动系统
+VITE_APP_TITLE=Copartner后台管理系统
 
-VITE_APP_DESC=CopartnerAdmin是一个事件驱动中后台管理系统
+VITE_APP_DESC=CopartnerAdmin是一个后台管理系统
 
 # 权限路由模式: static | dynamic
 VITE_AUTH_ROUTE_MODE=static
 
 # 路由首页(根路由重定向), 用于static模式的权限路由,dynamic模式取决于后端返回的路由首页
-VITE_ROUTE_HOME_PATH=/dashboard/analysis
+VITE_ROUTE_HOME_PATH=/mqtt/pasture
 
 # iconify图标作为组件的前缀
 VITE_ICON_PREFFIX=icon

+ 2 - 2
README.md

@@ -6,7 +6,7 @@
 - 克隆代码
 
 ```bash
-git clone https://github.com/honghuangdc/soybean-admin.git
+git clone http://kpt.kptyun.cn:3000/xuyiping/kpt-system-web.git
 ```
 
 - 安装依赖
@@ -35,7 +35,7 @@ pnpm build
 docker run --name soybean -p 80:80 -d soybeanjs/soybean-admin:v0.9.6
 ```
 
-- 访问 SoybeanAdmin
+- 访问 kpt-system-web
 
 打开本地浏览器访问`http://localhost`
 

+ 70 - 0
docker-compose.yml

@@ -0,0 +1,70 @@
+version : '3'
+services:
+  kpt-calf-feed-crontab:
+    privileged: true
+    container_name: kpt_calf_feed_crontab
+    restart: always
+    image: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-calf-feed:test
+    volumes:
+      - /var/logger/calf-feed/:/app/kpt-calf-feed/logger
+      - ./config:/app/kpt-calf-feed/bin/config
+      - /etc/localtime:/etc/localtime
+    environment:
+      - APP_ENVIRONMENT=test
+      - CALF_FEED_WORK_DIR=/app/kpt-calf-feed/bin
+    command: [ "/app/kpt-calf-feed/bin/kptCalfFeed","crontab" ]
+
+  kpt-calf-feed-http:
+    privileged: true
+    container_name: kpt_calf_feed_http
+    restart: always
+    image: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-calf-feed:test
+    ports:
+      - "8087:8090"
+    volumes:
+      - /var/logger/calf-feed/:/app/kpt-calf-feed/logger
+      - ./config:/app/kpt-calf-feed/bin/config
+      - /etc/localtime:/etc/localtime
+    environment:
+      - APP_ENVIRONMENT=test
+      - CALF_FEED_WORK_DIR=/app/kpt-calf-feed/bin
+    command: ["/app/kpt-calf-feed/bin/kptCalfFeed","http"]
+
+  kpt-calf-feed-consumer:
+    privileged: true
+    container_name: kpt_calf_feed_crontab
+    restart: always
+    image: registry.cn-hangzhou.aliyuncs.com/kpt-event/kpt-calf-feed:test
+    volumes:
+      - /var/logger/calf-feed/:/app/kpt-calf-feed/logger
+      - ./config/:/app/kpt-calf-feed/bin/config/
+      - /etc/localtime:/etc/localtime
+    environment:
+      - APP_ENVIRONMENT=test
+      - CALF_FEED_WORK_DIR=/app/kpt-calf-feed/bin
+    command: ["/app/kpt-calf-feed/bin/kptCalfFeed","consumer"]
+
+  kpt-redis:
+    image: redis:latest
+    restart: "always"
+    container_name: "kpt-redis"
+    ports:
+      - "6389:6379"
+    volumes:
+      - ./redis/redis.conf:/etc/redis/redis.conf
+      - ./redis/data:/data
+      - ./redis/logs:/var/log/redis/redis.log
+    command: redis-server /etc/redis/redis.conf
+    privileged: true
+
+  kpt-asynqmon:
+    image: hibiken/asynqmon:latest
+    container_name: kpt-asynqmon_asynq
+    ports:
+      - 7081:8080
+    command:
+      - '--redis-addr=kpt-redis:6389'
+      - '--redis-db=0'
+    restart: always
+    depends_on:
+      - kpt-redis

+ 4 - 4
docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:16.17.0 as builder
 
-ENV WORKDIR=/soybean-admin
+ENV WORKDIR=/kpt-system-web
 
 WORKDIR $WORKDIR
 
@@ -16,9 +16,9 @@ RUN pnpm build
 
 FROM nginx:alpine as prod
 
-RUN mkdir /soybean
+RUN mkdir /kpt-system-web
 
-COPY --from=builder /soybean-admin/dist /soybean-admin
-COPY --from=builder /soybean-admin/docker/nginx.conf /etc/nginx/nginx.conf
+COPY --from=builder /kpt-system-web/dist /kpt-system-web
+COPY --from=builder /kpt-system-web/docker/nginx.conf /etc/nginx/nginx.conf
 
 EXPOSE 80

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 312 - 231
pnpm-lock.yaml


+ 2 - 2
src/typings/page-route.d.ts

@@ -59,8 +59,8 @@ declare namespace PageRoute {
     | 'management_user'
     | 'mqtt'
     | 'mqtt_authentication'
-    | 'mqtt_pasture'
     | 'mqtt_category'
+    | 'mqtt_pasture'
     | 'mqtt_topic'
     | 'multi-menu'
     | 'multi-menu_first'
@@ -121,8 +121,8 @@ declare namespace PageRoute {
     | 'management_route'
     | 'management_user'
     | 'mqtt_authentication'
-    | 'mqtt_pasture'
     | 'mqtt_category'
+    | 'mqtt_pasture'
     | 'mqtt_topic'
     | 'multi-menu_first_second-new_third'
     | 'multi-menu_first_second'

+ 1 - 1
src/views/index.ts

@@ -38,8 +38,8 @@ export const views: Record<
   management_route: () => import('./management/route/index.vue'),
   management_user: () => import('./management/user/index.vue'),
   mqtt_authentication: () => import('./mqtt/authentication/index.vue'),
+  mqtt_category: () => import('./mqtt/category/index.vue'),
   mqtt_pasture: () => import('./mqtt/pasture/index.vue'),
-  mqtt_category: () => import('./mqtt/topic-category/index.vue'),
   mqtt_topic: () => import('./mqtt/topic/index.vue'),
   'multi-menu_first_second-new_third': () => import('./multi-menu/first/second-new/third/index.vue'),
   'multi-menu_first_second': () => import('./multi-menu/first/second/index.vue'),

+ 0 - 0
src/views/mqtt/topic-category/components/table-action-modal.vue → src/views/mqtt/category/components/table-action-modal.vue


+ 2 - 2
src/views/mqtt/topic-category/index.vue → src/views/mqtt/category/index.vue

@@ -33,8 +33,8 @@ import type { DataTableColumns, PaginationProps } from 'naive-ui';
 import { MqttTopicIsShowLabels } from '@/constants';
 import { useBoolean, useLoading } from '@/hooks';
 import { fetchMqttCategoryList } from '@/service/api/mqtt';
-import TableActionModal from '../topic-category/components/table-action-modal.vue';
-import type { ModalType } from '../topic-category/components/table-action-modal.vue';
+import TableActionModal from '../category/components/table-action-modal.vue';
+import type { ModalType } from '../category/components/table-action-modal.vue';
 
 const { loading, startLoading, endLoading } = useLoading(false);
 const { bool: visible, setTrue: openModal } = useBoolean();

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä