Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
C
chatGLM
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
1
Merge Requests
1
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
刘坚-丰林-DEV
chatGLM
Commits
4f586efb
Commit
4f586efb
authored
Jun 01, 2023
by
文旺-丰林-DEV
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'updateFile' into 'master'
修复个别手机号无法导入以及弹窗问题 See merge request
!6
parents
b68b5100
17bdbe04
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
6 deletions
+4
-6
excelTemplateFirst.xlsx
...t/BBM.ChatGLM.HttpApi.Host/Excels/excelTemplateFirst.xlsx
+0
-0
副本Zensong AI 账号密码.xlsx
...st/BBM.ChatGLM.HttpApi.Host/Excels/副本Zensong AI 账号密码.xlsx
+0
-0
UsersAppService.cs
...-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
+4
-5
index.tsx
react/src/pages/UserManage/index.tsx
+0
-1
No files found.
aspnet-core/host/BBM.ChatGLM.HttpApi.Host/Excels/excelTemplateFirst.xlsx
0 → 100644
View file @
4f586efb
File added
aspnet-core/host/BBM.ChatGLM.HttpApi.Host/Excels/副本Zensong AI 账号密码.xlsx
0 → 100644
View file @
4f586efb
File added
aspnet-core/src/BBM.ChatGLM.Application/User/UsersAppService.cs
View file @
4f586efb
...
...
@@ -219,11 +219,10 @@ namespace BBM.ChatGLM.User
xiangying
=
FailReason
(
userName
,
phoneNumber
,
userRole
,
"失败"
,
"手机号码不正确"
);
}
else
if
(!
Regex
.
IsMatch
(
phoneNumber
,
@"^(133|153|189|180|181|177|173|199|174|141
|139|138|137|136|135|134|159|158|157|150|151|152|147|188|187|182|183|184|178|198
|130|131|132|146|156|155|166|186|185|145|175|176
|170|171
|123)\d{8}$"
))
else
if
(!
Regex
.
IsMatch
(
phoneNumber
,
@"^(133|153|189|180|181|177|173|199|174|141|
|139|138|137|136|135|134|159|158|157|150|151|152|147|188|187|182|183|184|178|198|
|130|131|132|146|156|155|166|186|185|145|175|176|
|170|171|123)\d{8}$"
))
{
failNum
++;
xiangying
=
FailReason
(
userName
,
phoneNumber
,
userRole
,
"失败"
,
"手机号码格式不正确"
);
...
...
react/src/pages/UserManage/index.tsx
View file @
4f586efb
...
...
@@ -251,7 +251,6 @@ const UserManage = () => {
const
onHandleClickAccountFinish
=
(
values
:
any
)
=>
{
if
(
accountModalName
===
'添加账号'
)
{
alert
(
'2'
);
createdAccount
(
values
);
}
if
(
accountModalName
===
'编辑账号'
)
{
...
...
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