diff --git a/DigitalHumanWeb/.changelogrc.js b/DigitalHumanWeb/.changelogrc.js deleted file mode 100644 index 9a2f5f9..0000000 --- a/DigitalHumanWeb/.changelogrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lobehub/lint').changelog; diff --git a/DigitalHumanWeb/.commitlintrc.js b/DigitalHumanWeb/.commitlintrc.js deleted file mode 100644 index 9b8c6ac..0000000 --- a/DigitalHumanWeb/.commitlintrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lobehub/lint').commitlint; diff --git a/DigitalHumanWeb/.eslintignore b/DigitalHumanWeb/.eslintignore deleted file mode 100644 index a0afbcb..0000000 --- a/DigitalHumanWeb/.eslintignore +++ /dev/null @@ -1,31 +0,0 @@ -# Eslintignore for LobeHub -################################################################ - -# dependencies -node_modules - -# ci -coverage -.coverage - -# test -jest* -*.test.ts -*.test.tsx - -# umi -.umi -.umi-production -.umi-test -.dumi/tmp* -!.dumirc.ts - -# production -dist -es -lib -logs - -# misc -# add other ignore file below -.next \ No newline at end of file diff --git a/DigitalHumanWeb/.eslintrc.js b/DigitalHumanWeb/.eslintrc.js deleted file mode 100644 index 827b016..0000000 --- a/DigitalHumanWeb/.eslintrc.js +++ /dev/null @@ -1,37 +0,0 @@ -const config = require('@lobehub/lint').eslint; - -config.extends.push('plugin:@next/next/recommended'); - -config.rules['unicorn/no-negated-condition'] = 0; -config.rules['unicorn/prefer-type-error'] = 0; -config.rules['unicorn/prefer-logical-operator-over-ternary'] = 0; -config.rules['unicorn/no-null'] = 0; -config.rules['unicorn/no-typeof-undefined'] = 0; -config.rules['unicorn/explicit-length-check'] = 0; -config.rules['unicorn/prefer-code-point'] = 0; -config.rules['no-extra-boolean-cast'] = 0; -config.rules['unicorn/no-useless-undefined'] = 0; -config.rules['react/no-unknown-property'] = 0; -config.rules['unicorn/prefer-ternary'] = 0; -config.rules['unicorn/prefer-spread'] = 0; -config.rules['unicorn/catch-error-name'] = 0; -config.rules['unicorn/no-array-for-each'] = 0; -config.rules['unicorn/prefer-number-properties'] = 0; - -config.overrides = [ - { - extends: ['plugin:mdx/recommended'], - files: ['*.mdx'], - rules: { - '@typescript-eslint/no-unused-vars': 1, - 'no-undef': 0, - 'react/jsx-no-undef': 0, - 'react/no-unescaped-entities': 0, - }, - settings: { - 'mdx/code-blocks': false, - }, - }, -]; - -module.exports = config; diff --git a/DigitalHumanWeb/.prettierrc.js b/DigitalHumanWeb/.prettierrc.js deleted file mode 100644 index f0355a9..0000000 --- a/DigitalHumanWeb/.prettierrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lobehub/lint').prettier; diff --git a/DigitalHumanWeb/.releaserc.js b/DigitalHumanWeb/.releaserc.js deleted file mode 100644 index 3793001..0000000 --- a/DigitalHumanWeb/.releaserc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lobehub/lint').semanticRelease; diff --git a/DigitalHumanWeb/.remarkrc.js b/DigitalHumanWeb/.remarkrc.js deleted file mode 100644 index b673c10..0000000 --- a/DigitalHumanWeb/.remarkrc.js +++ /dev/null @@ -1 +0,0 @@ -module.exports = require('@lobehub/lint').remarklint; diff --git a/DigitalHumanWeb/.stylelintrc.js b/DigitalHumanWeb/.stylelintrc.js deleted file mode 100644 index d1ac674..0000000 --- a/DigitalHumanWeb/.stylelintrc.js +++ /dev/null @@ -1,9 +0,0 @@ -const config = require('@lobehub/lint').stylelint; - -module.exports = { - ...config, - rules: { - 'selector-id-pattern': null, - ...config.rules, - }, -}; diff --git a/DigitalHumanWeb/Dockerfile b/DigitalHumanWeb/Dockerfile index ae9603a..a8ee26a 100644 --- a/DigitalHumanWeb/Dockerfile +++ b/DigitalHumanWeb/Dockerfile @@ -1,5 +1,5 @@ ## Base image for all the stages -FROM node:20-slim AS base +FROM node:22-slim AS base ARG USE_CN_MIRROR @@ -67,7 +67,7 @@ RUN \ # Enable corepack && corepack enable \ # Use pnpm for corepack - && corepack use pnpm \ + && corepack use $(sed -n 's/.*"packageManager": "\(.*\)".*/\1/p' package.json) \ # Install the dependencies && pnpm i \ # Add sharp dependencies diff --git a/DigitalHumanWeb/Dockerfile.database b/DigitalHumanWeb/Dockerfile.database index 3f11381..d0fac4b 100644 --- a/DigitalHumanWeb/Dockerfile.database +++ b/DigitalHumanWeb/Dockerfile.database @@ -1,5 +1,5 @@ ## Base image for all the stages -FROM node:20-slim AS base +FROM node:22-slim AS base ARG USE_CN_MIRROR @@ -32,10 +32,10 @@ FROM base AS builder ARG USE_CN_MIRROR ENV NEXT_PUBLIC_SERVICE_MODE="server" \ - APP_URL="http://app.com" \ + APP_URL="http://192.168.15.199:3210" \ DATABASE_DRIVER="node" \ - DATABASE_URL="postgres://postgres:password@localhost:5432/postgres" \ - KEY_VAULTS_SECRET="use-for-build" + DATABASE_URL="postgresql://postgres:uWNZugjBqixf8dxC@postgresql:5432/lobechat" \ + KEY_VAULTS_SECRET="Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=" # Sentry ENV NEXT_PUBLIC_SENTRY_DSN="" \ @@ -113,12 +113,12 @@ ENV NODE_ENV="production" \ NODE_TLS_REJECT_UNAUTHORIZED="" # set hostname to localhost -ENV HOSTNAME="0.0.0.0" \ +ENV HOSTNAME="192.168.15.199" \ PORT="3210" # General Variables ENV ACCESS_CODE="" \ - APP_URL="" \ + APP_URL="http://192.168.15.199:3210" \ API_KEY_SELECT_MODE="" \ DEFAULT_AGENT_CONFIG="" \ SYSTEM_AGENT="" \ @@ -126,22 +126,22 @@ ENV ACCESS_CODE="" \ PROXY_URL="" # Database -ENV KEY_VAULTS_SECRET="" \ +ENV KEY_VAULTS_SECRET="Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=" \ DATABASE_DRIVER="node" \ - DATABASE_URL="" + DATABASE_URL="postgresql://postgres:uWNZugjBqixf8dxC@postgresql:5432/lobechat" # Next Auth -ENV NEXT_AUTH_SECRET="" \ - NEXT_AUTH_SSO_PROVIDERS="" \ - NEXTAUTH_URL="" +ENV NEXT_AUTH_SECRET="NX2kaPE923dt6BL2U8e9oSre5RfoT7hg" \ + NEXT_AUTH_SSO_PROVIDERS="casdoor" \ + NEXTAUTH_URL="http://192.168.15.199:3210/api/auth" # S3 ENV NEXT_PUBLIC_S3_DOMAIN="" \ - S3_PUBLIC_DOMAIN="" \ - S3_ACCESS_KEY_ID="" \ - S3_BUCKET="" \ - S3_ENDPOINT="" \ - S3_SECRET_ACCESS_KEY="" + S3_PUBLIC_DOMAIN="http://192.168.15.199:9000" \ + S3_ACCESS_KEY_ID="soaucnP8Bip0TDdUjxng" \ + S3_BUCKET="casdoor" \ + S3_ENDPOINT="http://192.168.15.199:9000" \ + S3_SECRET_ACCESS_KEY="ZPUzvY34umfcfxvWKSv0P00vczVMB6YmgJS5J9eO" # Model Variables ENV \ diff --git a/DigitalHumanWeb/package.json b/DigitalHumanWeb/package.json index 7be646f..ddf5ffe 100644 --- a/DigitalHumanWeb/package.json +++ b/DigitalHumanWeb/package.json @@ -123,7 +123,7 @@ "@lobehub/chat-plugins-gateway": "^1.9.0", "@lobehub/icons": "^1.33.7", "@lobehub/tts": "^1.24.3", - "@lobehub/ui": "^1.150.3", + "@lobehub/ui": "1.150.3", "@neondatabase/serverless": "^0.9.4", "@next/third-parties": "^14.2.6", "@react-spring/web": "^9.7.3", diff --git a/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx b/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx index 59fc8e5..3f084f1 100644 --- a/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx +++ b/DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx @@ -93,12 +93,12 @@ const TopActions = memo(() => {
插件
)} - {showMarket && ( + {/*{showMarket && ( {setValue("/power"); window.localStorage.setItem("nowChat", "")}}> {"power"}
算力
- )} + )}*/} {showMarket && ( {setValue("/knowledge")}}> diff --git a/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx b/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx index 3e953b2..9e0d185 100644 --- a/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx +++ b/DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx @@ -71,9 +71,9 @@ const Layout = memo(({ children, nav }) => { const { isPWA } = usePlatform(); const theme = useTheme(); const { styles, cx } = useStyles() - console.log(window?.location?.pathname,'3837373666router--------------------------------------------') + console.log(window, window.location, window?.location?.pathname,'3837373666router--------------------------------------------') const { showCloudPromotion } = useServerConfigStore(featureFlagsSelectors); - const pathName = window?.location?.pathname + const pathName = window?.location?.pathname ?? '/welcome' return ( <> {showCloudPromotion && } diff --git a/DigitalHumanWeb/src/app/(main)/applicationset/applicationset.tsx b/DigitalHumanWeb/src/app/(main)/applicationset/applicationset.tsx index c198df7..c589346 100644 --- a/DigitalHumanWeb/src/app/(main)/applicationset/applicationset.tsx +++ b/DigitalHumanWeb/src/app/(main)/applicationset/applicationset.tsx @@ -728,7 +728,7 @@ const ApplicationSet = memo(() => { url: "/flxai/api/robot/apptoolsset/getAllAiTools", }).then((response) => { if (response.code === 0) { - console.log(response,"2222") + // console.log(response,"2222") setStData(response.data); } }).catch(error => { diff --git a/DigitalHumanWeb/src/app/(main)/discover/(list)/_layout/Desktop/index.tsx b/DigitalHumanWeb/src/app/(main)/discover/(list)/_layout/Desktop/index.tsx index 162174c..0085062 100644 --- a/DigitalHumanWeb/src/app/(main)/discover/(list)/_layout/Desktop/index.tsx +++ b/DigitalHumanWeb/src/app/(main)/discover/(list)/_layout/Desktop/index.tsx @@ -20,7 +20,7 @@ const Layout = ({ children }: PropsWithChildren) => { > {children} diff --git a/DigitalHumanWeb/src/app/(main)/discover/(list)/models/_layout/Desktop.tsx b/DigitalHumanWeb/src/app/(main)/discover/(list)/models/_layout/Desktop.tsx index aa4c3d6..a773e9a 100644 --- a/DigitalHumanWeb/src/app/(main)/discover/(list)/models/_layout/Desktop.tsx +++ b/DigitalHumanWeb/src/app/(main)/discover/(list)/models/_layout/Desktop.tsx @@ -12,14 +12,16 @@ const Layout = async ({ children }: PropsWithChildren) => { const categoryList = await discoverService.getProviderList(DEFAULT_LANG); return ( - - - - - - {children} +
+ + + + + + {children} + - +
); }; diff --git a/DigitalHumanWeb/src/app/(main)/discover/(list)/models/features/List.tsx b/DigitalHumanWeb/src/app/(main)/discover/(list)/models/features/List.tsx index 84555ed..767a589 100644 --- a/DigitalHumanWeb/src/app/(main)/discover/(list)/models/features/List.tsx +++ b/DigitalHumanWeb/src/app/(main)/discover/(list)/models/features/List.tsx @@ -74,7 +74,7 @@ const List = memo(async ({ category, searchKeywords, items = [] }) => }; fetchData(); }, []); // 空数组[]意味着仅在组件挂载时调用一次 - + const handleClickCard = (item) => { console.log(item) router.push(urlJoin('/discover/model/', item.identifier)) @@ -108,7 +108,7 @@ const List = memo(async ({ category, searchKeywords, items = [] }) => {stData.map((item) => ( // - handleClickCard(item)} showCategory={!category} {...item} /> + handleClickCard(item)} showCategory={!category} {...item} /> // ))} @@ -121,7 +121,7 @@ const List = memo(async ({ category, searchKeywords, items = [] }) => initialItemCount={24} itemContent={(_, item) => ( // - handleClickCard(item)} showCategory={!category} {...item} /> + handleClickCard(item)} showCategory={!category} {...item} /> // )} style={{ diff --git a/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx b/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx index d7f8851..89ea1ea 100644 --- a/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx +++ b/DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx @@ -76,7 +76,7 @@ const useStyles = createStyles(({ css }) => ({ box-shadow: 1px 0px 12px 0px rgba(42, 77, 255, 0.19); border: none; border-radius: 8px; - padding: 10px 0; + padding: 0px; width: 100%; height: 100%; overflow: auto; @@ -123,6 +123,10 @@ const useStyles = createStyles(({ css }) => ({ box-sizing: border-box; border: 1px solid #0044FF; `, + iconRobotImg: css` + width: 48px; + height: 195px !important; + `, iconImg: css` width: 48px; height: 48px; @@ -172,7 +176,7 @@ const useStyles = createStyles(({ css }) => ({ border-radius: 8px; `, robotImg: css` - margin: 30px 0; + margin: 20px 0; width: 100%; .ant-image { width: 100%; @@ -520,8 +524,8 @@ const RobotList = memo<{ mobile?: boolean }>(() => { renderItem={() => ( -
- +
+
@@ -541,7 +545,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => { )} - style={{marginTop: '10px', padding: '0 50px'}} + style={{marginTop: '10px', padding: '0 50px', height: 'calc(100vh - 150px)', overflowY: 'scroll'}} />
@@ -554,9 +558,9 @@ const RobotList = memo<{ mobile?: boolean }>(() => { 返回形象列表 -
+
-
+
@@ -608,13 +612,13 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
-
+
- +
@@ -666,7 +670,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
- +
@@ -726,17 +730,14 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
- +
- -
- -
+
@@ -758,10 +759,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
- -
- -
+
@@ -791,7 +789,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
-
+
声音设置 diff --git a/DigitalHumanWeb/tsconfig.json b/DigitalHumanWeb/tsconfig.json index 3ba5398..e140d47 100644 --- a/DigitalHumanWeb/tsconfig.json +++ b/DigitalHumanWeb/tsconfig.json @@ -5,7 +5,7 @@ "lib": ["dom", "dom.iterable", "esnext", "webworker"], "allowJs": true, "skipLibCheck": true, - "strict": true, + "strict": false, "forceConsistentCasingInFileNames": true, "noEmit": true, "esModuleInterop": true,