Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
poc-api
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
poc
poc-api
Commits
bb8fa032
Commit
bb8fa032
authored
Nov 08, 2024
by
alex yao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
I18N
parent
a07e844f
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
6 deletions
+18
-6
RestHandlerExceptionResolver.java
.../com/poc/common/handler/RestHandlerExceptionResolver.java
+4
-1
KnowledgeRestImpl.java
...ava/cn/com/poc/knowledge/rest/impl/KnowledgeRestImpl.java
+8
-5
assert.properties
src/main/resources/framemax-config/i18n/en/assert.properties
+2
-0
assert.properties
...in/resources/framemax-config/i18n/zh_cn/assert.properties
+2
-0
assert.properties
...in/resources/framemax-config/i18n/zh_tw/assert.properties
+2
-0
No files found.
src/main/java/cn/com/poc/common/handler/RestHandlerExceptionResolver.java
View file @
bb8fa032
...
...
@@ -109,8 +109,11 @@ public class RestHandlerExceptionResolver implements HandlerExceptionResolver, P
if
(
ex
instanceof
BusinessException
)
{
map
.
put
(
"message"
,
"业务异常:["
+
ex
.
getMessage
()
+
"]"
);
}
// if (ex instanceof IllegalArgumentException) {
// map.put("message", "参数异常:[" + ex.getMessage() + "]");
// }
if
(
ex
instanceof
IllegalArgumentException
)
{
map
.
put
(
"message"
,
"
参数异常
:["
+
ex
.
getMessage
()
+
"]"
);
map
.
put
(
"message"
,
"
Parameter exception
:["
+
ex
.
getMessage
()
+
"]"
);
}
if
(
ex
instanceof
I18nMessageException
)
{
map
.
put
(
"message"
,
ex
.
getMessage
());
...
...
src/main/java/cn/com/poc/knowledge/rest/impl/KnowledgeRestImpl.java
View file @
bb8fa032
...
...
@@ -18,7 +18,9 @@ import cn.com.poc.knowledge.service.BizKnowledgeDocumentService;
import
cn.com.poc.knowledge.service.BizKnowledgeInfoService
;
import
cn.com.poc.support.security.oauth.entity.UserBaseEntity
;
import
cn.com.poc.thirdparty.resource.demand.ai.entity.knowledge.GetKnowledgeChunkInfoResult
;
import
cn.com.yict.framemax.core.context.Context
;
import
cn.com.yict.framemax.core.i18n.I18nMessageException
;
import
cn.com.yict.framemax.core.i18n.I18nUtils
;
import
cn.com.yict.framemax.data.model.PagingInfo
;
import
cn.hutool.core.bean.BeanUtil
;
import
cn.hutool.core.lang.Assert
;
...
...
@@ -29,6 +31,7 @@ import org.springframework.stereotype.Component;
import
org.springframework.web.multipart.MultipartFile
;
import
javax.annotation.Resource
;
import
javax.swing.text.AbstractDocument
;
import
java.util.ArrayList
;
import
java.util.List
;
import
java.util.stream.Collectors
;
...
...
@@ -237,7 +240,7 @@ public class KnowledgeRestImpl implements KnowledgeRest {
@Override
public
BizKnowledgeInfoDto
createKnowledge
(
BizKnowledgeInfoDto
dto
)
throws
Exception
{
Assert
.
notNull
(
dto
.
getKnowledgeName
(),
"知识库名称不能为空"
);
Assert
.
notNull
(
dto
.
getKnowledgeName
(),
I18nUtils
.
message
(
"assert/knowledge.name.null"
)
);
UserBaseEntity
userBaseEntity
=
BlContext
.
getCurrentUserNotException
();
BizKnowledgeInfoEntity
bizKnowledgeInfoEntity
=
new
BizKnowledgeInfoEntity
();
bizKnowledgeInfoEntity
.
setKnowledgeName
(
dto
.
getKnowledgeName
());
...
...
@@ -251,7 +254,7 @@ public class KnowledgeRestImpl implements KnowledgeRest {
@Override
public
BizKnowledgeInfoDto
updateKnowledgeInfo
(
BizKnowledgeInfoDto
dto
)
throws
Exception
{
Assert
.
notNull
(
dto
.
getId
());
Assert
.
notBlank
(
dto
.
getKnowledgeName
(),
"知识库名称不能为空"
);
Assert
.
notBlank
(
dto
.
getKnowledgeName
(),
I18nUtils
.
message
(
"assert/knowledge.name.null"
)
);
BizKnowledgeInfoEntity
bizKnowledgeInfoEntity
=
new
BizKnowledgeInfoEntity
();
bizKnowledgeInfoEntity
.
setId
(
dto
.
getId
());
bizKnowledgeInfoEntity
.
setKnowledgeName
(
dto
.
getKnowledgeName
());
...
...
@@ -264,7 +267,7 @@ public class KnowledgeRestImpl implements KnowledgeRest {
public
void
enableKnowledgeInfo
(
Integer
knowledgeInfoId
,
String
isOpen
)
throws
Exception
{
Assert
.
notNull
(
knowledgeInfoId
);
Assert
.
notBlank
(
isOpen
);
Assert
.
isTrue
(
isOpen
.
equals
(
CommonConstant
.
IsDeleted
.
N
)
||
isOpen
.
equals
(
CommonConstant
.
IsDeleted
.
Y
)
,
"isOpen must Y or N"
);
Assert
.
isTrue
(
isOpen
.
equals
(
CommonConstant
.
IsDeleted
.
N
)
||
isOpen
.
equals
(
CommonConstant
.
IsDeleted
.
Y
));
BizKnowledgeInfoEntity
bizKnowledgeInfoEntity
=
new
BizKnowledgeInfoEntity
();
bizKnowledgeInfoEntity
.
setId
(
knowledgeInfoId
);
bizKnowledgeInfoEntity
.
setIsOpen
(
isOpen
);
...
...
@@ -297,7 +300,7 @@ public class KnowledgeRestImpl implements KnowledgeRest {
Assert
.
notNull
(
dto
.
getChunkContent
());
Assert
.
notNull
(
dto
.
getChunkRelationId
());
Assert
.
notNull
(
dto
.
getKdId
());
Assert
.
isTrue
(
dto
.
getChunkContent
().
length
()
<=
1200
);
Assert
.
isTrue
(
dto
.
getChunkContent
().
length
()
<=
1200
,
I18nUtils
.
message
(
"assert/content.length.cannot.exceed"
,
new
Object
[]{
"1200"
})
);
knowledgeService
.
updateKnowledgeChunkDoc
(
dto
.
getKdId
(),
dto
.
getChunkRelationId
(),
dto
.
getChunkContent
());
}
...
...
@@ -306,7 +309,7 @@ public class KnowledgeRestImpl implements KnowledgeRest {
Assert
.
notNull
(
dto
.
getChunkContent
());
Assert
.
notNull
(
dto
.
getKdId
());
Assert
.
notNull
(
dto
.
getChunkSort
());
Assert
.
isTrue
(
dto
.
getChunkContent
().
length
()
<=
1200
);
Assert
.
isTrue
(
dto
.
getChunkContent
().
length
()
<=
1200
,
I18nUtils
.
message
(
"assert/content.length.cannot.exceed"
,
new
Object
[]{
"1200"
})
);
knowledgeService
.
addKnowledgeChunk
(
dto
.
getKdId
(),
dto
.
getChunkContent
(),
dto
.
getChunkSort
());
}
...
...
src/main/resources/framemax-config/i18n/en/assert.properties
0 → 100644
View file @
bb8fa032
content.length.cannot.exceed
=
The content length cannot exceed,{0}
knowledge.name.null
=
\u
77E5
\u
8BC6
\u
5E93
\u
540D
\u
79F0
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
\ No newline at end of file
src/main/resources/framemax-config/i18n/zh_cn/assert.properties
View file @
bb8fa032
content.length.cannot.exceed
=
\u5185\u
5BB9
\u
957F
\u
5EA6
\u
4E0D
\u
53EF
\u
8D85
\u
8FC7,{0}
knowledge.name.null
=
\u
77E5
\u
8BC6
\u
5E93
\u
540D
\u
79F0
\u
4E0D
\u
80FD
\u
4E3A
\u
7A7A
\ No newline at end of file
src/main/resources/framemax-config/i18n/zh_tw/assert.properties
0 → 100644
View file @
bb8fa032
content.length.cannot.exceed
=
\u5185\u
5BB9
\u9577\u
5EA6
\u
4E0D
\u
53EF
\u
8D85
\u
904E,{0}
knowledge.name.null
=
\u
77E5
\u
8B58
\u
5EAB
\u
540D
\u
4E0D
\u
80FD
\u
70BA
\u
7A7A
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment