Merge pull request #109 from WeBankPartners/dev_go

Dev go
WeBankPartners · Apr 10, 2024 · 9301545 · 9301545
2 parents 492c3fe + 28f3301
commit 9301545
Show file tree

Hide file tree

Showing 738 changed files with 101,187 additions and 45,227 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .idea
 .editorconfig
 .vscode
+.DS_Store
 
 # ignore file
 taskman-server/taskman-server
@@ -10,5 +11,4 @@ taskman-ui/plugin
 taskman-ui/dist
 taskman-ui/node_modules
 taskman-ui/node
-taskman-ui/build
-taskman-ui/package-lock.json
+taskman-ui/package-lock.json
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ clean:
 
 build: clean
 	chmod +x ./build/*.sh
-	docker run --rm -v $(current_dir):/go/src/github.com/WeBankPartners/$(project_dir) --name build_$(project_dir) ccr.ccs.tencentyun.com/webankpartners/golang-ext:v1.15.6 /bin/bash /go/src/github.com/WeBankPartners/$(project_dir)/build/build-server.sh
+	docker run --rm -v $(current_dir):/go/src/github.com/WeBankPartners/$(project_dir) --name build_$(project_dir) golang:1.19.1 /bin/bash /go/src/github.com/WeBankPartners/$(project_dir)/build/build-server.sh
 	./build/build-ui.sh $(current_dir)
 
 image: build
@@ -34,4 +34,4 @@ upload: package
 	docker exec $(container_id) mc config host add wecubeS3 $(s3_server_url) $(s3_access_key) $(s3_secret_key) wecubeS3
 	docker exec $(container_id) mc cp /package/$(project_dir)-$(version).zip wecubeS3/wecube-plugin-package-bucket
 	docker rm -f $(container_id)
-	rm -rf $(project_dir)-$(version).zip
+	rm -rf $(project_dir)-$(version).zip
diff --git a/build/default.json b/build/default.json
@@ -46,5 +46,7 @@
     "minio_secret_key": "{{MINIO_SECRET_KEY}}",
     "bucket": "taskman-file",
     "ssl": false
-  }
+  },
+  "encrypt_seed": "{{ENCRYPT_SEED}}",
+  "web_url": "{{TASKMAN_WEB_URL}}"
 }
diff --git a/build/register.xml b/build/register.xml
@@ -3,17 +3,17 @@
 
     <!-- 1.依赖分析 - 描述运行本插件包需要的其他插件包 -->
     <packageDependencies>
-        <packageDependency name="platform" version="v3.2.1"/>
+        <packageDependency name="platform" version="v4.0.0"/>
         <packageDependency name="wecmdb" version="v2.0.4"/>
     </packageDependencies>
 
     <!-- 2.菜单注入 - 描述运行本插件包需要注入的菜单 -->
+    <!-- <menu code='TASK_REQUEST_MANAGEMENT' cat='JOBS' displayName="Request Management" localDisplayName="请求管理">/taskman/request-mgmt</menu>
+        <menu code='TASK_TASK_MANAGEMENT' cat='JOBS' displayName="Task Management" localDisplayName="任务管理">/taskman/task-mgmt</menu> -->
     <menus>
-        <menu code='TASK_WORKBENCH' cat='JOBS' displayName="Dashboard" localDisplayName="工作台">/taskman/workbench</menu>
+        <menu code='TASK_WORKBENCH' cat='JOBS' displayName="Dashboard" localDisplayName="工作台">/taskman/workbench/dashboard</menu>
         <menu code='TASK_TEMPLATE_GROUP_MANAGEMENT' cat='JOBS' displayName="Template Group Management" localDisplayName="模板组管理">/taskman/template-group</menu>
         <menu code='TASK_TEMPLATE_MANAGEMENT' cat='JOBS' displayName="Template Management" localDisplayName="模板管理">/taskman/template-mgmt</menu>
-        <menu code='TASK_REQUEST_MANAGEMENT' cat='JOBS' displayName="Request Management" localDisplayName="请求管理">/taskman/request-mgmt</menu>
-        <menu code='TASK_TASK_MANAGEMENT' cat='JOBS' displayName="Task Management" localDisplayName="任务管理">/taskman/task-mgmt</menu>
         <menu code='TASK_REQUEST_AUDIT' cat='ADMIN' displayName="Request Audit" localDisplayName="请求审计">/taskman/requestAudit</menu>
     </menus>
 
@@ -27,13 +27,14 @@
 
     <!-- 4.系统参数 - 描述运行本插件包需要的系统参数 -->
     <systemParameters>
-        <systemParameter name="TASKMAN_LOG_LEVEL" scopeType="plugins" defaultValue="info"/>
+        <systemParameter name="TASKMAN_LOG_LEVEL" scopeType="plugins" defaultValue="debug"/>
         <systemParameter name="TASKMAN_PROCESS_TAGS" scopeType="plugins" defaultValue="taskman"/>
         <systemParameter name="TASKMAN_MAIL_SENDER_NAME" scopeType="plugins" defaultValue="taskman"/>
         <systemParameter name="TASKMAN_MAIL_AUTH_SENDER" scopeType="plugins" defaultValue=""/>
         <systemParameter name="TASKMAN_MAIL_AUTH_SERVER" scopeType="plugins" defaultValue=""/>
         <systemParameter name="TASKMAN_MAIL_AUTH_PWD" scopeType="plugins" defaultValue=""/>
         <systemParameter name="TASKMAN_MAIL_AUTH_SSL" scopeType="plugins" defaultValue="Y"/>
+        <systemParameter name="TASKMAN_WEB_URL" scopeType="plugins" defaultValue=""/>
     </systemParameters>
 
 
@@ -54,7 +55,7 @@
                 containerName="{{REPOSITORY}}-{{PLUGIN_VERSION}}"
                 portBindings="{{ALLOCATE_PORT}}:8099"
                 volumeBindings="{{BASE_MOUNT_PATH}}/taskman/log:/app/taskman/logs,/etc/localtime:/etc/localtime,{{BASE_MOUNT_PATH}}/certs:/data/certs"
-                envVariables="TASKMAN_MYSQL_HOST={{DB_HOST}},TASKMAN_MYSQL_PORT={{DB_PORT}},TASKMAN_MYSQL_SCHEMA={{DB_SCHEMA}},TASKMAN_MYSQL_USER={{DB_USER}},TASKMAN_MYSQL_PWD={{DB_PWD}},JWT_SIGNING_KEY={{JWT_SIGNING_KEY}},GATEWAY_URL={{GATEWAY_URL}},SUB_SYSTEM_CODE={{SUB_SYSTEM_CODE}},SUB_SYSTEM_KEY={{SUB_SYSTEM_KEY}},TASKMAN_LOG_LEVEL={{TASKMAN_LOG_LEVEL}},PLUGIN_MODE=yes,TASKMAN_PROCESS_TAGS={{TASKMAN_PROCESS_TAGS}},TASKMAN_MAIL_SENDER_NAME={{TASKMAN_MAIL_SENDER_NAME}},TASKMAN_MAIL_AUTH_SENDER={{TASKMAN_MAIL_AUTH_SENDER}},TASKMAN_MAIL_AUTH_SERVER={{TASKMAN_MAIL_AUTH_SERVER}},TASKMAN_MAIL_AUTH_PWD={{TASKMAN_MAIL_AUTH_PWD}},TASKMAN_MAIL_AUTH_SSL={{TASKMAN_MAIL_AUTH_SSL}},MINIO_ADDRESS={{S3_SERVER_URL}},MINIO_ACCESS_KEY={{S3_ACCESS_KEY}},MINIO_SECRET_KEY={{S3_SECRET_KEY}}"
+                envVariables="TASKMAN_MYSQL_HOST={{DB_HOST}},TASKMAN_MYSQL_PORT={{DB_PORT}},TASKMAN_MYSQL_SCHEMA={{DB_SCHEMA}},TASKMAN_MYSQL_USER={{DB_USER}},TASKMAN_MYSQL_PWD={{DB_PWD}},JWT_SIGNING_KEY={{JWT_SIGNING_KEY}},GATEWAY_URL={{GATEWAY_URL}},SUB_SYSTEM_CODE={{SUB_SYSTEM_CODE}},SUB_SYSTEM_KEY={{SUB_SYSTEM_KEY}},TASKMAN_LOG_LEVEL={{TASKMAN_LOG_LEVEL}},PLUGIN_MODE=yes,TASKMAN_PROCESS_TAGS={{TASKMAN_PROCESS_TAGS}},TASKMAN_MAIL_SENDER_NAME={{TASKMAN_MAIL_SENDER_NAME}},TASKMAN_MAIL_AUTH_SENDER={{TASKMAN_MAIL_AUTH_SENDER}},TASKMAN_MAIL_AUTH_SERVER={{TASKMAN_MAIL_AUTH_SERVER}},TASKMAN_MAIL_AUTH_PWD={{TASKMAN_MAIL_AUTH_PWD}},TASKMAN_MAIL_AUTH_SSL={{TASKMAN_MAIL_AUTH_SSL}},MINIO_ADDRESS={{S3_SERVER_URL}},MINIO_ACCESS_KEY={{S3_ACCESS_KEY}},MINIO_SECRET_KEY={{S3_SECRET_KEY}},ENCRYPT_SEED={{ENCRYPT_SEED}},TASKMAN_WEB_URL={{TASKMAN_WEB_URL}}"
         />
         <mysql schema="taskman" initFileName="init.sql" upgradeFileName="upgrade.sql"/>
         <s3 bucketName="taskman-file"/>
@@ -101,5 +102,22 @@
                 </outputParameters>
             </interface>
         </plugin>
+        <plugin name="request">
+            <interface action="create" path="/taskman/api/v2/plugin/request/create" httpMethod="POST" type="EXECUTION">
+                <inputParameters>
+                    <parameter datatype="string" mappingType="constant" required="Y">requestTemplate</parameter>
+                    <parameter datatype="string" mappingType="constant" required="Y">rootDataId</parameter>
+                    <parameter datatype="string" mappingType="constant" required="Y">reportRole</parameter>
+                    <parameter datatype="string" mappingType="constant" required="Y">reportUser</parameter>
+                    <parameter datatype="string" mappingType="context" required="N">procInstId</parameter>
+                </inputParameters>
+                <outputParameters>
+                    <parameter datatype="string" mappingType="context">errorCode</parameter>
+                    <parameter datatype="string" mappingType="context">errorMessage</parameter>
+                    <parameter datatype="string" mappingType="context">comment</parameter>
+                    <parameter datatype="string" mappingType="context">requestId</parameter>
+                </outputParameters>
+            </interface>
+        </plugin>
     </plugins>
 </package>
diff --git a/build/start.sh b/build/start.sh
@@ -18,5 +18,7 @@ sed -i "s~{{TASKMAN_MAIL_AUTH_SSL}}~$TASKMAN_MAIL_AUTH_SSL~g" /app/taskman/conf/
 sed -i "s~{{MINIO_ADDRESS}}~$MINIO_ADDRESS~g" /app/taskman/conf/default.json
 sed -i "s~{{MINIO_ACCESS_KEY}}~$MINIO_ACCESS_KEY~g" /app/taskman/conf/default.json
 sed -i "s~{{MINIO_SECRET_KEY}}~$MINIO_SECRET_KEY~g" /app/taskman/conf/default.json
+sed -i "s~{{ENCRYPT_SEED}}~$ENCRYPT_SEED~g" /app/taskman/conf/default.json
+sed -i "s~{{TASKMAN_WEB_URL}}~$TASKMAN_WEB_URL~g" /app/taskman/conf/default.json
 
 ./taskman-server