diff --git a/.beagle.yml b/.beagle.yml index 22916021ae7e9eb6ba90ac3f1cd184b0e2e62b10..e0365a8e8853219693f4951eeb5949fe11778c68 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -3,7 +3,7 @@ name: docker trigger: branch: - - master + - v2.6-apaasv5 clone: disable: true @@ -26,7 +26,11 @@ steps: from_secret: SECRET_KEY_MINIO commands: - mc alias set cache --api=S3v4 https://cache.wodcloud.com $S3_ACCESS_KEY $S3_SECRET_KEY - - mc cp ./approval-process-2.5.1-apaasv5.tgz cache/kubernetes/market/approval-process-2.5.1-apaasv5.tgz + - mc cp ./approval-process-v2.6-apaasv5.tgz cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/approval-process-v2.6-apaasv5.tgz + - mc cp ./values.yaml cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/approval-process-v2.6-apaasv5.yaml + - mc cp ./README.md cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/approval-process-v2.6-apaasv5.md + - mc cp -r ./sql文件 cache/kubernetes/market/charts/approval-process/v2.6-apaasv5/ + --- kind: secret diff --git a/Chart.yaml b/Chart.yaml index 67b60f31f869009627e5e16ad731273b04ba5582..357dea2cdb8f8a0ba5c2a07c4328f0c246261336 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,28 +1,7 @@ -apiVersion: v2 -name: approval-process -description: A Helm chart for Kubernetes - -# A chart can be either an 'application' or a 'library' chart. -# -# Application charts are a collection of templates that can be packaged into versioned archives -# to be deployed. -# -# Library charts provide useful utilities or functions for the chart developer. They're included as -# a dependency of application charts to inject those utilities and functions into the rendering -# pipeline. Library charts do not define any templates and therefore cannot be deployed. -type: application - -# This is the chart version. This version number should be incremented each time you make changes -# to the chart and its templates, including the app version. -# Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.5.1-apaasv5 - -# This is the version number of the application being deployed. This version number should be -# incremented each time you make changes to the application. Versions are not expected to -# follow Semantic Versioning. They should reflect the version the application is using. -# It is recommended to use it with quotes. -appVersion: "1.16.0" - +apiVersion: v1 +name: beagle-approval-process +description: Beagle DataComputing Platform +version: v2.6-apaasv5 keywords: - beagle - data diff --git a/README.md b/README.md index 8ef90ecadaf9d861afd5cd4252063e6e3ed352f7..bae4b36266b780774e643a9fb3ae2709f3414729 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ### 概要说明 ``` -流程设计V2.4 +业务工作流v2.6-apaasv5 ``` ### 注意 ``` @@ -9,15 +9,36 @@ 2、服务配置的redis连接地址，需要和apaas中配置的地址保持一致； 3、values.yaml中的global参数均有注释，请根据注释配置正确。 ``` +### 镜像列表 +``` +--- amd版本 +hub.wodcloud.com/approval-process/approval-process-engine:2.6-apass5-amd64 + hub.wodcloud.com/approval-process/approval-process-form:2.6-apass5-amd64 +hub.wodcloud.com/workflow/approval-ui:2.6-alpha +hub.wodcloud.com/workflow/approval-form:2.6.0-form-alpha +zeebe amd镜像 +registry.cn-qingdao.aliyuncs.com/wod/zeebe:1.1.2-exporter-amd64 +importer amd镜像 +hub.wodcloud.com/workflow/process-importer:v1.5-alpha-amd64 + +--- arm版本 +hub.wodcloud.com/approval-process/approval-process-engine:2.6-apass5-arm64 +hub.wodcloud.com/approval-process/approval-process-form:2.6-apass5-arm64 +hub.wodcloud.com/workflow/approval-ui:2.6-alpha-arm64 +hub.wodcloud.com/workflow/approval-form:2.6.0-form-alpha-arm64 +zeebe arm镜像 +registry.cn-qingdao.aliyuncs.com/wod/zeebe:1.1.2-exporter-arm64 +importer arm镜像 +hub.wodcloud.com/workflow/process-importer:v1.5-alpha-arm64 +``` + ### DB说明 ``` -https://cloud.wodcloud.com/git/approval-process/approval-process-yaml/-/blob/master/deploy/product/v2.5.0-apaasv5/README.MD +https://cloud.wodcloud.com/git/approval-process/approval-process-yaml/-/blob/master/deploy/product/v2.6-apaasv5/README.MD -需要新建业务工作流数据库 执行product/v2.5.0/approval-process_init.sql -需要新建表单数据库 执行product/v2.5.0/approval-process-form_init.sql +工作流数据库 执行 sql/approval-process_init.sql 另执行apaas初始化流程录入 对应 sql/approval.sql +表单数据库 执行 sql/approval-process-form_init.sql 另执行apaas初始化字典录入 对应 sql/approval_form.sql -工作流数据库 执行product/v2.5.0-apaasv5/approval-process_init.sql -表单数据库 执行product/v2.5.0-apaasv5/approval-process-form_init.sql ``` ### 其他说明 @@ -25,14 +46,11 @@ https://cloud.wodcloud.com/git/approval-process/approval-process-yaml/-/blob/mas 部署方式详参deploy.md文件 依赖组件 -apaas-v3 & apaas-v5 +apaas-v5 postgres redis(apass所连接的redis) zeebe(新) zeebe-impoter(新) -zeebe arm镜像 -registry.cn-qingdao.aliyuncs.com/wod/zeebe:1.1.2-exporter-arm64 -importer arm镜像 -hub.wodcloud.com/workflow/process-importer:v1.5-alpha-arm64 +zeebe-impoter 需要连接的是服务编排的数据库，并配置zeebe内部断点 ``` diff --git a/deploy.md b/deploy.md index ee0c881a2b69551a0c1a8bcc1f7faf1ef2139e7a..381e219b81aea26ad0bcd99f34debba1dbcc59de 100644 --- a/deploy.md +++ b/deploy.md @@ -10,7 +10,7 @@ helm install \ approval-process \ /etc/kubernetes/charts/approval-process \ - --namespace apaas-v5-approval \ + --namespace approval-process \ -f /etc/kubernetes/charts/approval-process/values.yaml ``` @@ -19,7 +19,7 @@ helm upgrade \ approval-process \ /etc/kubernetes/charts/approval-process \ - --namespace apaas-v5-approval \ + --namespace approval-process \ -f /etc/kubernetes/charts/approval-process/values.yaml ``` @@ -27,9 +27,9 @@ ``` helm uninstall \ approval-process \ - --namespace apaas-v5-approval + --namespace approval-process - kubectl delete ns apaas-v5-approval + kubectl delete ns approval-process ``` ## Template @@ -37,13 +37,13 @@ helm template \ approval-process \ /etc/kubernetes/charts/approval-process \ - --namespace apaas-v5-approval \ + --namespace approval-process \ -f /etc/kubernetes/charts/approval-process/values.yaml > /etc/kubernetes/charts/approval-process-dist.yaml ``` ``` -kubectl create ns apaas-v5-approval +kubectl create ns approval-process # 1. Package helm package . @@ -51,27 +51,27 @@ helm package . # 2. Install helm install \ approval-process \ -/etc/kubernetes/charts/approval-process-2.5.1.tgz \ ---namespace apaas-v5-approval \ --f /etc/kubernetes/charts/approval-process-2.5.1.yaml +/etc/kubernetes/charts/approval-process-v2.6-apaasv5.tgz \ +--namespace approval-process \ +-f /etc/kubernetes/charts/approval-process-v2.6-apaasv5.yaml # 3. Upgrade helm upgrade \ approval-process \ -/etc/kubernetes/charts/approval-process-2.5.1.tgz \ ---namespace apaas-v5-approval \ --f /etc/kubernetes/charts/approval-process-2.5.1.yaml +/etc/kubernetes/charts/approval-process-v2.6-apaasv5.tgz \ +--namespace approval-process \ +-f /etc/kubernetes/charts/approval-process-v2.6-apaasv5.yaml # 4. Uninstall helm uninstall \ approval-process \ ---namespace apaas-v5-approval +--namespace approval-process # 5. Template helm template \ approval-process \ -/etc/kubernetes/charts/approval-process-2.5.1.tgz \ ---namespace apaas-v5-approval \ --f /etc/kubernetes/charts/approval-process-2.5.1.yaml > /etc/kubernetes/charts/approval-process-dist.yaml +/etc/kubernetes/charts/approval-process-v2.6-apaasv5.tgz \ +--namespace approval-process \ +-f /etc/kubernetes/charts/approval-process-v2.6-apaasv5.yaml > /etc/kubernetes/charts/approval-process-dist.yaml ``` \ No newline at end of file diff --git "a/sql\346\226\207\344\273\266/approval-process-form_init.sql" "b/sql\346\226\207\344\273\266/approval-process-form_init.sql" new file mode 100644 index 0000000000000000000000000000000000000000..a99e39d02863915f895c06ec8bb077702d111bfe --- /dev/null +++ "b/sql\346\226\207\344\273\266/approval-process-form_init.sql" @@ -0,0 +1,17 @@ +ALTER TABLE dict_type ADD COLUMN source int4; +COMMENT ON COLUMN dict_type.source IS '来源（0：用户字典1：系统字典）'; +ALTER TABLE dict ADD COLUMN source int4; +COMMENT ON COLUMN dict.source IS '来源（0：用户字典1：系统字典）'; +ALTER TABLE "public"."dict_type" ADD COLUMN "created_by" varchar(255); +COMMENT ON COLUMN "public"."dict_type"."created_by" IS '创建人'; +ALTER TABLE "public"."dict_type" ADD COLUMN "created_time" timestamp, ADD COLUMN "updated_by" varchar(255), ADD COLUMN "updated_time" timestamp; +COMMENT ON COLUMN "public"."dict_type"."created_time" IS '创建时间'; +COMMENT ON COLUMN "public"."dict_type"."updated_by" IS '修改人'; +COMMENT ON COLUMN "public"."dict_type"."updated_time" IS '修改时间'; + +update dict_type set source = 1 where id in ('fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', 'b9ab1b7c-dc4c-4a26-af32-b6b3c418189e'); + +INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('8cc99bb5-2294-40d3-9c30-0d146284b90b', '手机号', '/%5E(13%5B0-9%5D%7C14%5B5%7C7%5D%7C15%5B0%7C1%7C2%7C3%7C4%7C5%7C6%7C7%7C8%7C9%5D%7C18%5B0%7C1%7C2%7C3%7C5%7C6%7C7%7C8%7C9%5D)%5Cd%7B8%7D$/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '', '0', 'putong', '2022-05-10 17:13:37', 'putong', '2022-05-16 16:15:28', 0, '0'); +INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('ed09635f-6838-4ac0-9b7b-c7f571eace24', '数据校验', '/%5E%5B0-9%5D+(%5C.%5B0-9%5D%7B2%7D)?$/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '有两位小数的正实数', '0', 'putong', '2022-05-10 17:44:46', 'putong', '2022-08-19 13:46:05', 1, '0'); +INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('cb7f3e18-7182-45df-9f84-2c8ff6b53950', '身份证号', '/(%5E%5Cd%7B15%7D$)%7C(%5E%5Cd%7B18%7D$)%7C(%5E%5Cd%7B17%7D(%5Cd%7CX%7Cx)$)/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '身份证号查验', '0', 'putong', '2022-05-10 17:50:16', 'putong', '2022-05-16 16:15:28', 0, '0'); +INSERT INTO dict ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id") VALUES ('59a3d45d-b77d-4ef1-9ab0-d557cb413e72', '数字', '/%5E%5B0-9%5D*$/', 'fee3caa8-84aa-4a2f-bb5b-ae159ab535d5', '0-9的数字', '0', 'putong', '2022-05-10 13:59:02', 'putong', '2022-05-16 16:15:28', 0, '0'); diff --git "a/sql\346\226\207\344\273\266/approval-process_init.sql" "b/sql\346\226\207\344\273\266/approval-process_init.sql" new file mode 100644 index 0000000000000000000000000000000000000000..794c773e4adc61eb980a2850e449fd19763c93ea --- /dev/null +++ "b/sql\346\226\207\344\273\266/approval-process_init.sql" @@ -0,0 +1,266 @@ +-- 增加 实例用户权限表 +DROP TABLE IF EXISTS instance_user_permission; +CREATE TABLE instance_user_permission +( + instance_key int8 NOT NULL, + element_id varchar(64) NOT NULL, + user_id varchar(64) , + operation varchar(64), + source_type int4, + created_time timestamp(6), + updated_time timestamp(6), + CONSTRAINT "instance_element_user_key" UNIQUE ("instance_key", "element_id", "user_id") +); + +COMMENT ON COLUMN instance_user_permission.instance_key IS '实例ID'; +COMMENT ON COLUMN instance_user_permission.element_id IS '节点ID'; +COMMENT ON COLUMN instance_user_permission.user_id IS '审批人'; +COMMENT ON COLUMN instance_user_permission.operation IS '操作'; +COMMENT ON COLUMN instance_user_permission.source_type IS '来源类型 1.流程指定 2.创建时指定 3.指派 4.转办'; +COMMENT ON COLUMN instance_user_permission.created_time IS '创建时间'; +COMMENT ON COLUMN instance_user_permission.updated_time IS '更新时间'; +COMMENT ON TABLE instance_user_permission IS '实例用户权限'; + + +DROP TABLE IF EXISTS process_instance_job_user; +CREATE TABLE "process_instance_job_user" +( + "instance_key" int8, + "job_user_id" varchar(64), + "job_key" int8, + "user_id" varchar(64), + "operation" varchar(64), + "state" varchar(8), + "created_time" timestamp(6), + "updated_time" timestamp(6), + "source" varchar(64) +); +COMMENT ON COLUMN "process_instance_job_user"."instance_key" IS '实例ID'; +COMMENT ON COLUMN "process_instance_job_user"."job_user_id" IS '任务用户ID'; +COMMENT ON COLUMN "process_instance_job_user"."job_key" IS '任务ID'; +COMMENT ON COLUMN "process_instance_job_user"."user_id" IS '用户ID'; +COMMENT ON COLUMN "process_instance_job_user"."operation" IS '操作权限'; +COMMENT ON COLUMN "process_instance_job_user"."state" IS '状态 0 未处理 1 已处理状态'; +COMMENT ON COLUMN "process_instance_job_user"."created_time" IS '创建时间'; +COMMENT ON COLUMN "process_instance_job_user"."updated_time" IS '更新时间'; +COMMENT ON COLUMN "process_instance_job_user"."source" IS '来源'; + + + + + +-- 增加 消息场景表 +DROP TABLE IF EXISTS message_send_queue; +CREATE TABLE "message_send_queue" +( + "message_queue_id" varchar(64) NOT NULL, + "user_id" varchar(64), + "message_model_number" varchar(64), + "notify_way" varchar(64), + "message_type" varchar(32), + "title" varchar(255), + "msg_info" varchar(255), + "template_value" text, + "message_template" text, + "image_model" text, + "model_file" text, + "action_model" varchar(255), + "phone_number" varchar(64), + "reason_type" varchar(64), + "state" varchar(32), + "retry_time" int4, + "created_time" timestamp(6), + "updated_time" timestamp(6), + CONSTRAINT "message_send_queue_pkey" PRIMARY KEY ("message_queue_id") +); + +COMMENT ON COLUMN "message_send_queue"."message_queue_id" IS '消息队列ID'; +COMMENT ON COLUMN "message_send_queue"."user_id" IS '用户ID'; +COMMENT ON COLUMN "message_send_queue"."message_model_number" IS '模板编号'; +COMMENT ON COLUMN "message_send_queue"."notify_way" IS '通知方式(1-站内信, 2-邮件, 3-短信)'; +COMMENT ON COLUMN "message_send_queue"."message_type" IS '消息类型 (1-文本消息, 2-图片消息, 3-动作消息) '; +COMMENT ON COLUMN "message_send_queue"."title" IS '消息标题'; +COMMENT ON COLUMN "message_send_queue"."msg_info" IS '消息内容'; +COMMENT ON COLUMN "message_send_queue"."template_value" IS '参数值'; +COMMENT ON COLUMN "message_send_queue"."message_template" IS '消息模板'; +COMMENT ON COLUMN "message_send_queue"."image_model" IS '图片模板'; +COMMENT ON COLUMN "message_send_queue"."model_file" IS '文件模板'; +COMMENT ON COLUMN "message_send_queue"."action_model" IS '动作模版值'; +COMMENT ON COLUMN "message_send_queue"."phone_number" IS '手机号'; +COMMENT ON COLUMN "message_send_queue"."reason_type" IS '消息发送原因类型'; +COMMENT ON COLUMN "message_send_queue"."state" IS '状态 1.未发送 2.已发送'; +COMMENT ON COLUMN "message_send_queue"."retry_time" IS '重试次数'; +COMMENT ON COLUMN "message_send_queue"."created_time" IS '创建时间'; +COMMENT ON COLUMN "message_send_queue"."updated_time" IS '更新时间'; +COMMENT ON TABLE "message_send_queue" IS '消息队列表'; + + + + + +-- 增加 消息发送队列表 +DROP TABLE IF EXISTS message_send_queue; +CREATE TABLE message_send_queue +( + message_queue_id varchar(64) NOT NULL, + user_id varchar(64), + message_model_number varchar(64), + notify_way varchar(64), + message_type varchar(32), + title varchar(255), + msg_info varchar(255), + template_value text, + message_template text, + image_model text, + model_file text, + action_model varchar(255), + phone_number varchar(64), + reason_type varchar(64), + state varchar(32), + retry_time int4, + created_time timestamp(6), + updated_time timestamp(6), + CONSTRAINT message_send_queue_pkey PRIMARY KEY (message_queue_id) +) +; +COMMENT ON COLUMN message_send_queue.message_queue_id IS '消息队列ID'; +COMMENT ON COLUMN message_send_queue.user_id IS '用户ID'; +COMMENT ON COLUMN message_send_queue.message_model_number IS '模板编号'; +COMMENT ON COLUMN message_send_queue.notify_way IS '通知方式(1-站内信, 2-邮件, 3-短信)'; +COMMENT ON COLUMN message_send_queue.message_type IS '消息类型 (1-文本消息, 2-图片消息, 3-动作消息) '; +COMMENT ON COLUMN message_send_queue.title IS '消息标题'; +COMMENT ON COLUMN message_send_queue.msg_info IS '消息内容'; +COMMENT ON COLUMN message_send_queue.template_value IS '参数值'; +COMMENT ON COLUMN message_send_queue.message_template IS '消息模板'; +COMMENT ON COLUMN message_send_queue.image_model IS '图片模板'; +COMMENT ON COLUMN message_send_queue.model_file IS '文件模板'; +COMMENT ON COLUMN message_send_queue.action_model IS '动作模版值'; +COMMENT ON COLUMN message_send_queue.phone_number IS '手机号'; +COMMENT ON COLUMN message_send_queue.reason_type IS '消息发送原因类型'; +COMMENT ON COLUMN message_send_queue.state IS '状态 1.未发送 2.已发送'; +COMMENT ON COLUMN message_send_queue.retry_time IS '重试次数'; +COMMENT ON COLUMN message_send_queue.created_time IS '创建时间'; +COMMENT ON COLUMN message_send_queue.updated_time IS '更新时间'; +COMMENT ON TABLE message_send_queue IS '消息队列表'; + + + + + +-- 新增传阅表 process_instance_cc_info +DROP TABLE IF EXISTS process_instance_cc_info; +CREATE TABLE process_instance_cc_info +( + process_instance_cc_info_id varchar(64), + instance_key int8, + user_id varchar(64), + from_user_id varchar(64), + element_id varchar(64), + created_time timestamp, + is_read int4, + updated_time timestamp, + CONSTRAINT process_instance_cc_info_pkey PRIMARY KEY (process_instance_cc_info_id) +); +COMMENT ON COLUMN process_instance_cc_info.process_instance_cc_info_id IS '传阅ID'; +COMMENT ON COLUMN process_instance_cc_info.instance_key IS '实例Key'; +COMMENT ON COLUMN process_instance_cc_info.user_id IS '用户ID'; +COMMENT ON COLUMN process_instance_cc_info.from_user_id IS '来源用户ID'; +COMMENT ON COLUMN process_instance_cc_info.element_id IS '节点ID'; +COMMENT ON COLUMN process_instance_cc_info.created_time IS '创建时间'; +COMMENT ON COLUMN process_instance_cc_info.is_read IS '是否已阅 0-未阅 1-已阅'; +COMMENT ON COLUMN process_instance_cc_info.updated_time IS '更新时间'; + + + + + +-- 删除弃用的消息发送记录表 message_send_log +drop table message_send_log; + + + + + +-- 流程信息表 增加字段 数据来源 +ALTER TABLE process_info ADD COLUMN data_source varchar(8); +ALTER TABLE process_info ADD COLUMN free_cc varchar(8); +ALTER TABLE process_info ADD COLUMN opinion_required varchar(8); +COMMENT ON COLUMN process_info.data_source IS '数据来源'; +COMMENT ON COLUMN process_info.free_cc IS '自由传阅'; +COMMENT ON COLUMN process_info.opinion_required IS '审批意见 是否必填'; +-- 流程信息表 刷数据(给历史数据 为 新增的字段 设置值) +update process_info set data_source = '1' where item_type in ('1', '2'); +update process_info set data_source = '2' where item_type in ('5'); + + + + + +-- 流程历史信息表 增加字段 数据来源 +ALTER TABLE process_info_history ADD COLUMN data_source varchar(8); +ALTER TABLE process_info_history ADD COLUMN free_cc varchar(8); +ALTER TABLE process_info_history ADD COLUMN opinion_required varchar(8); +COMMENT ON COLUMN process_info_history.data_source IS '数据来源'; +COMMENT ON COLUMN process_info_history.free_cc IS '自由传阅'; +COMMENT ON COLUMN process_info_history.opinion_required IS '审批意见 是否必填'; +-- 流程历史信息表 刷数据(给历史数据 为 新增的字段 设置值) +update process_info_history set data_source = '1' where item_type in ('1', '2'); +update process_info_history set data_source = '2' where item_type in ('5'); + + + + + +-- 流程节点表 增加字段 转办名称 传阅名称 指派名称 +ALTER TABLE process_node_item ADD COLUMN transfer_name varchar(255); +ALTER TABLE process_node_item ADD COLUMN cc_name varchar(255); +ALTER TABLE process_node_item ADD COLUMN assign_name varchar(255); +ALTER TABLE process_node_item ADD COLUMN assign_element varchar(255); +COMMENT ON COLUMN process_node_item.transfer_name IS '转办名称'; +COMMENT ON COLUMN process_node_item.cc_name IS '传阅名称'; +COMMENT ON COLUMN process_node_item.assign_name IS '指派名称'; +COMMENT ON COLUMN process_node_item.assign_element IS '指派节点'; + + +ALTER TABLE process_instance_info ADD COLUMN notified int4; +COMMENT ON COLUMN process_instance_info.notified IS '是否已通知'; + +DROP TABLE IF EXISTS message_scene_info; +CREATE TABLE "message_scene_info" ( + "message_scene_id" varchar(64) COLLATE "pg_catalog"."default" NOT NULL, + "message_scene_key" varchar(64) COLLATE "pg_catalog"."default", + "message_title" varchar(255) COLLATE "pg_catalog"."default", + "notify_way" varchar(64) COLLATE "pg_catalog"."default", + "message_type" varchar(32) COLLATE "pg_catalog"."default", + "message_model_number" varchar(64) COLLATE "pg_catalog"."default", + "message_template" text COLLATE "pg_catalog"."default", + "image_model" text COLLATE "pg_catalog"."default", + "model_file" text COLLATE "pg_catalog"."default", + "action_model" text COLLATE "pg_catalog"."default", + "state" varchar(32) COLLATE "pg_catalog"."default", + "created_by" varchar(64) COLLATE "pg_catalog"."default", + "created_time" timestamp(6), + "updated_by" varchar(64) COLLATE "pg_catalog"."default", + "updated_time" timestamp(6), + CONSTRAINT "message_scene_info_pkey" PRIMARY KEY ("message_scene_id") +) +; +COMMENT ON COLUMN "message_scene_info"."message_scene_id" IS '消息场景ID'; +COMMENT ON COLUMN "message_scene_info"."message_scene_key" IS '消息场景KEY'; +COMMENT ON COLUMN "message_scene_info"."message_title" IS '消息标题'; +COMMENT ON COLUMN "message_scene_info"."notify_way" IS '通知方式(1-站内信, 2-邮件, 3-短信)'; +COMMENT ON COLUMN "message_scene_info"."message_type" IS '消息类型 (1-文本消息, 2-图片消息, 3-动作消息) '; +COMMENT ON COLUMN "message_scene_info"."message_model_number" IS '消息中心模板编号'; +COMMENT ON COLUMN "message_scene_info"."message_template" IS '模板内容'; +COMMENT ON COLUMN "message_scene_info"."image_model" IS '图片模版值 '; +COMMENT ON COLUMN "message_scene_info"."model_file" IS '模版文件 '; +COMMENT ON COLUMN "message_scene_info"."action_model" IS '动作模版值'; +COMMENT ON COLUMN "message_scene_info"."state" IS '状态 0启动 1禁用'; +COMMENT ON COLUMN "message_scene_info"."created_by" IS '创建人'; +COMMENT ON COLUMN "message_scene_info"."created_time" IS '创建时间'; +COMMENT ON COLUMN "message_scene_info"."updated_by" IS '更新人'; +COMMENT ON COLUMN "message_scene_info"."updated_time" IS '更新时间'; +COMMENT ON TABLE "message_scene_info" IS '消息场景信息'; + +ALTER TABLE "zeebe_variable" +ALTER COLUMN "value_" TYPE text COLLATE "pg_catalog"."default" USING "value_"::text; \ No newline at end of file diff --git "a/sql\346\226\207\344\273\266/approval.sql" "b/sql\346\226\207\344\273\266/approval.sql" new file mode 100644 index 0000000000000000000000000000000000000000..dbee5eae4239bfe8a0c01e35edae99297b184ec1 --- /dev/null +++ "b/sql\346\226\207\344\273\266/approval.sql" @@ -0,0 +1,376 @@ + +--流程库(如：approval-apass5-test)内置apaas流程：1应用申请流程2：云资源申请流程3：能力上下架审批4能力申请流程；5应用上下架审批 +INSERT INTO "public"."process_info" ("process_id", "process_name", "process_desc", "process_type", "form_type", "form_id", "form_name", "form_version", "bpmn_xml", "is_released", "released_date", "version", "is_deleted", "created_by", "created_time", "updated_by", "updated_time", "category_id", "category_name", "item_type", "item_value", "cancel_at_will", "withdraw_at_will", "message_type", "message_retry_time", "remote_form_param", "org_id", "data_source", "free_cc", "opinion_required", "system_code" ) VALUES ('Process_202012190004', '应用上下架审批', NULL, 1, '1', NULL, NULL, NULL, ' + + + + Flow_1krb6fv + + + Flow_1krb6fv + Flow_1s2kck9 + + + + Flow_1s2kck9 + Flow_0mk6c12 + + + + Flow_0mk6c12 + Flow_19hu3up + + + + Flow_19hu3up + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +', 0, NULL, NULL, 0, 'admin', '2023-12-19 18:19:05.675663', NULL, NULL, 'bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', '2', '1746af3c-059d-4870-b076-6e78c617a142', '1', '1', NULL, 0, '', '', '1', '1', '1', 'apaas'); +INSERT INTO "public"."process_info" ("process_id", "process_name", "process_desc", "process_type", "form_type", "form_id", "form_name", "form_version", "bpmn_xml", "is_released", "released_date", "version", "is_deleted", "created_by", "created_time", "updated_by", "updated_time", "category_id", "category_name", "item_type", "item_value", "cancel_at_will", "withdraw_at_will", "message_type", "message_retry_time", "remote_form_param", "org_id", "data_source", "free_cc", "opinion_required", "system_code" ) VALUES ('Process_202012190005', '应用申请流程', NULL, 1, '1', NULL, NULL, NULL, ' + + + + Flow_1c80nlv + + + Flow_1c80nlv + Flow_0q4oeoo + + + + Flow_0q4oeoo + Flow_1ias7d9 + + + + Flow_1ias7d9 + Flow_0of72pv + + + + Flow_0of72pv + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +', 0, NULL, NULL, 0, 'admin', '2023-12-19 18:20:33.777883', NULL, NULL, 'bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', '2', '1746af3c-059d-4870-b076-6e78c617a142', '1', '1', NULL, 0, '', '', '1', '1', '1', 'apaas'); +INSERT INTO "public"."process_info" ("process_id", "process_name", "process_desc", "process_type", "form_type", "form_id", "form_name", "form_version", "bpmn_xml", "is_released", "released_date", "version", "is_deleted", "created_by", "created_time", "updated_by", "updated_time", "category_id", "category_name", "item_type", "item_value", "cancel_at_will", "withdraw_at_will", "message_type", "message_retry_time", "remote_form_param", "org_id", "data_source", "free_cc", "opinion_required", "system_code" ) VALUES ('Process_202012190006', '云资源申请流程', NULL, 1, '1', NULL, NULL, NULL, ' + + + + Flow_0tal1n8 + + + Flow_0tal1n8 + Flow_0sqi8ia + + + + Flow_0sqi8ia + Flow_0nrfol5 + + + + Flow_0nrfol5 + Flow_09zyv13 + + + + Flow_09zyv13 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +', 0, NULL, NULL, 0, 'admin', '2023-12-19 18:23:16.940132', NULL, NULL, 'bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', '2', '1746af3c-059d-4870-b076-6e78c617a142', '1', '1', NULL, 0, '', '', '1', '1', '1', 'apaas'); +INSERT INTO "public"."process_info" ("process_id", "process_name", "process_desc", "process_type", "form_type", "form_id", "form_name", "form_version", "bpmn_xml", "is_released", "released_date", "version", "is_deleted", "created_by", "created_time", "updated_by", "updated_time", "category_id", "category_name", "item_type", "item_value", "cancel_at_will", "withdraw_at_will", "message_type", "message_retry_time", "remote_form_param", "org_id", "data_source", "free_cc", "opinion_required", "system_code" ) VALUES ('Process_202012190002', '能力上下架审批', NULL, 1, '1', NULL, NULL, NULL, ' + + + + Flow_0zlqs2t + + + Flow_0zlqs2t + Flow_1b5c0hy + + + + Flow_1b5c0hy + Flow_0rqejsc + + + + Flow_0rqejsc + Flow_0o74lql + + + + Flow_0o74lql + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +', 0, NULL, NULL, 0, 'admin', '2023-12-19 18:16:24.855316', NULL, NULL, 'bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', '2', '1746af3c-059d-4870-b076-6e78c617a142', '1', '1', NULL, 0, '', '', '1', '1', '1', 'apaas'); +INSERT INTO "public"."process_info" ("process_id", "process_name", "process_desc", "process_type", "form_type", "form_id", "form_name", "form_version", "bpmn_xml", "is_released", "released_date", "version", "is_deleted", "created_by", "created_time", "updated_by", "updated_time", "category_id", "category_name", "item_type", "item_value", "cancel_at_will", "withdraw_at_will", "message_type", "message_retry_time", "remote_form_param", "org_id", "data_source", "free_cc", "opinion_required", "system_code" ) VALUES ('Process_202012190003', '能力申请流程', NULL, 1, '1', NULL, NULL, NULL, ' + + + + Flow_0mm9ghj + + + Flow_0mm9ghj + Flow_1t4b47w + + + + Flow_1t4b47w + Flow_10mqlyf + + + + Flow_10mqlyf + Flow_1ypoyj3 + + + + Flow_1ypoyj3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +', 0, NULL, NULL, 0, 'admin', '2023-12-19 18:17:48.252655', NULL, NULL, 'bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', '2', '2077e449-c3aa-43b4-aec4-c4a7188ac4b1,1746af3c-059d-4870-b076-6e78c617a142', '1', '1', NULL, 0, '', '', '1', '1', '1', 'apaas'); + +--process_node_item 流程节点信息录入 +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190002', 0, NULL, 'Activity_0kcbla0', 'userTask', 'operation', '3', '5', NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190002', 0, NULL, 'Activity_0tw704g', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190002', 0, NULL, 'Activity_0tw704g', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190002', 0, NULL, 'Activity_0uv9wi5', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190003', 0, NULL, 'Activity_0rm44je', 'userTask', 'operation', '3', '5', NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190004', 0, NULL, 'Activity_0xjvqpq', 'userTask', 'operation', '3', '5', NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190003', 0, NULL, 'Activity_0gq5d7u', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190003', 0, NULL, 'Activity_0gq5d7u', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190003', 0, NULL, 'Activity_18apocb', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190003', 0, NULL, 'Activity_18apocb', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190004', 0, NULL, 'Activity_19ahs3m', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190004', 0, NULL, 'Activity_19ahs3m', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190004', 0, NULL, 'Activity_18kanz8', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190004', 0, NULL, 'Activity_18kanz8', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190005', 0, NULL, 'Activity_161wjz4', 'userTask', 'operation', '3', '5', NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190005', 0, NULL, 'Activity_1mda02g', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190005', 0, NULL, 'Activity_1mda02g', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190005', 0, NULL, 'Activity_0f1ggjw', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190005', 0, NULL, 'Activity_0f1ggjw', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190006', 0, NULL, 'Activity_0z3nkgi', 'userTask', 'operation', '3', '5', NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190006', 0, NULL, 'Activity_1rbhl7t', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190006', 0, NULL, 'Activity_1rbhl7t', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190006', 0, NULL, 'Activity_12sad97', 'userTask', 'role', '2', 'a57bf411-524a-4385-b984-cf880963c434', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190006', 0, NULL, 'Activity_12sad97', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); +INSERT INTO process_node_item ("process_id", "is_released", "version", "element_id", "element_type", "item_name", "item_type", "item_value", "ext1", "ext2", "ext3", "is_deleted", "approve_type", "timeout", "time_unit", "expire_time", "auto_process_type", "submit_node", "message_type", "agree_name", "reject_name", "fullback_name", "transfer_name", "cc_name", "assign_name", "assign_element" ) VALUES ('Process_202012190002', 0, NULL, 'Activity_0uv9wi5', 'userTask', 'operation', '3', '1,2', NULL, NULL, NULL, 0, 1, 0, 12, NULL, '', NULL, '', '通过', '拒绝', '退回', '转办', '传阅', '指派', NULL); + + diff --git "a/sql\346\226\207\344\273\266/approval_form.sql" "b/sql\346\226\207\344\273\266/approval_form.sql" new file mode 100644 index 0000000000000000000000000000000000000000..687a029e62ae7e6f4c700c4e1dff144c7fb99aee --- /dev/null +++ "b/sql\346\226\207\344\273\266/approval_form.sql" @@ -0,0 +1,5 @@ +--form库（如：approva-forml-apass5-test）新增流程分类（apaas流程） +delete from dict_type where id='b9ab1b7c-dc4c-4a26-af32-b6b3c418189e' or name='流程分类'; +INSERT INTO "public"."dict_type" ("id", "name", "sort", "source", "created_by", "created_time", "updated_by", "updated_time") VALUES ('b9ab1b7c-dc4c-4a26-af32-b6b3c418189e', '流程分类', 2, 1, NULL, NULL, NULL, NULL); +delete from dict where id='bda2e235-e9ab-4358-89fa-6575fc85045f' or dict_name='aPaaS流程'; +INSERT INTO "public"."dict" ("id", "dict_name", "dict_value", "dict_type", "dict_desc", "dict_status", "created_by", "created_time", "updated_by", "updated_time", "is_deleted", "parent_id", "source") VALUES ('bda2e235-e9ab-4358-89fa-6575fc85045f', 'aPaaS流程', 'aPaaS\u6D41\u7A0B', 'b9ab1b7c-dc4c-4a26-af32-b6b3c418189e', '', '0', 'admin', '2023-09-08 16:53:18', 'admin', '2023-09-08 16:53:18', 0, '0', 0); diff --git a/templates/approval-form/deployment.yaml b/templates/approval-form/deployment.yaml index d12b36e78be642064c3a5678e0c674417ecfc7d5..13e7f4336d080a2e6ec297ef48f38601bc2be604 100644 --- a/templates/approval-form/deployment.yaml +++ b/templates/approval-form/deployment.yaml @@ -1,33 +1,33 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: approval-form + name: {{ .Release.Name }}-form-ui labels: - app.kubernetes.io/name: approval-form + app.kubernetes.io/name: {{ .Release.Name }}-form-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-form + app: {{ .Release.Name }}-form-ui spec: replicas: 1 selector: matchLabels: - app: approval-form + app: {{ .Release.Name }}-form-ui template: metadata: labels: - app.kubernetes.io/name: approval-form + app.kubernetes.io/name: {{ .Release.Name }}-form-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-form + app: {{ .Release.Name }}-form-ui spec: volumes: - name: localtime hostPath: path: /etc/localtime containers: - - name: approval-form + - name: {{ .Release.Name }}-form-ui {{- if contains "/" .Values.approvalForm.image.repository }} image: "{{ .Values.approvalForm.image.repository }}:{{ .Values.approvalForm.image.tag }}{{ include "beagle.imageArch" . }}" {{- else }} @@ -37,7 +37,7 @@ spec: resources: {{- toYaml .Values.approvalForm.resources | nindent 12 }} ports: - - containerPort: 80 + - containerPort: 8080 name: http protocol: TCP volumeMounts: diff --git a/templates/approval-form/ingressroute.yaml b/templates/approval-form/ingressroute.yaml index 36d6d5a668bfc4a1b0a095e91af10bfc46c7274d..eb212c8e73895ba023cc3abcb41fd64c1cd22065 100644 --- a/templates/approval-form/ingressroute.yaml +++ b/templates/approval-form/ingressroute.yaml @@ -3,13 +3,13 @@ kind: IngressRoute apiVersion: bcc.bd-apaas.com/v1alpha1 metadata: - name: approval-form + name: {{ .Release.Name }}-form-ui labels: - app.kubernetes.io/name: approval-form + app.kubernetes.io/name: {{ .Release.Name }}-form-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-form + app: {{ .Release.Name }}-form-ui spec: entryPoints: - websecure @@ -18,7 +18,7 @@ spec: match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval/form`) services: - kind: Service - name: approval-form + name: {{ .Release.Name }}-form-ui port: 80 tls: {} {{- end }} \ No newline at end of file diff --git a/templates/approval-form/service.yaml b/templates/approval-form/service.yaml index 7939bf33ceebc41b3e9896926bea07c5d26c636e..34c217b150d32be1c7bebc30e77086467df7451a 100644 --- a/templates/approval-form/service.yaml +++ b/templates/approval-form/service.yaml @@ -2,13 +2,13 @@ kind: Service apiVersion: v1 metadata: - name: approval-form + name: {{ .Release.Name }}-form-ui labels: - app.kubernetes.io/name: approval-form + app.kubernetes.io/name: {{ .Release.Name }}-form-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-form + app: {{ .Release.Name }}-form-ui spec: ports: - name: http @@ -16,4 +16,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app: approval-form \ No newline at end of file + app: {{ .Release.Name }}-form-ui \ No newline at end of file diff --git a/templates/approval-process-engine/configmap.yaml b/templates/approval-process-engine/configmap.yaml index ed88a59ab481f1f9e663f6729d71a04c5220b1ac..311c9d2c3c9058d84a7f9c7f626687b07e0ff6a2 100644 --- a/templates/approval-process-engine/configmap.yaml +++ b/templates/approval-process-engine/configmap.yaml @@ -2,9 +2,9 @@ kind: ConfigMap apiVersion: v1 metadata: - name: approval-process-engine-config + name: {{ .Release.Name }}-engine-config labels: - app.kubernetes.io/name: approval-process-engine-config + app.kubernetes.io/name: {{ .Release.Name }}-engine-config helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" diff --git a/templates/approval-process-engine/deployment.yaml b/templates/approval-process-engine/deployment.yaml index 58515ab860d2c40dffb52333615963a9cd826ac9..e79d52a24a977b51fdb8343c20787ba85f23c762 100644 --- a/templates/approval-process-engine/deployment.yaml +++ b/templates/approval-process-engine/deployment.yaml @@ -1,33 +1,33 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: approval-process-engine + name: {{ .Release.Name }}-engine labels: - app.kubernetes.io/name: approval-process-engine + app.kubernetes.io/name: {{ .Release.Name }}-engine helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-engine + app: {{ .Release.Name }}-engine spec: replicas: 1 selector: matchLabels: - app: approval-process-engine + app: {{ .Release.Name }}-engine template: metadata: labels: - app.kubernetes.io/name: approval-process-engine + app.kubernetes.io/name: {{ .Release.Name }}-engine helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-engine + app: {{ .Release.Name }}-engine spec: volumes: - name: localtime hostPath: path: /etc/localtime containers: - - name: approval-process-engine + - name: {{ .Release.Name }}-engine {{- if contains "/" .Values.approvalProcessEngine.image.repository }} image: "{{ .Values.approvalProcessEngine.image.repository }}:{{ .Values.approvalProcessEngine.image.tag }}{{ include "beagle.imageArch" . }}" {{- else }} @@ -45,7 +45,7 @@ spec: mountPath: /etc/localtime envFrom: - configMapRef: - name: approval-process-engine-config + name: {{ .Release.Name }}-engine-config diff --git a/templates/approval-process-engine/ingressroute.yaml b/templates/approval-process-engine/ingressroute.yaml index c2f6348f59ab2005f66bd4d434d8cd3bc56e0c2e..6af3a8a98eb4cd387e623824e7dad31f0a3ccc20 100644 --- a/templates/approval-process-engine/ingressroute.yaml +++ b/templates/approval-process-engine/ingressroute.yaml @@ -3,13 +3,13 @@ kind: IngressRoute apiVersion: bcc.bd-apaas.com/v1alpha1 metadata: - name: approval-process-engine + name: {{ .Release.Name }}-engine labels: - app.kubernetes.io/name: approval-process-engine + app.kubernetes.io/name: {{ .Release.Name }}-engine helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-engine + app: {{ .Release.Name }}-engine spec: entryPoints: - websecure @@ -18,7 +18,7 @@ spec: match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval-process`) services: - kind: Service - name: approval-process-engine + name: {{ .Release.Name }}-engine port: 80 tls: {} {{- end }} \ No newline at end of file diff --git a/templates/approval-process-engine/service.yaml b/templates/approval-process-engine/service.yaml index 0788f538bd34fa3dda315536a53810495bc2d024..5b62dad1a9ba6bbb2ec4d989c50323f597c9c835 100644 --- a/templates/approval-process-engine/service.yaml +++ b/templates/approval-process-engine/service.yaml @@ -2,13 +2,13 @@ kind: Service apiVersion: v1 metadata: - name: approval-process-engine + name: {{ .Release.Name }}-engine labels: - app.kubernetes.io/name: approval-process-engine + app.kubernetes.io/name: {{ .Release.Name }}-engine helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-engine + app: {{ .Release.Name }}-engine spec: ports: - name: http @@ -16,4 +16,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app: approval-process-engine \ No newline at end of file + app: {{ .Release.Name }}-engine \ No newline at end of file diff --git a/templates/approval-process-form/configmap.yaml b/templates/approval-process-form/configmap.yaml index 9ba3a3653efd354bcde322eab197652748200302..b0e84df5059afaefdd3fb59b098fe02da6f68e1e 100644 --- a/templates/approval-process-form/configmap.yaml +++ b/templates/approval-process-form/configmap.yaml @@ -2,9 +2,9 @@ kind: ConfigMap apiVersion: v1 metadata: - name: approval-process-form-config + name: {{ .Release.Name }}-form-config labels: - app.kubernetes.io/name: approval-process-form-config + app.kubernetes.io/name: {{ .Release.Name }}-form-config helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" diff --git a/templates/approval-process-form/deployment.yaml b/templates/approval-process-form/deployment.yaml index 7ca64f0ceac3dd3eccc9cab39018945a33180e2f..a44e4cfb942da0f46cd280d6e276e9f07f07773f 100644 --- a/templates/approval-process-form/deployment.yaml +++ b/templates/approval-process-form/deployment.yaml @@ -1,33 +1,33 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: approval-process-form + name: {{ .Release.Name }}-form labels: - app.kubernetes.io/name: approval-process-form + app.kubernetes.io/name: {{ .Release.Name }}-form helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-form + app: {{ .Release.Name }}-form spec: replicas: 1 selector: matchLabels: - app: approval-process-form + app: {{ .Release.Name }}-form template: metadata: labels: - app.kubernetes.io/name: approval-process-form + app.kubernetes.io/name: {{ .Release.Name }}-form helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-form + app: {{ .Release.Name }}-form spec: volumes: - name: localtime hostPath: path: /etc/localtime containers: - - name: approval-process-form + - name: {{ .Release.Name }}-form {{- if contains "/" .Values.approvalProcessForm.image.repository }} image: "{{ .Values.approvalProcessForm.image.repository }}:{{ .Values.approvalProcessForm.image.tag }}{{ include "beagle.imageArch" . }}" {{- else }} @@ -65,7 +65,7 @@ spec: mountPath: /etc/localtime envFrom: - configMapRef: - name: approval-process-form-config + name: {{ .Release.Name }}-form-config diff --git a/templates/approval-process-form/ingressroute.yaml b/templates/approval-process-form/ingressroute.yaml index 94181293904627bc2e4d74b02d910263e8aac94b..1ef0d6af6517a27d1a8ce30c5cbae8c6656d1f1f 100644 --- a/templates/approval-process-form/ingressroute.yaml +++ b/templates/approval-process-form/ingressroute.yaml @@ -3,13 +3,13 @@ kind: IngressRoute apiVersion: bcc.bd-apaas.com/v1alpha1 metadata: - name: approval-process-form + name: {{ .Release.Name }}-form labels: - app.kubernetes.io/name: approval-process-form + app.kubernetes.io/name: {{ .Release.Name }}-form helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-form + app: {{ .Release.Name }}-form spec: entryPoints: - websecure @@ -18,7 +18,7 @@ spec: match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval-form`) services: - kind: Service - name: approval-process-form + name: {{ .Release.Name }}-form port: 80 tls: {} {{- end }} \ No newline at end of file diff --git a/templates/approval-process-form/service.yaml b/templates/approval-process-form/service.yaml index 9112d083191df1b0ea5dd65e9a6b530cb00ce6a2..aaa676c79694b88de654793f723e886f29300f60 100644 --- a/templates/approval-process-form/service.yaml +++ b/templates/approval-process-form/service.yaml @@ -2,13 +2,13 @@ kind: Service apiVersion: v1 metadata: - name: approval-process-form + name: {{ .Release.Name }}-form labels: - app.kubernetes.io/name: approval-process-form + app.kubernetes.io/name: {{ .Release.Name }}-form helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-process-form + app: {{ .Release.Name }}-form spec: ports: - name: http @@ -16,4 +16,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app: approval-process-form \ No newline at end of file + app: {{ .Release.Name }}-form \ No newline at end of file diff --git a/templates/approval-ui/deployment.yaml b/templates/approval-ui/deployment.yaml index 0f4411736c72b47b75d37116be51c4813fcaf7c5..7905ceed58f28119bdc86cbfdeec41cabb1fca4a 100644 --- a/templates/approval-ui/deployment.yaml +++ b/templates/approval-ui/deployment.yaml @@ -1,33 +1,33 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: approval-ui + name: {{ .Release.Name }}-ui labels: - app.kubernetes.io/name: approval-ui + app.kubernetes.io/name: {{ .Release.Name }}-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-ui + app: {{ .Release.Name }}-ui spec: replicas: 1 selector: matchLabels: - app: approval-ui + app: {{ .Release.Name }}-ui template: metadata: labels: - app.kubernetes.io/name: approval-ui + app.kubernetes.io/name: {{ .Release.Name }}-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-ui + app: {{ .Release.Name }}-ui spec: volumes: - name: localtime hostPath: path: /etc/localtime containers: - - name: approval-ui + - name: {{ .Release.Name }}-ui {{- if contains "/" .Values.approvalUi.image.repository }} image: "{{ .Values.approvalUi.image.repository }}:{{ .Values.approvalUi.image.tag }}{{ include "beagle.imageArch" . }}" {{- else }} @@ -37,7 +37,7 @@ spec: resources: {{- toYaml .Values.approvalUi.resources | nindent 12 }} ports: - - containerPort: 80 + - containerPort: 8080 name: http protocol: TCP volumeMounts: diff --git a/templates/approval-ui/ingressroute.yaml b/templates/approval-ui/ingressroute.yaml index eaaa578844c3f19951993ac460bc0139c789a66c..9d9c8c701536323083e3a0211037d13d51a0c614 100644 --- a/templates/approval-ui/ingressroute.yaml +++ b/templates/approval-ui/ingressroute.yaml @@ -3,13 +3,13 @@ kind: IngressRoute apiVersion: bcc.bd-apaas.com/v1alpha1 metadata: - name: approval-ui + name: {{ .Release.Name }}-ui labels: - app.kubernetes.io/name: approval-ui + app.kubernetes.io/name: {{ .Release.Name }}-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-ui + app: {{ .Release.Name }}-ui spec: entryPoints: - websecure @@ -18,7 +18,7 @@ spec: match: Host(`{{ .Values.global.ingressroute.host }}`) && PathPrefix(`/approval/ui`) services: - kind: Service - name: approval-ui + name: {{ .Release.Name }}-ui port: 80 tls: {} {{- end }} \ No newline at end of file diff --git a/templates/approval-ui/service.yaml b/templates/approval-ui/service.yaml index ef71bb9f5085fc2b0af218c6edaedff6ff43214e..4542872ce2cdc8f38548ded556eb5b19e53afcf9 100644 --- a/templates/approval-ui/service.yaml +++ b/templates/approval-ui/service.yaml @@ -2,13 +2,13 @@ kind: Service apiVersion: v1 metadata: - name: approval-ui + name: {{ .Release.Name }}-ui labels: - app.kubernetes.io/name: approval-ui + app.kubernetes.io/name: {{ .Release.Name }}-ui helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: approval-ui + app: {{ .Release.Name }}-ui spec: ports: - name: http @@ -16,4 +16,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app: approval-ui \ No newline at end of file + app: {{ .Release.Name }}-ui \ No newline at end of file diff --git a/templates/ingresshost.yaml b/templates/ingresshost.yaml index 4f053b8091dec65c2298ee8d72201910bd7ff5b2..3f7e2d3dfa0df8d79af69c6e0defc9ba6585dbc4 100644 --- a/templates/ingresshost.yaml +++ b/templates/ingresshost.yaml @@ -3,7 +3,7 @@ apiVersion: bcc.bd-apaas.com/v1alpha1 kind: IngressHost metadata: - name: approval-process + name: {{ .Release.Name }} spec: host: "{{ .Values.global.ingressroute.host }}" {{- end }} diff --git a/templates/process-importer/configmap.yaml b/templates/process-importer/configmap.yaml index 509420049ee9e4b167a699f6deb9245c78bd1a3a..a60f7e39caf1e61ca7a8f1d7611ed6032a2576c5 100644 --- a/templates/process-importer/configmap.yaml +++ b/templates/process-importer/configmap.yaml @@ -2,9 +2,9 @@ kind: ConfigMap apiVersion: v1 metadata: - name: process-importer-config + name: {{ .Release.Name }}-importer-config labels: - app.kubernetes.io/name: process-importer-config + app.kubernetes.io/name: {{ .Release.Name }}-importer-config helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" diff --git a/templates/process-importer/deployment.yaml b/templates/process-importer/deployment.yaml index 766c99afa01afc860897dac9d6098f8a88448ea8..38839e41caff5951f3e35462d4a083142ad48268 100644 --- a/templates/process-importer/deployment.yaml +++ b/templates/process-importer/deployment.yaml @@ -1,33 +1,33 @@ kind: Deployment apiVersion: apps/v1 metadata: - name: process-importer + name: {{ .Release.Name }}-importer labels: - app.kubernetes.io/name: process-importer + app.kubernetes.io/name: {{ .Release.Name }}-importer helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: process-importer + app: {{ .Release.Name }}-importer spec: replicas: 1 selector: matchLabels: - app: process-importer + app: {{ .Release.Name }}-importer template: metadata: labels: - app.kubernetes.io/name: process-importer + app.kubernetes.io/name: {{ .Release.Name }}-importer helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: process-importer + app: {{ .Release.Name }}-importer spec: volumes: - name: localtime hostPath: path: /etc/localtime containers: - - name: process-importer + - name: {{ .Release.Name }}-importer {{- if contains "/" .Values.processImporter.image.repository }} image: "{{ .Values.processImporter.image.repository }}:{{ .Values.processImporter.image.tag }}{{ include "beagle.imageArch" . }}" {{- else }} @@ -45,7 +45,7 @@ spec: mountPath: /etc/localtime envFrom: - configMapRef: - name: process-importer-config + name: {{ .Release.Name }}-importer-config diff --git a/templates/process-importer/service.yaml b/templates/process-importer/service.yaml index 0f411036f191e73b9a22eb744ce4b01c11f4b788..792d6b07bf95518c8f1799f523d4f372ca19595c 100644 --- a/templates/process-importer/service.yaml +++ b/templates/process-importer/service.yaml @@ -2,13 +2,13 @@ kind: Service apiVersion: v1 metadata: - name: process-importer + name: {{ .Release.Name }}-importer labels: - app.kubernetes.io/name: process-importer + app.kubernetes.io/name: {{ .Release.Name }}-importer helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: process-importer + app: {{ .Release.Name }}-importer spec: ports: - name: http @@ -16,4 +16,4 @@ spec: protocol: TCP targetPort: 8080 selector: - app: process-importer \ No newline at end of file + app: {{ .Release.Name }}-importer \ No newline at end of file diff --git a/templates/zeebe/configmap.yaml b/templates/zeebe/configmap.yaml index 83b7ba8391d1a6558b6b924b1f2a7c0e0ccfc536..9fecf24010f1a44fd02347a5871f79af48dc0396 100644 --- a/templates/zeebe/configmap.yaml +++ b/templates/zeebe/configmap.yaml @@ -2,9 +2,9 @@ kind: ConfigMap apiVersion: v1 metadata: - name: zeebe-application + name: {{ .Release.Name }}-zeebe-application labels: - app.kubernetes.io/name: zeebe + app.kubernetes.io/name: {{ .Release.Name }}-zeebe helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" diff --git a/templates/zeebe/service.yaml b/templates/zeebe/service.yaml index 1414f831d1705a438e64744ce5adc5aa9858879f..0f5a11771268839ca891283131c65483a2603eb3 100644 --- a/templates/zeebe/service.yaml +++ b/templates/zeebe/service.yaml @@ -2,13 +2,13 @@ kind: Service apiVersion: v1 metadata: - name: zeebe + name: {{ .Release.Name }}-zeebe labels: - app.kubernetes.io/name: zeebe + app.kubernetes.io/name: {{ .Release.Name }}-zeebe helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: zeebe + app: {{ .Release.Name }}-zeebe spec: ports: - name: gateway @@ -28,4 +28,4 @@ spec: protocol: TCP targetPort: 5701 selector: - app: zeebe \ No newline at end of file + app: {{ .Release.Name }}-zeebe \ No newline at end of file diff --git a/templates/zeebe/statefulset.yaml b/templates/zeebe/statefulset.yaml index 470b5dfcd640cd33031fb235bf1d79c46a6795f2..eb9e18d584e2c3720cd1f56b9a3ab37f37088f29 100644 --- a/templates/zeebe/statefulset.yaml +++ b/templates/zeebe/statefulset.yaml @@ -2,18 +2,18 @@ kind: StatefulSet apiVersion: apps/v1 metadata: - name: zeebe + name: {{ .Release.Name }}-zeebe labels: - app.kubernetes.io/name: zeebe + app.kubernetes.io/name: {{ .Release.Name }}-zeebe helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: zeebe + app: {{ .Release.Name }}-zeebe spec: - serviceName: zeebe + serviceName: {{ .Release.Name }}-zeebe selector: matchLabels: - app: zeebe + app: {{ .Release.Name }}-zeebe {{- if .Values.zeebe.persistence.enabled }} volumeClaimTemplates: - metadata: @@ -30,11 +30,11 @@ spec: template: metadata: labels: - app.kubernetes.io/name: zeebe + app.kubernetes.io/name: {{ .Release.Name }}-zeebe helm.sh/chart: '{{ template "approval-process.chart" . }}' app.kubernetes.io/managed-by: "{{ .Release.Service }}" app.kubernetes.io/managed-by: "{{ .Release.Service }}" - app: zeebe + app: {{ .Release.Name }}-zeebe spec: volumes: - name: localtime @@ -42,12 +42,12 @@ spec: path: /etc/localtime - name: application configMap: - name: zeebe-application + name: {{ .Release.Name }}-zeebe-application items: - key: application.yaml path: application.yaml containers: - - name: zeebe + - name: {{ .Release.Name }}-zeebe {{- if contains "/" .Values.zeebe.image.repository }} image: "{{ .Values.zeebe.image.repository }}:{{ .Values.zeebe.image.tag }}{{ include "beagle.imageArch" . }}" {{- else }} diff --git a/values.yaml b/values.yaml index 1d777fae9db9dc1479fd79ba741e6defc0cfaa57..462eee30f00c44b0a6c9be33967f6396a2dea3ba 100644 --- a/values.yaml +++ b/values.yaml @@ -14,7 +14,7 @@ global: approvalForm: image: repository: "hub.wodcloud.com/workflow/approval-form" - tag: "1.0.0-form-alpha" + tag: "2.6.0-form-alpha" resources: limits: cpu: 0.5 @@ -26,7 +26,7 @@ approvalForm: approvalProcessEngine: image: repository: "approval-process-engine" - tag: "2.5.1-apass5" + tag: "2.6-apass5" conf: apiTokenKey: API_AUTH_TOKEN apiTokenValue: c78aa1d9-4ab4-4c9c-97cc-a9a548ea38aa @@ -53,7 +53,7 @@ approvalProcessEngine: approvalProcessForm: image: repository: "approval-process-form" - tag: "2.5.0-apass5" + tag: "2.6-apass5" conf: #数据库地址 dbDns: jdbc:postgresql://postgres.workflow:5432/approva-form-apass5-demo?stringtype=unspecified&TimeZone=Asia/Shanghai @@ -80,7 +80,7 @@ approvalProcessForm: approvalUi: image: repository: "hub.wodcloud.com/workflow/approval-ui" - tag: "2.5-alpha" + tag: "2.6-alph" processImporter: image: @@ -110,7 +110,8 @@ zeebe: persistence: enabled: true storageClass: hostpath - + +#服务配置的redis连接地址，需要和apaas中配置的地址保持一致 redis: enabled: false image: