Dev go

Makefile

@@ -35,3 +35,7 @@ upload: package
 	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
+
+build_taskman_server:
+	chmod +x ./build/*.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/register.xml

@@ -12,9 +12,9 @@
         <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/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_AUDIT' cat='ADMIN' displayName="Request Audit" localDisplayName="请求审计">/taskman/requestAudit</menu>
+        <menu code='TASK_TEMPLATE_GROUP_MANAGEMENT' cat='JOBS' displayName="Template Group Management" localDisplayName="模板组管理">/taskman/template-group</menu>
+        <menu code='TASK_REQUEST_AUDIT' cat='ADMIN' displayName="Requests Report" localDisplayName="请求报表">/taskman/requestAudit</menu>
     </menus>
 
     <!-- 3.数据模型 - 描述本插件包的数据模型,并且描述和Framework数据模型的关系 -->

taskman-server/api/api.go

@@ -66,6 +66,7 @@ func init() {
 		&handlerFuncObj{Url: "/request-template/enable/:id", Method: "POST", HandlerFunc: template.EnableRequestTemplate},
 		&handlerFuncObj{Url: "/request-form-template/:id", Method: "GET", HandlerFunc: form.GetRequestFormTemplate},
 		&handlerFuncObj{Url: "/request-template/:id/data-form-clean", Method: "POST", HandlerFunc: form.CleanDataForm},
+		&handlerFuncObj{Url: "/request-template/:id/filter-clean/:type", Method: "POST", HandlerFunc: form.CleanFilterCondition},
 		&handlerFuncObj{Url: "/request-form-template/:id", Method: "POST", HandlerFunc: form.UpdateRequestFormTemplate},
 		&handlerFuncObj{Url: "/request-form-template/:id/data-form", Method: "GET", HandlerFunc: form.GetDataFormTemplate},
 		&handlerFuncObj{Url: "/request-form-template/:id/form/:task-template-id", Method: "GET", HandlerFunc: form.GetFormTemplate},
@@ -77,6 +78,11 @@ func init() {
 		&handlerFuncObj{Url: "/form-template/item-group", Method: "POST", HandlerFunc: form.UpdateFormTemplateItemGroup},
 		&handlerFuncObj{Url: "/form-template/item-group/sort", Method: "POST", HandlerFunc: form.SortFormTemplateItemGroup},
 
+		&handlerFuncObj{Url: "/form-template-library", Method: "POST", HandlerFunc: form.AddFormTemplateLibrary},
+		&handlerFuncObj{Url: "/form-template-library", Method: "DELETE", HandlerFunc: form.DeleteFormTemplateLibrary},
+		&handlerFuncObj{Url: "/form-template-library/query", Method: "POST", HandlerFunc: form.QueryFormTemplateLibrary},
+		&handlerFuncObj{Url: "/form-template-library/form-type", Method: "GET", HandlerFunc: form.QueryAllFormTemplateLibraryFormType},
+
 		&handlerFuncObj{Url: "/task-template/:requestTemplate", Method: "POST", HandlerFunc: task.CreateTaskTemplate},
 		&handlerFuncObj{Url: "/task-template/:requestTemplate/:id", Method: "PUT", HandlerFunc: task.UpdateTaskTemplate},
 		&handlerFuncObj{Url: "/task-template/:requestTemplate/:id", Method: "DELETE", HandlerFunc: task.DeleteTaskTemplate},
@@ -130,6 +136,7 @@ func init() {
 		&handlerFuncObj{Url: "/request/export", Method: "POST", HandlerFunc: request.Export},
 		&handlerFuncObj{Url: "/request/:requestId/task/list", Method: "GET", HandlerFunc: request.GetTaskList},
 		&handlerFuncObj{Url: "/request/confirm", Method: "POST", HandlerFunc: request.Confirm},
+		&handlerFuncObj{Url: "/request/association", Method: "POST", HandlerFunc: request.Association},
 
 		// For core 1:get task form template  2:create task
 		&handlerFuncObj{Url: "/plugin/task/create/meta", Method: "GET", HandlerFunc: task.GetTaskFormStruct},
@@ -169,6 +176,7 @@ func init() {
 		&handlerFuncObj{Url: "/auth/roles/:roleId/users/revoke", Method: "POST", HandlerFunc: requestNew.TransAuthRemoveUserFromRole},
 		&handlerFuncObj{Url: "/auth/roles/:roleId/users", Method: "POST", HandlerFunc: requestNew.TransAuthAddUserForRole},
 		&handlerFuncObj{Url: "/auth/roles/apply", Method: "PUT", HandlerFunc: requestNew.TransAuthHandleApplication},
+		&handlerFuncObj{Url: "/auth/roles/apply", Method: "DELETE", HandlerFunc: requestNew.TransApplyDelete},
 		&handlerFuncObj{Url: "/auth/roles/apply/byapplier", Method: "POST", HandlerFunc: requestNew.TransAuthGetApplyList},
 		&handlerFuncObj{Url: "/auth/users/register", Method: "POST", HandlerFunc: requestNew.TransAuthUserRegister},
 	)

taskman-server/api/middleware/token.go

@@ -20,9 +20,9 @@ func GetRequestRoles(c *gin.Context) []string {
 
 var (
 	whiteListUrl = map[string]struct{}{
-		models.UrlPrefix + "/api/v1/login/seed":          {},
-		models.UrlPrefix + "/api/v1/login":               {},
-		models.UrlPrefix + "/api/v2/auth/roles":          {},
+		models.UrlPrefix + "/api/v1/login/seed": {},
+		models.UrlPrefix + "/api/v1/login":      {},
+		//models.UrlPrefix + "/api/v2/auth/roles":          {},
 		models.UrlPrefix + "/api/v2/auth/roles/apply":    {},
 		models.UrlPrefix + "/api/v2/auth/users/register": {},
 	}
@@ -37,10 +37,19 @@ func isWhiteListUrl(url string) (result bool) {
 }
 
 func AuthCoreRequestToken() gin.HandlerFunc {
+	var index int
 	return func(c *gin.Context) {
 		if isWhiteListUrl(c.Request.RequestURI) {
 			c.Next()
 		} else {
+			uri := c.Request.RequestURI
+			if index = strings.Index(uri, "?"); index > 0 {
+				// 非登录情况下放行,登录情况下需要鉴权初始化用户和角色
+				if uri[:index] == "/api/v2/auth/roles" && strings.TrimSpace(c.GetHeader("Authorization")) == "" {
+					c.Next()
+					return
+				}
+			}
 			err := authCoreRequest(c)
 			if err != nil {
 				log.Logger.Error("Validate core token fail", log.Error(err))
@@ -53,29 +62,6 @@ func AuthCoreRequestToken() gin.HandlerFunc {
 	}
 }
 
-func AuthCorePluginToken() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		err := authCoreRequest(c)
-		if err != nil {
-			log.Logger.Error("Validate core token fail", log.Error(err))
-			c.JSON(http.StatusOK, pluginInterfaceResultObj{ResultCode: "1", ResultMessage: "Token authority validate fail", Results: pluginInterfaceResultOutput{Outputs: []string{}}})
-			c.Abort()
-		} else {
-			c.Next()
-		}
-	}
-}
-
-type pluginInterfaceResultObj struct {
-	ResultCode    string                      `json:"resultCode"`
-	ResultMessage string                      `json:"resultMessage"`
-	Results       pluginInterfaceResultOutput `json:"results"`
-}
-
-type pluginInterfaceResultOutput struct {
-	Outputs []string `json:"outputs"`
-}
-
 func authCoreRequest(c *gin.Context) error {
 	authHeader := c.GetHeader("Authorization")
 	if authHeader == "" {

taskman-server/api/v1/form/form_template.go

@@ -3,6 +3,7 @@ package form
 import (
 	"fmt"
 	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/api/middleware"
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/common/exterror"
 	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/models"
 	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/service"
 	"github.com/gin-gonic/gin"
@@ -38,10 +39,26 @@ func CleanDataForm(c *gin.Context) {
 	middleware.ReturnSuccess(c)
 }
 
+func CleanFilterCondition(c *gin.Context) {
+	var err error
+	requestTemplateId := c.Param("id")
+	formType := c.Param("type")
+	if requestTemplateId == "" {
+		middleware.ReturnParamEmptyError(c, "id")
+		return
+	}
+	if err = service.GetFormTemplateService().CleanFilterCondition(requestTemplateId, formType); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	middleware.ReturnSuccess(c)
+}
+
 func UpdateRequestFormTemplate(c *gin.Context) {
 	var param models.FormTemplateDto
 	var err error
 	var user = middleware.GetRequestUser(c)
+	var codeMap = make(map[string]string)
 	requestTemplateId := c.Param("id")
 	if requestTemplateId == "" {
 		middleware.ReturnParamEmptyError(c, "id")
@@ -51,6 +68,21 @@ func UpdateRequestFormTemplate(c *gin.Context) {
 		middleware.ReturnParamValidateError(c, err)
 		return
 	}
+	// 校验是否有修改权限
+	if err = service.GetRequestTemplateService().CheckPermission(requestTemplateId, middleware.GetRequestUser(c)); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	// 检查表单组code是否重复
+	if len(param.Items) > 0 {
+		for _, item := range param.Items {
+			if v, ok := codeMap[item.Name]; ok {
+				middleware.ReturnError(c, exterror.New().FormItemCodeRepeatError.WithParam(item.ItemGroup, item.Title, item.Name, v))
+				return
+			}
+			codeMap[item.Name] = item.Title
+		}
+	}
 	param.UpdatedBy = user
 	param.RequestTemplate = requestTemplateId
 	if param.Id != "" {
@@ -215,11 +247,22 @@ func UpdateFormTemplateItemGroupConfig(c *gin.Context) {
 // UpdateFormTemplateItemGroup 更新表单组
 func UpdateFormTemplateItemGroup(c *gin.Context) {
 	var param models.FormTemplateGroupCustomDataDto
+	var codeMap = make(map[string]string)
 	var err error
 	if err := c.ShouldBindJSON(&param); err != nil {
 		middleware.ReturnParamValidateError(c, err)
 		return
 	}
+	// 检查表单组code是否重复
+	if len(param.Items) > 0 {
+		for _, item := range param.Items {
+			if v, ok := codeMap[item.Name]; ok {
+				middleware.ReturnError(c, exterror.New().FormItemCodeRepeatError.WithParam(item.ItemGroup, item.Title, item.Name, v))
+				return
+			}
+			codeMap[item.Name] = item.Title
+		}
+	}
 	// 校验是否有修改权限
 	err = service.GetRequestTemplateService().CheckPermission(param.RequestTemplateId, middleware.GetRequestUser(c))
 	if err != nil {

taskman-server/api/v1/form/form_template_library.go

@@ -0,0 +1,100 @@
+package form
+
+import (
+	"fmt"
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/common/exterror"
+	"strings"
+
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/api/middleware"
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/models"
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/service"
+	"github.com/gin-gonic/gin"
+)
+
+// AddFormTemplateLibrary 添加组件库
+func AddFormTemplateLibrary(c *gin.Context) {
+	var param models.FormTemplateLibraryParam
+	var nameRepeat bool
+	var err error
+	if err = c.ShouldBindJSON(&param); err != nil {
+		middleware.ReturnParamValidateError(c, err)
+		return
+	}
+	if strings.TrimSpace(param.Name) == "" {
+		middleware.ReturnParamEmptyError(c, "name")
+		return
+	}
+	// name 重名校验
+	if nameRepeat, err = service.GetFormTemplateLibraryService().CheckNameExist(param.Name); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	if nameRepeat {
+		middleware.ReturnError(c, exterror.New().FormTemplateLibraryAddNameRepeatError)
+		return
+	}
+	if err = service.GetFormTemplateLibraryService().AddFormTemplateLibrary(param, middleware.GetRequestUser(c)); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	middleware.ReturnSuccess(c)
+}
+
+func DeleteFormTemplateLibrary(c *gin.Context) {
+	var err error
+	var formTemplateLibraryTable *models.FormTemplateLibraryTable
+	id := c.Query("id")
+	if id == "" {
+		middleware.ReturnParamEmptyError(c, "id")
+		return
+	}
+	if formTemplateLibraryTable, err = service.GetFormTemplateLibraryService().Get(id); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	if formTemplateLibraryTable == nil {
+		middleware.ReturnParamValidateError(c, fmt.Errorf("id is invalid"))
+		return
+	}
+	// 只有表单库创建用户才有该条记录删除权限
+	if formTemplateLibraryTable.CreatedBy != middleware.GetRequestUser(c) {
+		middleware.ReturnError(c, exterror.New().FormTemplateLibraryDeletePermissionError)
+		return
+	}
+
+	if err = service.GetFormTemplateLibraryService().DeleteFormTemplateLibrary(id); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	middleware.ReturnSuccess(c)
+}
+
+// QueryFormTemplateLibrary 查询组件库
+func QueryFormTemplateLibrary(c *gin.Context) {
+	var param models.QueryFormTemplateLibraryParam
+	var list []*models.FormTemplateLibraryDto
+	var pageInfo models.PageInfo
+	var err error
+	if err = c.ShouldBindJSON(&param); err != nil {
+		middleware.ReturnParamValidateError(c, err)
+		return
+	}
+	if param.PageSize == 0 {
+		param.PageSize = 10
+	}
+	if pageInfo, list, err = service.GetFormTemplateLibraryService().QueryFormTemplateLibrary(param); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	middleware.ReturnPageData(c, pageInfo, list)
+}
+
+func QueryAllFormTemplateLibraryFormType(c *gin.Context) {
+	var formTypes []string
+	var err error
+	if formTypes, err = service.GetFormTemplateLibraryService().QueryAllFormType(); err != nil {
+		middleware.ReturnServerHandleError(c, err)
+		return
+	}
+	middleware.ReturnData(c, formTypes)
+}

taskman-server/api/v1/request/request.go

@@ -2,8 +2,11 @@ package request
 
 import (
 	"fmt"
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/common/log"
+	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/common/try"
 	"io"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/WeBankPartners/wecube-plugins-taskman/taskman-server/api/middleware"
@@ -333,6 +336,11 @@ func StartRequest(c *gin.Context) {
 }
 
 func UpdateRequestStatus(c *gin.Context) {
+	defer try.ExceptionStack(func(e interface{}, err interface{}) {
+		retErr := fmt.Errorf("%v", err)
+		middleware.ReturnError(c, exterror.Catch(exterror.New().ServerHandleError, retErr))
+		log.Logger.Error(e.(string))
+	})
 	requestId := c.Param("requestId")
 	status := c.Param("status")
 	if requestId == "" || status == "" {
@@ -386,6 +394,15 @@ func GetReferenceData(c *gin.Context) {
 		middleware.ReturnParamValidateError(c, err)
 		return
 	}
+	if param.Dialect != nil {
+		if param.Dialect.AssociatedData != nil {
+			for k, v := range param.Dialect.AssociatedData {
+				if strings.HasPrefix(v, "tmp"+models.SysTableIdConnector) {
+					delete(param.Dialect.AssociatedData, k)
+				}
+			}
+		}
+	}
 	input := models.RefSelectParam{FormItemTemplateId: formItemTemplateId, RequestId: requestId, Param: &param, UserToken: c.GetHeader("Authorization")}
 	result, err := service.GetCMDBRefSelectResult(&input)
 	if err != nil {
@@ -560,3 +577,23 @@ func GetExpressionItemData(c *gin.Context) {
 		middleware.ReturnData(c, result)
 	}
 }
+
+// Association 请求关联单
+func Association(c *gin.Context) {
+	var param models.RequestAssociationParam
+	var pageInfo models.PageInfo
+	var rowsData []*models.SimpleRequestDto
+	var err error
+	if err = c.ShouldBindJSON(&param); err != nil {
+		middleware.ReturnParamValidateError(c, err)
+		return
+	}
+	if param.PageSize == 0 {
+		param.PageSize = 50
+	}
+	if pageInfo, rowsData, err = service.GetRequestService().Association(param); err != nil {
+		middleware.ReturnError(c, err)
+		return
+	}
+	middleware.ReturnPageData(c, pageInfo, rowsData)
+}

taskman-server/api/v1/task/task.go

@@ -138,7 +138,9 @@ func ApproveTask(c *gin.Context) {
 	var err error
 	var operator = middleware.GetRequestUser(c)
 	var taskHandle *models.TaskHandleTable
+	var taskHandleTemplate *models.TaskHandleTemplateTable
 	var request models.RequestTable
+	var handleMode string
 	for _, v := range param.FormData {
 		tmpErr := validateFormRequire(v)
 		if tmpErr != nil {
@@ -199,7 +201,16 @@ func ApproveTask(c *gin.Context) {
 		middleware.ReturnTaskApproveNotPermissionError(c)
 		return
 	}
-	err = service.ApproveTask(taskTable, operator, c.GetHeader("Authorization"), c.GetHeader(middleware.AcceptLanguageHeader), param)
+	if taskHandle.TaskHandleTemplate != "" {
+		if taskHandleTemplate, err = service.GetTaskTemplateService().GetTaskHandleTemplate(taskHandle.TaskHandleTemplate); err != nil {
+			middleware.ReturnServerHandleError(c, err)
+			return
+		}
+		if taskHandleTemplate != nil {
+			handleMode = taskHandleTemplate.HandleMode
+		}
+	}
+	err = service.ApproveTask(taskTable, operator, c.GetHeader("Authorization"), c.GetHeader(middleware.AcceptLanguageHeader), handleMode, param)
 	if err != nil {
 		middleware.ReturnServerHandleError(c, err)
 	} else {