diff --git a/gradle.properties b/gradle.properties index 2b9a6079..c5efa8d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -38,7 +38,7 @@ application_version=1.0.0 platform_group=io.sc platform_version=8.1.20 platform_plugin_version=8.1.13 -platform_core_frontend_version=8.1.49 +platform_core_frontend_version=8.1.55 ########################################################### # dependencies version diff --git a/io.sc.platform.app/build.gradle b/io.sc.platform.app/build.gradle index e61ad71c..94255d6b 100644 --- a/io.sc.platform.app/build.gradle +++ b/io.sc.platform.app/build.gradle @@ -1,6 +1,5 @@ dependencies { api( - /* project(":io.sc.platform.csv"), project(":io.sc.platform.communication"), project(":io.sc.platform.flowable"), @@ -10,16 +9,16 @@ dependencies { project(":io.sc.platform.lcdp"), project(":io.sc.platform.lcdp.frontend"), project(":io.sc.platform.orm.mybatis"), - project(":io.sc.platform.security.oauth2.server.authorization"), + project(":io.sc.platform.security.loginform"), project(":io.sc.platform.system"), project(":io.sc.platform.ws.cxf"), project(":org.webjars.luckysheet-2.1.13"), project(":org.webjars.tailwindcss-3.3.5"), - */ - //project(":io.sc.platform.security.loginform"), - project(":io.sc.platform.jdbc.liquibase"), - project(":io.sc.platform.security.oauth2.server.authorization"), + + //project(":io.sc.platform.security.loginform"), + //project(":io.sc.platform.jdbc.liquibase"), + //project(":io.sc.platform.security.oauth2.server.authorization"), ) } \ No newline at end of file diff --git a/io.sc.platform.core.frontend/package.json b/io.sc.platform.core.frontend/package.json index bc6a31a5..0ed0ca84 100644 --- a/io.sc.platform.core.frontend/package.json +++ b/io.sc.platform.core.frontend/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.49", + "version": "8.1.56", "description": "前端核心包,用于快速构建前端的脚手架", "//main": "库的主文件", "main": "dist/platform-core.js", @@ -102,7 +102,7 @@ "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.5", + "@codemirror/lang-sql": "6.5.4", "@codemirror/lang-xml": "6.0.2", "@codemirror/language": "6.10.0", "@codemirror/search": "6.5.5", diff --git a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue index 03c245cd..fa372782 100644 --- a/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue +++ b/io.sc.platform.core.frontend/src/platform/components/form/WForm.vue @@ -9,8 +9,8 @@ (field.colspan === 'full' ? ' col-span-' + screenColsNumComputed : field.colspan && screenColsNumComputed >= field.colspan - ? ' col-span-' + field.colspan - : ' col-span-1') + ? ' col-span-' + field.colspan + : ' col-span-1') " > - + + diff --git a/io.sc.platform.core.frontend/template-project/package.json b/io.sc.platform.core.frontend/template-project/package.json index 9e7192ce..e80effff 100644 --- a/io.sc.platform.core.frontend/template-project/package.json +++ b/io.sc.platform.core.frontend/template-project/package.json @@ -1,6 +1,6 @@ { "name": "platform-core", - "version": "8.1.49", + "version": "8.1.56", "description": "前端核心包,用于快速构建前端的脚手架", "private": false, "keywords": [], @@ -74,7 +74,7 @@ "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.5", + "@codemirror/lang-sql": "6.5.4", "@codemirror/lang-xml": "6.0.2", "@codemirror/language": "6.10.0", "@codemirror/search": "6.5.5", @@ -91,7 +91,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.49", + "platform-core": "8.1.56", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", @@ -100,4 +100,4 @@ "vue-i18n": "9.8.0", "vue-router": "4.2.5" } -} +} \ No newline at end of file diff --git a/io.sc.platform.core.frontend/template-project/src/components/index.ts b/io.sc.platform.core.frontend/template-project/src/components/index.ts index aac544bd..e9e64953 100644 --- a/io.sc.platform.core.frontend/template-project/src/components/index.ts +++ b/io.sc.platform.core.frontend/template-project/src/components/index.ts @@ -6,14 +6,30 @@ import dialog from '@/views/Dialog.vue'; import codemirror from '@/views/Codemirror.vue'; import select from '@/views/Select.vue'; import treeGrid from '@/views/TreeGrid.vue'; -import table from '@/views/Table.vue'; +import likmDialog from '@/views/likm/Dialog.vue'; +import likmDrawer from '@/views/likm/Drawer.vue'; +import likmForm from '@/views/likm/Form.vue'; +import infoPanel from '@/views/likm/InfoPanel.vue'; +import grid from '@/views/likm/Grid.vue'; +import toolbar from '@/views/likm/Toolbar.vue'; +import quasarGrid from '@/views/likm/QuasarGrid.vue'; +import gridLayout from '@/views/likm/GridLayout.vue'; +import likmTreeGrid from '@/views/likm/TreeGrid.vue'; const localComponents = { 'component.testcase.dialog': dialog, 'component.testcase.codemirror': codemirror, 'component.testcase.select': select, 'component.testcase.treeGrid': treeGrid, - 'component.testcase.table': table, + 'component.testcase.likmDialog': likmDialog, + 'component.testcase.likmDrawer': likmDrawer, + 'component.testcase.likmForm': likmForm, + 'component.testcase.infoPanel': infoPanel, + 'component.testcase.grid': grid, + 'component.testcase.toolbar': toolbar, + 'component.testcase.quasarGrid': quasarGrid, + 'component.testcase.gridLayout': gridLayout, + 'component.testcase.likmTreeGrid': likmTreeGrid, }; export default localComponents; diff --git a/io.sc.platform.core.frontend/template-project/src/menus/menus.json b/io.sc.platform.core.frontend/template-project/src/menus/menus.json index 14837958..6ff1dd88 100644 --- a/io.sc.platform.core.frontend/template-project/src/menus/menus.json +++ b/io.sc.platform.core.frontend/template-project/src/menus/menus.json @@ -62,5 +62,87 @@ "titleI18nKey": "menu.testcase.table", "icon": "bi-palette", "routeName": "route.testcase.table" + }, + { "type": "GROUP", "order": 30000, "id": "menu.testcase.likm", "titleI18nKey": "测试用例-likm", "icon": "home" }, + { + "type": "ROUTE", + "order": 100, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.dialog", + "titleI18nKey": "Dialog测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.dialog" + }, + { + "type": "ROUTE", + "order": 200, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.drawer", + "titleI18nKey": "Drawer测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.drawer" + }, + { + "type": "ROUTE", + "order": 300, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.form", + "titleI18nKey": "Form测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.form" + }, + { + "type": "ROUTE", + "order": 400, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.infoPanel", + "titleI18nKey": "InfoPanel测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.infoPanel" + }, + { + "type": "ROUTE", + "order": 500, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.grid", + "titleI18nKey": "Grid测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.grid" + }, + { + "type": "ROUTE", + "order": 600, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.toolbar", + "titleI18nKey": "Toolbar测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.toolbar" + }, + { + "type": "ROUTE", + "order": 700, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.quasarGrid", + "titleI18nKey": "官网表格测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.quasarGrid" + }, + { + "type": "ROUTE", + "order": 700, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.gridLayout", + "titleI18nKey": "grid布局测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.gridLayout" + }, + { + "type": "ROUTE", + "order": 800, + "parentId": "menu.testcase.likm", + "id": "menu.testcase.likm.likmTreeGrid", + "titleI18nKey": "treeGrid测试", + "icon": "bi-palette", + "routeName": "route.testcase.likm.likmTreeGrid" } ] diff --git a/io.sc.platform.core.frontend/template-project/src/routes/routes.json b/io.sc.platform.core.frontend/template-project/src/routes/routes.json index fdcc0041..fd16fe64 100644 --- a/io.sc.platform.core.frontend/template-project/src/routes/routes.json +++ b/io.sc.platform.core.frontend/template-project/src/routes/routes.json @@ -48,15 +48,111 @@ } }, { - "name": "route.testcase.table", - "path": "testcase/table", + "name": "route.testcase.likm.dialog", + "path": "testcase/likm/dialog", "parent": "/", "priority": 0, - "component": "component.testcase.table", - "componentPath": "@/views/Table.vue", + "component": "component.testcase.likmDialog", + "componentPath": "@/views/likm/Dialog.vue", "redirect": null, "meta": { - "permissions": ["/testcase/table/**/*"] + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.drawer", + "path": "testcase/likm/drawer", + "parent": "/", + "priority": 0, + "component": "component.testcase.likmDrawer", + "componentPath": "@/views/likm/Drawer.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.form", + "path": "testcase/likm/form", + "parent": "/", + "priority": 0, + "component": "component.testcase.likmForm", + "componentPath": "@/views/likm/Form.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.infoPanel", + "path": "testcase/likm/infoPanel", + "parent": "/", + "priority": 0, + "component": "component.testcase.infoPanel", + "componentPath": "@/views/likm/InfoPanel.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.grid", + "path": "testcase/likm/grid", + "parent": "/", + "priority": 0, + "component": "component.testcase.grid", + "componentPath": "@/views/likm/Grid.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.toolbar", + "path": "testcase/likm/toolbar", + "parent": "/", + "priority": 0, + "component": "component.testcase.toolbar", + "componentPath": "@/views/likm/Toolbar.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.quasarGrid", + "path": "testcase/likm/quasarGrid", + "parent": "/", + "priority": 0, + "component": "component.testcase.quasarGrid", + "componentPath": "@/views/likm/QuasarGrid.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.gridLayout", + "path": "testcase/likm/gridLayout", + "parent": "/", + "priority": 0, + "component": "component.testcase.gridLayout", + "componentPath": "@/views/likm/GridLayout.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] + } + }, + { + "name": "route.testcase.likm.likmTreeGrid", + "path": "testcase/likm/likmTreeGrid", + "parent": "/", + "priority": 0, + "component": "component.testcase.likmTreeGrid", + "componentPath": "@/views/likm/TreeGrid.vue", + "redirect": null, + "meta": { + "permissions": ["/testcase/treeGrid/**/*"] } } ] diff --git a/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue b/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue index ddbd5592..16438869 100644 --- a/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue +++ b/io.sc.platform.core.frontend/template-project/src/views/TreeGrid.vue @@ -1,18 +1,56 @@ + diff --git a/io.sc.platform.developer.doc/asciidoc/9999-appendix/oauth2/oauth2.adoc b/io.sc.platform.developer.doc/asciidoc/9999-appendix/oauth2/oauth2.adoc index de4ee9f1..d308b7e3 100644 --- a/io.sc.platform.developer.doc/asciidoc/9999-appendix/oauth2/oauth2.adoc +++ b/io.sc.platform.developer.doc/asciidoc/9999-appendix/oauth2/oauth2.adoc @@ -57,14 +57,93 @@ private_key_jwt 和 client_secret_jwt 唯一的区别就是生成 JWT 的方式 == 请求点 |=== -| method | endpoint | 说明 -| GET | /.well-known/oauth-authorization-server | meta data -| GET | /.well-known/openid-configuration | meta data -| GET/POST | /oauth2/authorize | 获取授权码 -| POST | /oauth2/token | 获取访问令牌 -| POST | /oauth2/introspect | 内省 -| POST | /oauth2/revoke | 收回令牌 -| GET/POST | /userinfo | 用户信息 -| GET | /oauth2/jwks | JWK(JSON Web 密钥) + JWS(JSON Web 签名) -| POST | /connect/register | oidc 客户端注册 +| endpoint | method | 说明 +| /.well-known/oauth-authorization-server | GET | meta data +| /.well-known/openid-configuration | GET | meta data +| /oauth2/authorize | GET/POST | 获取授权码 +| /oauth2/token | POST | 获取访问令牌 +| /oauth2/introspect | POST | 内省 +| /oauth2/revoke | POST | 收回令牌 +| /userinfo | GET/POST | 用户信息 +| /oauth2/jwks | GET | JWK+ JWS +| /connect/register | POST | oidc 客户端注册 |=== + +=== /oauth2/authorize +| 参数名 | 参数类型 | 参数值 | 说明 +| client_id | 请求 | | +| response_type | 请求 | code | 授权码 +| redirect_uri | 请求 | | +| scope | 请求 | | +| state | 请求 | | +| code | 响应 | | +| scope | 响应 | | +| state | 响应 | | +| access_token | 响应 | | +| token_type | 响应 | | +| expires_in | 响应 | | +| error | 响应 | | +| error_description | 响应 | | +| error_uri | 响应 | | + + +=== /oauth2/token +| 参数名 | 参数类型 | 参数值 | 说明 +| client_id | 请求 | | +| client_secret | 请求 | | +| client_assertion_type | 请求 | | +| client_assertion | 请求 | | +| assertion | 请求 | | +| grant_type | 请求 | | +| redirect_uri | 请求 | | +| scope | 请求 | | +| code | 请求 | | +| refresh_token | 请求 | | +| username | 请求 | | +| password | 请求 | | +| scope | 响应 | | +| access_token | 响应 | | +| token_type | 响应 | | +| expires_in | 响应 | | +| refresh_token | 响应 | | +| error | 响应 | | +| error_description | 响应 | | +| error_uri | 响应 | | + +=== /oauth2/revoke +| 参数名 | 参数类型 | 参数值 | 说明 +| token | 请求 | | +| token_type_hint | 请求 | | + +=== 获取授权码 +http://localhost:8080/oauth2/authorize?client_secret=secret&client_id=platform-oidc&response_type=code&redirect_uri=http://localhost:8080/oauth2/authorized-oidc +|=== +| 参数名 | 参数值 | 说明 +| client_id | | 注册客户端 ID +| response_type | code | 响应类型 +| +|=== + +org.springframework.security.web.session.DisableEncodeUrlFilter, +org.springframework.security.web.context.request.async.WebAsyncManagerIntegrationFilter, +org.springframework.security.oauth2.server.authorization.config.annotation.web.configurers.AuthorizationServerContextFilter, +org.springframework.security.web.context.SecurityContextPersistenceFilter, +org.springframework.security.web.header.HeaderWriterFilter, +org.springframework.security.web.csrf.CsrfFilter, +org.springframework.security.web.authentication.logout.LogoutFilter, +org.springframework.security.oauth2.server.authorization.web.OAuth2AuthorizationServerMetadataEndpointFilter, +org.springframework.security.oauth2.server.authorization.web.OAuth2AuthorizationEndpointFilter, +org.springframework.security.oauth2.server.authorization.oidc.web.OidcProviderConfigurationEndpointFilter, +org.springframework.security.oauth2.server.authorization.web.NimbusJwkSetEndpointFilter, +org.springframework.security.oauth2.server.authorization.web.OAuth2ClientAuthenticationFilter, +org.springframework.security.oauth2.server.resource.web.BearerTokenAuthenticationFilter, +org.springframework.security.web.savedrequest.RequestCacheAwareFilter, +org.springframework.security.web.servletapi.SecurityContextHolderAwareRequestFilter, +org.springframework.security.web.authentication.AnonymousAuthenticationFilter, +org.springframework.security.web.session.SessionManagementFilter, +org.springframework.security.web.access.ExceptionTranslationFilter, +org.springframework.security.web.access.intercept.FilterSecurityInterceptor, +org.springframework.security.oauth2.server.authorization.web.OAuth2TokenEndpointFilter, +org.springframework.security.oauth2.server.authorization.web.OAuth2TokenIntrospectionEndpointFilter, +org.springframework.security.oauth2.server.authorization.web.OAuth2TokenRevocationEndpointFilter, +org.springframework.security.oauth2.server.authorization.oidc.web.OidcUserInfoEndpointFilter diff --git a/io.sc.platform.developer.frontend/package.json b/io.sc.platform.developer.frontend/package.json index 9c8679b0..33767969 100644 --- a/io.sc.platform.developer.frontend/package.json +++ b/io.sc.platform.developer.frontend/package.json @@ -77,7 +77,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.49", + "platform-core": "8.1.55", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", @@ -90,7 +90,7 @@ "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.5", + "@codemirror/lang-sql": "6.5.4", "@codemirror/lang-xml": "6.0.2", "@codemirror/language": "6.10.0", "@codemirror/search": "6.5.5", @@ -99,4 +99,4 @@ "codemirror": "6.0.1", "vue-codemirror6": "1.2.0" } -} +} \ No newline at end of file diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json index 8e23fab5..0e9809e9 100644 --- a/io.sc.platform.lcdp.frontend/package.json +++ b/io.sc.platform.lcdp.frontend/package.json @@ -73,7 +73,7 @@ "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.5", + "@codemirror/lang-sql": "6.5.4", "@codemirror/lang-xml": "6.0.2", "@codemirror/language": "6.10.0", "@codemirror/search": "6.5.5", @@ -90,7 +90,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.49", + "platform-core": "8.1.55", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", @@ -99,4 +99,4 @@ "vue-router": "4.2.5", "vue-codemirror6": "1.2.0" } -} +} \ No newline at end of file diff --git a/io.sc.platform.mvc.frontend/package.json b/io.sc.platform.mvc.frontend/package.json index 792d1bb1..696d274b 100644 --- a/io.sc.platform.mvc.frontend/package.json +++ b/io.sc.platform.mvc.frontend/package.json @@ -77,7 +77,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.49", + "platform-core": "8.1.55", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", @@ -90,7 +90,7 @@ "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.5", + "@codemirror/lang-sql": "6.5.4", "@codemirror/lang-xml": "6.0.2", "@codemirror/language": "6.10.0", "@codemirror/search": "6.5.5", @@ -99,4 +99,4 @@ "codemirror": "6.0.1", "vue-codemirror6": "1.2.0" } -} +} \ No newline at end of file diff --git a/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum.properties b/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum.properties index c2098ceb..ff9262a9 100644 --- a/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum.properties +++ b/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum.properties @@ -7,5 +7,5 @@ io.sc.platform.orm.api.enums.BooleanYesNo.TRUE=Yes io.sc.platform.orm.api.enums.BooleanYesNo.FALSE=No # \u6570\u636E\u6765\u6E90\u679A\u4E3E -io.sc.platform.orm.api.enums.DataComeFrom.MANUAL=Manual -io.sc.platform.orm.api.enums.DataComeFrom.AUTO=Auto \ No newline at end of file +io.sc.platform.orm.api.enums.DataComeFrom.INPUT=Manual +io.sc.platform.orm.api.enums.DataComeFrom.IMPORT=Import \ No newline at end of file diff --git a/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_tw_CN.properties b/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_tw_CN.properties index 67a6346e..b3209343 100644 --- a/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_tw_CN.properties +++ b/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_tw_CN.properties @@ -7,5 +7,5 @@ io.sc.platform.orm.api.enums.BooleanYesNo.TRUE=\u662F io.sc.platform.orm.api.enums.BooleanYesNo.FALSE=\u5426 # \u6570\u636E\u6765\u6E90\u679A\u4E3E -io.sc.platform.orm.api.enums.DataComeFrom.MANUAL=\u4EBA\u5DE5 -io.sc.platform.orm.api.enums.DataComeFrom.AUTO=\u81EA\u52D5\u5C0E\u5165 \ No newline at end of file +io.sc.platform.orm.api.enums.DataComeFrom.INPUT=\u4EBA\u5DE5 +io.sc.platform.orm.api.enums.DataComeFrom.IMPORT=\u5C0E\u5165 \ No newline at end of file diff --git a/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_zh_CN.properties b/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_zh_CN.properties index 52157a52..0a04fb7a 100644 --- a/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_zh_CN.properties +++ b/io.sc.platform.orm.api/src/main/resources/io/sc/platform/orm/api/i18n/enum_zh_CN.properties @@ -7,5 +7,5 @@ io.sc.platform.orm.api.enums.BooleanYesNo.TRUE=\u662F io.sc.platform.orm.api.enums.BooleanYesNo.FALSE=\u5426 # \u6570\u636E\u6765\u6E90\u679A\u4E3E -io.sc.platform.orm.api.enums.DataComeFrom.MANUAL=\u4EBA\u5DE5 -io.sc.platform.orm.api.enums.DataComeFrom.AUTO=\u81EA\u52A8\u5BFC\u5165 \ No newline at end of file +io.sc.platform.orm.api.enums.DataComeFrom.INPUT=\u4EBA\u5DE5 +io.sc.platform.orm.api.enums.DataComeFrom.IMPORT=\u5BFC\u5165 \ No newline at end of file diff --git a/io.sc.platform.security.frontend/package.json b/io.sc.platform.security.frontend/package.json index db948cdd..0d8ec5f1 100644 --- a/io.sc.platform.security.frontend/package.json +++ b/io.sc.platform.security.frontend/package.json @@ -4,7 +4,7 @@ "description": "", "private": false, "keywords": [ - + ], "author": "", "license": "ISC", @@ -99,6 +99,6 @@ "vue-dompurify-html": "5.0.1", "vue-i18n": "9.8.0", "vue-router": "4.2.5", - "platform-core": "8.1.49" + "platform-core": "8.1.55" } -} +} \ No newline at end of file diff --git a/io.sc.platform.security.frontend/webpack.config.mf.cjs b/io.sc.platform.security.frontend/webpack.config.mf.cjs index af4586f7..2b4a62f3 100644 --- a/io.sc.platform.security.frontend/webpack.config.mf.cjs +++ b/io.sc.platform.security.frontend/webpack.config.mf.cjs @@ -2,7 +2,7 @@ * webpack module federation 配置 */ const fs = require('fs'); // 文件读取 -const Json5 =require('json5'); // json5 +const Json5 =require('json5'); // json5 const { ModuleFederationPlugin } = require('webpack').container; // webpack 模块联邦插件 const packageJson = require('./package.json'); // package.json const projectName =packageJson.name; // 项目名称 @@ -31,8 +31,21 @@ module.exports = { exposes: mfExposes, // 模块联邦共享库 shared: { + '@codemirror/autocomplete': { requiredVersion: deps['@codemirror/autocomplete'], singleton: true }, + '@codemirror/commands': { requiredVersion: deps['@codemirror/commands'], singleton: true }, + '@codemirror/lang-html': { requiredVersion: deps['@codemirror/lang-html'], singleton: true }, + '@codemirror/lang-java': { requiredVersion: deps['@codemirror/lang-java'], singleton: true }, + '@codemirror/lang-javascript': { requiredVersion: deps['@codemirror/lang-javascript'], singleton: true }, + '@codemirror/lang-json': { requiredVersion: deps['@codemirror/lang-json'], singleton: true }, + '@codemirror/lang-sql': { requiredVersion: deps['@codemirror/lang-sql'], singleton: true }, + '@codemirror/lang-xml': { requiredVersion: deps['@codemirror/lang-xml'], singleton: true }, + '@codemirror/language': { requiredVersion: deps['@codemirror/language'], singleton: true }, + '@codemirror/search': { requiredVersion: deps['@codemirror/search'], singleton: true }, + '@codemirror/state': { requiredVersion: deps['@codemirror/state'], singleton: true }, + '@codemirror/view': { requiredVersion: deps['@codemirror/view'], singleton: true }, '@vueuse/core': { requiredVersion: deps['@vueuse/core'], singleton: true }, 'axios': { requiredVersion: deps['axios'], singleton: true }, + 'codemirror': { requiredVersion: deps['codemirror'], singleton: true }, 'dayjs': { requiredVersion: deps['dayjs'], singleton: true }, 'echarts':{ requiredVersion: deps['echarts'], singleton: true }, 'exceljs':{ requiredVersion: deps['exceljs'], singleton: true }, @@ -42,12 +55,11 @@ module.exports = { 'pinia': { requiredVersion: deps['pinia'], singleton: true }, 'platform-core': { requiredVersion: deps['platform-core'], singleton: true }, 'quasar': { requiredVersion: deps['quasar'], singleton: true }, - 'react-dnd-html5-backend':{ requiredVersion: deps['react-dnd-html5-backend'], singleton: true }, 'vue': { requiredVersion: deps['vue'], singleton: true }, + 'vue-codemirror6': { requiredVersion: deps['vue-codemirror6'], singleton: true }, 'vue-dompurify-html':{ requiredVersion: deps['vue-dompurify-html'], singleton: true }, 'vue-i18n': { requiredVersion: deps['vue-i18n'], singleton: true }, 'vue-router': { requiredVersion: deps['vue-router'], singleton: true }, - 'vue3-dnd':{ requiredVersion: deps['vue3-dnd'], singleton: true }, } }), ] diff --git a/io.sc.platform.security.oauth2.server.authorization/src/main/java/io/sc/platform/security/oauth2/server/authorization/configure/PlatformOauth2AuthorizationServerAutoConfiguration.java b/io.sc.platform.security.oauth2.server.authorization/src/main/java/io/sc/platform/security/oauth2/server/authorization/configure/PlatformOauth2AuthorizationServerAutoConfiguration.java index cb5ff475..e3cbdb82 100644 --- a/io.sc.platform.security.oauth2.server.authorization/src/main/java/io/sc/platform/security/oauth2/server/authorization/configure/PlatformOauth2AuthorizationServerAutoConfiguration.java +++ b/io.sc.platform.security.oauth2.server.authorization/src/main/java/io/sc/platform/security/oauth2/server/authorization/configure/PlatformOauth2AuthorizationServerAutoConfiguration.java @@ -32,6 +32,7 @@ import org.springframework.security.oauth2.server.authorization.settings.Authori import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.LoginUrlAuthenticationEntryPoint; import org.springframework.security.web.util.matcher.RequestMatcher; +import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; import java.security.KeyPair; diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json index edb7f9b9..856230aa 100644 --- a/io.sc.platform.system.frontend/package.json +++ b/io.sc.platform.system.frontend/package.json @@ -77,7 +77,7 @@ "luckyexcel": "1.0.1", "mockjs": "1.1.0", "pinia": "2.1.7", - "platform-core": "8.1.49", + "platform-core": "8.1.56", "quasar": "2.14.2", "tailwindcss": "3.4.0", "vue": "3.4.3", @@ -90,7 +90,7 @@ "@codemirror/lang-java": "6.0.1", "@codemirror/lang-javascript": "6.2.1", "@codemirror/lang-json": "6.0.1", - "@codemirror/lang-sql": "6.5.5", + "@codemirror/lang-sql": "6.5.4", "@codemirror/lang-xml": "6.0.2", "@codemirror/language": "6.10.0", "@codemirror/search": "6.5.5", @@ -99,4 +99,4 @@ "codemirror": "6.0.1", "vue-codemirror6": "1.2.0" } -} +} \ No newline at end of file diff --git a/io.sc.platform.system.frontend/src/views/user/User.vue b/io.sc.platform.system.frontend/src/views/user/User.vue index d387e37b..efd3e0d1 100644 --- a/io.sc.platform.system.frontend/src/views/user/User.vue +++ b/io.sc.platform.system.frontend/src/views/user/User.vue @@ -1,26 +1,18 @@