Merge remote-tracking branch 'origin/main'

DigitalHumanWeb/.changelogrc.js

@@ -1 +0,0 @@
-module.exports = require('@lobehub/lint').changelog;

DigitalHumanWeb/.commitlintrc.js

@@ -1 +0,0 @@
-module.exports = require('@lobehub/lint').commitlint;

DigitalHumanWeb/.eslintignore

@@ -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

DigitalHumanWeb/.eslintrc.js

@@ -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;

DigitalHumanWeb/.prettierrc.js

@@ -1 +0,0 @@
-module.exports = require('@lobehub/lint').prettier;

DigitalHumanWeb/.releaserc.js

@@ -1 +0,0 @@
-module.exports = require('@lobehub/lint').semanticRelease;

DigitalHumanWeb/.remarkrc.js

@@ -1 +0,0 @@
-module.exports = require('@lobehub/lint').remarklint;

DigitalHumanWeb/.stylelintrc.js

@@ -1,9 +0,0 @@
-const config = require('@lobehub/lint').stylelint;
-
-module.exports = {
-  ...config,
-  rules: {
-    'selector-id-pattern': null,
-    ...config.rules,
-  },
-};

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

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" \
+    DATABASE_URL="postgresql://postgres:uWNZugjBqixf8dxC@postgresql:5432/lobechat" \
-    KEY_VAULTS_SECRET="use-for-build"
+    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="" \
+ENV NEXT_AUTH_SECRET="NX2kaPE923dt6BL2U8e9oSre5RfoT7hg" \
-    NEXT_AUTH_SSO_PROVIDERS="" \
+    NEXT_AUTH_SSO_PROVIDERS="casdoor" \
-    NEXTAUTH_URL=""
+    NEXTAUTH_URL="http://192.168.15.199:3210/api/auth"
 
 # S3
 ENV NEXT_PUBLIC_S3_DOMAIN="" \
-    S3_PUBLIC_DOMAIN="" \
+    S3_PUBLIC_DOMAIN="http://192.168.15.199:9000" \
-    S3_ACCESS_KEY_ID="" \
+    S3_ACCESS_KEY_ID="soaucnP8Bip0TDdUjxng" \
-    S3_BUCKET="" \
+    S3_BUCKET="casdoor" \
-    S3_ENDPOINT="" \
+    S3_ENDPOINT="http://192.168.15.199:9000" \
-    S3_SECRET_ACCESS_KEY=""
+    S3_SECRET_ACCESS_KEY="ZPUzvY34umfcfxvWKSv0P00vczVMB6YmgJS5J9eO"
 
 # Model Variables
 ENV \

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",

DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx

@@ -93,12 +93,12 @@ const TopActions = memo<TopActionProps>(() => {
           <div className={value === '/plugins' ? cx(styles.iconText, styles.iconSelectText) : cx(styles.iconText) }>插件</div>
         </Link>
       )}
-      {showMarket && (
+      {/*{showMarket && (
         <Link aria-label={t('tab.power')} className={value === '/power' ? cx(styles.linkUrl, styles.linkclic) : cx(styles.linkUrl)} href={'/power'} onClick={() => {setValue("/power");  window.localStorage.setItem("nowChat", "")}}>
           <Image alt={"power"} className={cx(styles.iconImg)} preview={false} src="/images/sl.png" />
           <div className={value === '/power' ? cx(styles.iconText, styles.iconSelectText) : cx(styles.iconText) }>算力</div>
         </Link>
-      )}
+      )}*/}
       {showMarket && (
         <Link aria-label={t('tab.knowledge')} className={value === '/knowledge' ? cx(styles.linkUrl, styles.linkclic) : cx(styles.linkUrl)} href={'/knowledge'} onClick={() => {setValue("/knowledge")}}>
           <Image className={cx(styles.iconImg)} preview={false} src="/images/zsk.png" />

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 => {