diff --git a/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java b/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java index d4080c7104..16ed31ef40 100644 --- a/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java +++ b/app-builder/plugins/aipp-domain-division/src/main/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspect.java @@ -59,6 +59,8 @@ public void beforeGet(JoinPoint joinPoint) { } String username = this.getUserName(); if (this.allGroupUsers != null && this.allGroupUsers.contains(username)) { + UserInfo userInfo = this.buildUserInfo(username, "*allGroupUser*"); + UserInfoHolder.set(userInfo); return; } UserGroup userGroup = this.getUserGroup(username); diff --git a/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java b/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java index 51a78d6843..685736efb9 100644 --- a/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java +++ b/app-builder/plugins/aipp-domain-division/src/test/java/modelengine/fit/jade/aipp/domain/division/aop/GetSourceAspectTest.java @@ -8,6 +8,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.eq; @@ -97,6 +98,9 @@ void testBeforeGetUserInAllGroupUsers() { UserContext context = new UserContext("admin1", "localhost", "en"); UserContextHolder.apply(context, () -> { this.getSourceAspect.beforeGet(this.joinPoint); + assertNotNull(UserInfoHolder.get()); + assertEquals("*allGroupUser*", UserInfoHolder.get().getUserGroupId()); + this.getSourceAspect.afterGet(this.joinPoint); assertNull(UserInfoHolder.get()); }); } diff --git a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java index c224b4e02e..476f76791e 100644 --- a/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java +++ b/app-builder/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/fitable/LlmComponent.java @@ -91,7 +91,7 @@ @Component public class LlmComponent implements FlowableService { private static final Logger log = Logger.get(LlmComponent.class); - private static final String SYSTEM_PROMPT = "{{0}}"; + private static final String SYSTEM_PROMPT = ":{{0}}"; private static final String PROMPT_TEMPLATE = "{{1}}"; private static final String AGENT_NODE_ID = "agent"; private static final String REGEX_MODEL = "statusCode=(\\d+)"; diff --git a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml index e2736df041..9abb90da16 100644 --- a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml +++ b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderAppMapper.xml @@ -126,7 +126,7 @@ and create_by = #{cond.createBy} - + and (user_group_id = #{cond.userGroupId} or user_group_id = '*') ORDER BY @@ -208,7 +208,7 @@ and create_by = #{cond.createBy} - + and (user_group_id = #{cond.userGroupId} or user_group_id = '*') ) as latest_records WHERE ; diff --git a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml index f1fa9f403e..db99a26557 100644 --- a/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml +++ b/app-builder/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml @@ -102,7 +102,7 @@ and create_by = #{cond.createBy} - + and (user_group_id = #{cond.userGroupId} or user_group_id = '*') @@ -135,7 +135,7 @@ and create_by = #{cond.createBy} - + and (user_group_id = #{cond.userGroupId} or user_group_id = '*') diff --git a/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml b/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml index f4947f5cc9..802ec3b775 100644 --- a/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml +++ b/store/plugins/store-repository-postgresql/src/main/resources/mapper/AppMapper.xml @@ -119,7 +119,7 @@ and i."app_category" ilike '%\' || #{appCategory} || '%' ESCAPE '\' - + and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') @@ -135,7 +135,7 @@ and i."app_category" ilike '%\' || #{appCategory} || '%' ESCAPE '\' - + and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') diff --git a/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml b/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml index d878f584b6..0f55080619 100644 --- a/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml +++ b/store/plugins/store-repository-postgresql/src/main/resources/mapper/PluginMapper.xml @@ -118,29 +118,33 @@ from "store_tag" t group by t."tool_unique_name") tg on tg."tool_unique_name" = pt."tool_unique_name" - - and (i."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') - - - and (i."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') - - - and i."is_builtin" = #{isBuiltin} - - - and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') - - - and (i."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\') - - - and (i."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\') - - - and i."is_builtin" = #{isBuiltin} - - - and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\' + + + and (i."is_builtin" = true or i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') + + + and (i."is_builtin" = false and i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') + + + and i."is_builtin" = false + + + and (i."user_group_id" = #{userGroupId} or i."user_group_id" = '*') + + + + + and (i."is_builtin" = true or i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\') + + + and (i."is_builtin" = false and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\') + + + and i."is_builtin" = #{isBuiltin} + + + and i."creator" ilike '%\' || #{creator} || '%' ESCAPE '\' + and (i."deploy_status" = 'DEPLOYED' or i."deploy_status" = 'RELEASED') @@ -156,29 +160,33 @@