zhouhongbo
/
JZ_QGNB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
main
liushujing 3 months ago
parent e4e69c2759 c6b516d6b5
commit c08448b09d
19 changed files with 56 additions and 138 deletions
Show Stats Download Patch File Download Diff File

1
DigitalHumanWeb/.changelogrc.js
Unescape Escape View File

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

1
DigitalHumanWeb/.commitlintrc.js
Unescape Escape View File

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

31
DigitalHumanWeb/.eslintignore
Unescape Escape View File

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

37
DigitalHumanWeb/.eslintrc.js
Unescape Escape View File

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

1
DigitalHumanWeb/.prettierrc.js
Unescape Escape View File

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

1
DigitalHumanWeb/.releaserc.js
Unescape Escape View File

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

1
DigitalHumanWeb/.remarkrc.js
Unescape Escape View File

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

9
DigitalHumanWeb/.stylelintrc.js
Unescape Escape View File

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

4
DigitalHumanWeb/Dockerfile
Unescape Escape View File

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

32
DigitalHumanWeb/Dockerfile.database
Unescape Escape View File

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

2
DigitalHumanWeb/package.json
Unescape Escape View File

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

4
DigitalHumanWeb/src/app/(main)/@nav/_layout/Desktop/TopActions.tsx
Unescape Escape View File

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

4
DigitalHumanWeb/src/app/(main)/_layout/Desktop.tsx
Unescape Escape View File

@ -71,9 +71,9 @@ const Layout = memo<LayoutProps>(({ 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 && <CloudBanner />}

2
DigitalHumanWeb/src/app/(main)/applicationset/applicationset.tsx
Unescape Escape View File

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

2
DigitalHumanWeb/src/app/(main)/discover/(list)/_layout/Desktop/index.tsx
Unescape Escape View File

@ -20,7 +20,7 @@ const Layout = ({ children }: PropsWithChildren) => {
>
<Flexbox
gap={16}
style={{ maxWidth: MAX_WIDTH, position: 'relative' }}
style={{ position: 'relative' }}
width={'100%'}
>
{children}

16
DigitalHumanWeb/src/app/(main)/discover/(list)/models/_layout/Desktop.tsx
Unescape Escape View File

@ -12,14 +12,16 @@ const Layout = async ({ children }: PropsWithChildren) => {
const categoryList = await discoverService.getProviderList(DEFAULT_LANG);
return (
<Flexbox gap={24} horizontal style={{ position: 'relative' }} width={'100%'}>
<CategoryContainer>
<Category data={categoryList} />
</CategoryContainer>
<Flexbox flex={1} gap={16}>
{children}
<div>
<Flexbox gap={24} horizontal style={{ position: 'relative' }} width={'100%'}>
<CategoryContainer>
<Category data={categoryList} />
</CategoryContainer>
<Flexbox flex={1} gap={16}>
{children}
</Flexbox>
</Flexbox>
</Flexbox>
</div>
);
};

4
DigitalHumanWeb/src/app/(main)/discover/(list)/models/features/List.tsx
Unescape Escape View File

@ -108,7 +108,7 @@ const List = memo<ListProps>(async ({ category, searchKeywords, items = [] }) =>
<Grid maxItemWidth={280} rows={4}>
{stData.map((item) => (
// <Link href={urlJoin('/discover/assistant/', item.identifier)} key={item.identifier}>
<Card key={item.identifier} onClick={() => handleClickCard(item)} showCategory={!category} {...item} />
<Card style={{boxShadow: "1px 0px 12px 0px rgba(42, 77, 255, 0.19)"}} key={item.identifier} onClick={() => handleClickCard(item)} showCategory={!category} {...item} />
// </Link>
))}
</Grid>
@ -121,7 +121,7 @@ const List = memo<ListProps>(async ({ category, searchKeywords, items = [] }) =>
initialItemCount={24}
itemContent={(_, item) => (
// <Link href={urlJoin('/discover/model/', item.identifier)} key={item.identifier}>
<Card key={item.identifier} onClick={() => handleClickCard(item)} showCategory={!category} {...item} />
<Card style={{boxShadow: "1px 0px 12px 0px rgba(42, 77, 255, 0.19)"}} key={item.identifier} onClick={() => handleClickCard(item)} showCategory={!category} {...item} />
// </Link>
)}
style={{

38
DigitalHumanWeb/src/app/(main)/robot/components/RobotList.tsx
Unescape Escape View File

@ -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={() => (
<List.Item className={styles.listStyle}>
<Card className={styles.cardStyle} style={{padding: '0 !important'}}>
<div style={{background: '#EFEFEF', padding: '40px 0', textAlign: 'center'}}>
<Image className={cx(styles.iconImg)} preview={false} src="/images/robot.png" />
<div style={{background: '#EFEFEF', padding: '20px 0', textAlign: 'center'}}>
<Image className={cx(styles.iconRobotImg)} preview={false} src="/images/robot.png" />
</div>
<div style={{marginTop: '30px'}}>
<Flex justify='space-between' style={{height: '100%'}}>
@ -541,7 +545,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
</Card>
</List.Item>
)}
style={{marginTop: '10px', padding: '0 50px'}}
style={{marginTop: '10px', padding: '0 50px', height: 'calc(100vh - 150px)', overflowY: 'scroll'}}
/>
</div>
</div>
@ -554,9 +558,9 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
返回形象列表
</Button>
</Flex>
<div style={{height: '100%', padding: '0 150px 0 50px'}}>
<div style={{padding: '0 150px 0 50px', height: 'calc(100vh - 160px)', overflowY: 'scroll'}} >
<Flex gap={30} justify='space-between' style={{height: '100%'}}>
<div style={{height: '85%', width: '6%'}}>
<div style={{height: 'calc(100vh - 160px)', width: '6%'}}>
<Card className={styles.cardStyle} style={{padding: '0', textAlign: 'center'}}>
<div className={styles.robotAvatarLeftContainer}>
<div className={styles.robotAvatarLeft}>
@ -608,13 +612,13 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
</div>
</Card>
</div>
<div style={{height: '85%', width: '52%'}}>
<div style={{height: 'calc(100vh - 160px)', width: '52%'}}>
<Card className={styles.cardRobotStyle} style={{height: '120px', padding: '0 !important'}}>
<Carousel infinite={false}
// afterChange={afterChange}
ref={carouselRef}>
<div>
<Flex gap={50}>
<Flex gap={25}>
<div>
<div className={styles.soundCardAvatar}>
<Image className={cx(styles.iconImg)} preview={false} src="/images/robot2.png" style={{marginBotom: '5px', marginTop: '12px'}} />
@ -666,7 +670,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
</Flex>
</div>
<div>
<Flex gap={50}>
<Flex gap={25}>
<div>
<div className={styles.soundCardAvatar}>
<Image className={cx(styles.iconImg)} preview={false} src="/images/robot2.png" style={{marginBotom: '5px', marginTop: '12px'}} />
@ -726,17 +730,14 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
</div>
</Card>
<div className={styles.robotImg}>
<Image preview={false} src="/images/robot_img.png" style={{height: '600px', width: '100%'}}/>
<Image preview={false} src="/images/robot_img.png" style={{height: 'calc(100vh - 440px)', width: '100%'}}/>
</div>
<Card className={styles.cardRobotStyle} style={{height: '120px', padding: '0 !important'}}>
<Carousel infinite={false}
// afterChange={afterChange}
ref={carouselBgRef}>
<div>
<Flex gap={30}>
<div>
<Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
</div>
<Flex gap={25}>
<div>
<Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
</div>
@ -758,10 +759,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
</Flex>
</div>
<div>
<Flex gap={30}>
<div>
<Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
</div>
<Flex gap={25}>
<div>
<Image className={styles.robotBg} preview={false} src="/images/robot_bg.png" />
</div>
@ -791,7 +789,7 @@ const RobotList = memo<{ mobile?: boolean }>(() => {
</div>
</Card>
</div>
<div style={{height: '85%',width: '42%'}}>
<div style={{height: 'calc(100vh - 160px)',width: '42%'}}>
<Card className={styles.cardStyle} style={{ padding: '0' }}>
<div className={styles.robotSetHead}>
声音设置

2
DigitalHumanWeb/tsconfig.json
Unescape Escape View File

@ -5,7 +5,7 @@
"lib": ["dom", "dom.iterable", "esnext", "webworker"],
"allowJs": true,
"skipLibCheck": true,
"strict": true,
"strict": false,
"forceConsistentCasingInFileNames": true,
"noEmit": true,
"esModuleInterop": true,

Write Preview
Loading…
Cancel
Save