diff --git a/client/packages/lowcoder-cli/client.d.ts b/client/packages/lowcoder-cli/client.d.ts index 98926bd29..2959f3bb7 100644 --- a/client/packages/lowcoder-cli/client.d.ts +++ b/client/packages/lowcoder-cli/client.d.ts @@ -31,10 +31,10 @@ declare var REACT_APP_LANGUAGES: string; declare var REACT_APP_COMMIT_ID: string; declare var REACT_APP_API_HOST: string; declare var LOWCODER_NODE_SERVICE_URL: string; -declare var LOWCODER_SHOW_BRAND: string; -declare var LOWCODER_CUSTOM_LOGO: string; -declare var LOWCODER_CUSTOM_LOGO_SQUARE: string; -declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; +declare var REACT_APP_LOWCODER_SHOW_BRAND: string; +declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string; +declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string; +declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; declare var REACT_APP_ENV: string; declare var REACT_APP_BUILD_ID: string; declare var REACT_APP_LOG_LEVEL: string; diff --git a/client/packages/lowcoder-dev-utils/buildVars.js b/client/packages/lowcoder-dev-utils/buildVars.js index 1f25eb122..baaeb0131 100644 --- a/client/packages/lowcoder-dev-utils/buildVars.js +++ b/client/packages/lowcoder-dev-utils/buildVars.js @@ -20,23 +20,23 @@ export const buildVars = [ defaultValue: "", }, { - name: "LOWCODER_SHOW_BRAND", + name: "REACT_APP_LOWCODER_SHOW_BRAND", defaultValue: 'false', }, { - name: "LOWCODER_CUSTOM_LOGO", + name: "REACT_APP_LOWCODER_CUSTOM_LOGO", defaultValue: '', }, { - name: "LOWCODER_CUSTOM_LOGO_SQUARE", + name: "REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE", defaultValue: '', }, { - name: "LOWCODER_NODE_SERVICE_URL", - defaultValue: "", + name: "REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT", + defaultValue: '', }, { - name: "LOWCODER_CUSTOM_AUTH_WELCOME_TEXT", + name: "LOWCODER_NODE_SERVICE_URL", defaultValue: "", }, { diff --git a/client/packages/lowcoder/index.html b/client/packages/lowcoder/index.html index 2a45e2639..6d3750b31 100644 --- a/client/packages/lowcoder/index.html +++ b/client/packages/lowcoder/index.html @@ -96,5 +96,11 @@
+ diff --git a/client/packages/lowcoder/src/api/configApi.ts b/client/packages/lowcoder/src/api/configApi.ts index 42d315279..6af3161fc 100644 --- a/client/packages/lowcoder/src/api/configApi.ts +++ b/client/packages/lowcoder/src/api/configApi.ts @@ -13,7 +13,7 @@ class ConfigApi extends Api { static fetchConfig(orgId?: string): AxiosPromise { let authConfigURL = ConfigApi.configURL; if(orgId?.length) { - authConfigURL += `?orgId?=${orgId}`; + authConfigURL += `?orgId=${orgId}`; } return Api.get(authConfigURL); } diff --git a/client/packages/lowcoder/src/app-env.d.ts b/client/packages/lowcoder/src/app-env.d.ts index f11d51d0e..4a67d01bd 100644 --- a/client/packages/lowcoder/src/app-env.d.ts +++ b/client/packages/lowcoder/src/app-env.d.ts @@ -34,10 +34,10 @@ declare var REACT_APP_LANGUAGES: string; declare var REACT_APP_COMMIT_ID: string; declare var REACT_APP_API_HOST: string; declare var LOWCODER_NODE_SERVICE_URL: string; -declare var LOWCODER_SHOW_BRAND: string; -declare var LOWCODER_CUSTOM_LOGO: string; -declare var LOWCODER_CUSTOM_LOGO_SQUARE: string; -declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; +declare var REACT_APP_LOWCODER_SHOW_BRAND: string; +declare var REACT_APP_LOWCODER_CUSTOM_LOGO: string; +declare var REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE: string; +declare var REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string; declare var REACT_APP_ENV: string; declare var REACT_APP_BUILD_ID: string; declare var REACT_APP_LOG_LEVEL: string; diff --git a/client/packages/lowcoder/src/components/PageSkeleton.tsx b/client/packages/lowcoder/src/components/PageSkeleton.tsx index 221d550a3..bf3455f24 100644 --- a/client/packages/lowcoder/src/components/PageSkeleton.tsx +++ b/client/packages/lowcoder/src/components/PageSkeleton.tsx @@ -83,8 +83,8 @@ export default function PageSkeleton(props: IProps) { {!hideHeader && isHeaderReady && (
: : + REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? + REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? logo : : } style={{ backgroundColor: brandingConfig?.headerColor, ...props.headStyle }} diff --git a/client/packages/lowcoder/src/index.ts b/client/packages/lowcoder/src/index.ts index 7acd9fc72..77336f089 100644 --- a/client/packages/lowcoder/src/index.ts +++ b/client/packages/lowcoder/src/index.ts @@ -34,7 +34,11 @@ debug(`REACT_APP_LANGUAGES:, ${REACT_APP_LANGUAGES}`); debug(`REACT_APP_API_HOST:, ${REACT_APP_API_HOST}`); debug(`REACT_APP_ENV:, ${REACT_APP_ENV}`); debug(`REACT_APP_LOG_LEVEL:, ${REACT_APP_LOG_LEVEL}`); - +debug(`REACT_APP_LOWCODER_SHOW_BRAND:, ${REACT_APP_LOWCODER_SHOW_BRAND}`); +debug(`REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT:, ${REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT}`); +debug(`LOWCODER_CUSTOM_LOGO:, ${REACT_APP_LOWCODER_CUSTOM_LOGO}`); +debug(`LOWCODER_CUSTOM_LOGO_SQUARE:, ${REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE}`); + try { bootstrap(); hideLoading(); diff --git a/client/packages/lowcoder/src/pages/common/header.tsx b/client/packages/lowcoder/src/pages/common/header.tsx index 1e262ff35..57a3e80b6 100644 --- a/client/packages/lowcoder/src/pages/common/header.tsx +++ b/client/packages/lowcoder/src/pages/common/header.tsx @@ -290,8 +290,8 @@ export default function Header(props: HeaderProps) { const headerStart = ( <> history.push(ALL_APPLICATIONS_URL)}> - {LOWCODER_SHOW_BRAND === 'true' ? - LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? logo : : + {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? + REACT_APP_LOWCODER_CUSTOM_LOGO_SQUARE !== "" ? logo : : } {editName ? ( @@ -434,8 +434,8 @@ export function AppHeader() { const brandingConfig = useSelector(getBrandingConfig); const headerStart = ( history.push(ALL_APPLICATIONS_URL)}> - {LOWCODER_SHOW_BRAND === 'true' ? - LOWCODER_CUSTOM_LOGO !== "" ? logo : : + {REACT_APP_LOWCODER_SHOW_BRAND === 'true' ? + REACT_APP_LOWCODER_CUSTOM_LOGO !== "" ? logo : : } ); diff --git a/client/packages/lowcoder/src/pages/setting/idSource/list.tsx b/client/packages/lowcoder/src/pages/setting/idSource/list.tsx index dedca4d34..62f121ac0 100644 --- a/client/packages/lowcoder/src/pages/setting/idSource/list.tsx +++ b/client/packages/lowcoder/src/pages/setting/idSource/list.tsx @@ -45,13 +45,13 @@ export const IdSourceList = (props: any) => { const enableEnterpriseLogin = useSelector(selectSystemConfig)?.featureFlag?.enableEnterpriseLogin; useEffect(() => { - if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) { + if (!currentOrgId) { return; } getConfigs(); }, [currentOrgId]); - if (!currentOrgId || (!isSelfDomain(config) && !isEnterpriseMode(config))) { + if (!currentOrgId) { return null; } diff --git a/client/packages/lowcoder/src/pages/setting/settingHome.tsx b/client/packages/lowcoder/src/pages/setting/settingHome.tsx index 242895338..f54815278 100644 --- a/client/packages/lowcoder/src/pages/setting/settingHome.tsx +++ b/client/packages/lowcoder/src/pages/setting/settingHome.tsx @@ -52,14 +52,9 @@ export function SettingHome() { { key: SettingPageEnum.OAuthProvider, label: ( - - {trans("settings.oauthProviders")} - {(!currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config))) && ( - - )} - + {trans("settings.oauthProviders")} ), - disabled: !currentOrgAdmin(user) || (!isSelfDomain(config) && !isEnterpriseMode(config)), + disabled: !currentOrgAdmin(user), }, { key: SettingPageEnum.Environments, diff --git a/client/packages/lowcoder/src/pages/userAuth/login.tsx b/client/packages/lowcoder/src/pages/userAuth/login.tsx index 6478c1c31..8717b4962 100644 --- a/client/packages/lowcoder/src/pages/userAuth/login.tsx +++ b/client/packages/lowcoder/src/pages/userAuth/login.tsx @@ -131,11 +131,11 @@ function Login() { loginCardView = thirdPartyLoginView; } - const loginHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" - ? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT + const loginHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + ? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT : getLoginTitle(inviteInfo?.createUserName, systemConfig?.branding?.brandName) - const loginSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + const loginSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? trans("userAuth.poweredByLowcoder") : '' diff --git a/client/packages/lowcoder/src/pages/userAuth/register.tsx b/client/packages/lowcoder/src/pages/userAuth/register.tsx index 151d00a20..3c53e3eb9 100644 --- a/client/packages/lowcoder/src/pages/userAuth/register.tsx +++ b/client/packages/lowcoder/src/pages/userAuth/register.tsx @@ -71,11 +71,11 @@ function UserRegister() { return null; } - const registerHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" - ? LOWCODER_CUSTOM_AUTH_WELCOME_TEXT + const registerHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + ? REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT : trans("userAuth.register") - const registerSubHeading = organizationId && LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" + const registerSubHeading = REACT_APP_LOWCODER_CUSTOM_AUTH_WELCOME_TEXT !== "" ? trans("userAuth.poweredByLowcoder") : '' diff --git a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java index 8faac8ed6..7d32ed0d8 100644 --- a/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java +++ b/server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/config/CommonConfig.java @@ -33,6 +33,7 @@ public class CommonConfig { private boolean cloud; private Security security = new Security(); private String version; + private String apiVersion; private boolean blockHoundEnable; private String cookieName; private int maxQueryTimeout = 300; diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java index f450492d5..91c99bfd8 100644 --- a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java +++ b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/OpenAPIDocsConfiguration.java @@ -17,12 +17,12 @@ public class OpenAPIDocsConfiguration { private CommonConfig commonConfig; @Bean - public OpenAPI customizeOpenAPI() { + OpenAPI customizeOpenAPI() { final String securitySchemeName = commonConfig.getCookieName(); return new OpenAPI() .info(new Info() .title("Lowcoder API") - .version("1.0")) + .version(commonConfig.getApiVersion())) .addServersItem(new Server() .url("/")) .addSecurityItem(new SecurityRequirement() diff --git a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml index ad2ea40c8..8adbb1a6f 100644 --- a/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml +++ b/server/api-service/lowcoder-server/src/main/resources/application-lowcoder.yml @@ -3,9 +3,9 @@ spring: mongodb: authentication-database: admin auto-index-creation: false - uri: mongodb://192.168.1.111:27017/lowcoder?authSource=admin + uri: mongodb://lowcoder:secret123@localhost:27017/lowcoder?authSource=admin redis: - url: redis://192.168.1.111:6379 + url: redis://localhost:6379 main: allow-bean-definition-overriding: true allow-circular-references: true @@ -39,7 +39,8 @@ common: security: cors-allowed-domains: - '*' - version: 1.1.8 + version: 2.1.4 + apiVersion: 1.1 block-hound-enable: false js-executor: host: http://127.0.0.1:6060 diff --git a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml index 5a6f7ac34..4d8d62f7e 100644 --- a/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml +++ b/server/api-service/lowcoder-server/src/main/resources/selfhost/ce/application.yml @@ -40,6 +40,7 @@ common: default-value: lowcoder.org cloud: false version: 2.1.4 + apiVersion: 1.1 block-hound-enable: false js-executor: host: ${LOWCODER_NODE_SERVICE_URL:http://127.0.0.1:6060}