diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java index ac597f7d..cd48cb10 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ActivityExtensionPropertyController.java @@ -28,7 +28,7 @@ public class ActivityExtensionPropertyController { private final ActivityExtensionPropertyService activityExtensionPropertyService; @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(activityExtensionPropertyService.getById(id)); } @@ -52,7 +52,7 @@ public class ActivityExtensionPropertyController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { activityExtensionPropertyService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java index 8d3430e9..e56bb870 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ButtonController.java @@ -42,7 +42,7 @@ public class ButtonController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(buttonService.getById(id)); } @@ -59,7 +59,7 @@ public class ButtonController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { buttonService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java index 44b05931..9b386e78 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/CategoryController.java @@ -33,7 +33,7 @@ public class CategoryController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(categoryService.getById(id)); } @@ -54,7 +54,7 @@ public class CategoryController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { categoryService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java index 9ae7b92c..a148f3bd 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ConditionController.java @@ -41,7 +41,7 @@ public class ConditionController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(conditionService.getById(id)); } @@ -58,7 +58,7 @@ public class ConditionController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { conditionService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java index ac5a479d..ff7e19a5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormCategoryController.java @@ -32,7 +32,7 @@ public class FormCategoryController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(formCategoryService.getById(id)); } @@ -49,7 +49,7 @@ public class FormCategoryController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { formCategoryService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java index 0bf887b0..bca93daf 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionController.java @@ -33,7 +33,7 @@ public class FormDefinitionController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(formDefinitionService.getById(id)); } @@ -50,7 +50,7 @@ public class FormDefinitionController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { formDefinitionService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java index 9af66495..ed984ca9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/FormDefinitionJsonController.java @@ -46,7 +46,7 @@ public class FormDefinitionJsonController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(formDefinitionJsonService.getById(id)); } @@ -78,13 +78,13 @@ public class FormDefinitionJsonController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { formDefinitionJsonService.removeByIds(Arrays.asList(ids)); return R.ok(); } @PutMapping("/setPrimaryVersion/{id}") - public R setPrimaryVersion(@PathVariable Integer id) { + public R setPrimaryVersion(@PathVariable String id) { FormDefinitionJson formDefinitionJson =formDefinitionJsonService.getById(id); // 其余版本更新为非主版本 formDefinitionJsonService.update( diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java index cf3f6368..c19188c9 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/ListenerController.java @@ -43,7 +43,7 @@ public class ListenerController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(listenerService.getById(id)); } @@ -60,7 +60,7 @@ public class ListenerController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { listenerService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java index 2b0787b5..21cb763b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/java/com/cloud/kicc/workflow/extension/controller/WorkflowCopyController.java @@ -35,7 +35,7 @@ public class WorkflowCopyController { } @GetMapping("/{id}") - public R getById(@PathVariable("id") Integer id) { + public R getById(@PathVariable("id") String id) { return R.ok(workflowCopyService.getById(id)); } @@ -52,7 +52,7 @@ public class WorkflowCopyController { } @DeleteMapping("/remove/{ids}") - public R remove(@PathVariable Integer[] ids) { + public R remove(@PathVariable String[] ids) { workflowCopyService.removeByIds(Arrays.asList(ids)); return R.ok(); } diff --git a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml index 11cb6fb8..9a6fadb1 100644 --- a/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml +++ b/kicc-platform/kicc-platform-biz/kicc-workflow-biz/src/main/resources/bootstrap.yml @@ -7,9 +7,9 @@ spring: cloud: nacos: discovery: - #server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} - ip: @profiles.ip@ - server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} + server-addr: ${NACOS_HOST:192.168.3.10}:${NACOS_PORT:8848} + #ip: @profiles.ip@ + #server-addr: ${NACOS_HOST:kicc-register}:${NACOS_PORT:8848} namespace: @profiles.namespace@ config: server-addr: ${spring.cloud.nacos.discovery.server-addr}