Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
appbuild
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
appbuild
Commits
69ca25bb
Commit
69ca25bb
authored
Mar 31, 2025
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复部分sqlXml生成缺陷
parent
8564d4cd
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
8 deletions
+24
-8
appbuild-manage-ui/admin/src/views/login/login.vue
appbuild-manage-ui/admin/src/views/login/login.vue
+7
-7
appbuild-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
.../java/com/mortals/xhx/base/login/web/LoginController.java
+2
-1
appbuild-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
...in/java/com/mortals/xhx/module/app/web/AppController.java
+12
-0
appbuild-manager/src/main/java/com/mortals/xhx/module/project/web/ProjectController.java
...com/mortals/xhx/module/project/web/ProjectController.java
+3
-0
appbuild-manager/src/main/resources/template/doc/base.docx
appbuild-manager/src/main/resources/template/doc/base.docx
+0
-0
No files found.
appbuild-manage-ui/admin/src/views/login/login.vue
View file @
69ca25bb
...
...
@@ -11,11 +11,11 @@
<el-form-item
label=
"密码"
>
<el-input
v-model=
"form.password"
type=
'password'
></el-input>
</el-form-item>
<el-form-item
label=
"验证码"
>
<!--
<el-form-item
label=
"验证码"
>
<el-input
v-model=
"form.securityCode"
>
<img
slot=
"append"
width=
'60'
height=
"30"
:src=
'securityCodeUrl'
@
click=
'refreshCode'
/>
</el-input>
</el-form-item>
</el-form-item>
-->
<el-form-item
size=
"large"
>
<el-button
type=
"primary"
native-type=
'submit'
:loading=
'loading'
@
click=
'onSubmit'
>
登录
</el-button>
</el-form-item>
...
...
@@ -31,7 +31,7 @@
<
script
>
//import { createSocket } from '@/assets/utils/websocket'
const
securityCodeUrl
=
'
/m/securitycode/createCode?v=
'
;
//
const securityCodeUrl = '/m/securitycode/createCode?v=';
...
...
@@ -74,9 +74,9 @@ export default {
if
(
!
this
.
form
.
password
.
length
){
return
this
.
$message
.
warning
(
'
请输入密码
'
)
}
if
(
!
this
.
form
.
securityCode
.
length
){
/*
if(!this.form.securityCode.length){
return this.$message.warning('请输入验证码')
}
}
*/
this
.
login
();
},
},
...
...
@@ -84,11 +84,11 @@ export default {
return
{
loading
:
false
,
redirect
:
this
.
$route
.
query
.
redirect
||
'
/
'
,
securityCodeUrl
:
securityCodeUrl
,
//
securityCodeUrl: securityCodeUrl,
form
:
{
loginName
:
''
,
password
:
''
,
securityCode
:
''
,
//
securityCode: '',
}
}
}
...
...
appbuild-manager/src/main/java/com/mortals/xhx/base/login/web/LoginController.java
View file @
69ca25bb
...
...
@@ -65,7 +65,8 @@ public class LoginController extends BaseCRUDJsonController<UserService, UserFor
JSONObject
ret
=
new
JSONObject
();
String
loginName
=
loginForm
.
getLoginName
();
String
password
=
loginForm
.
getPassword
();
String
securityCode
=
loginForm
.
getSecurityCode
();
//String securityCode = loginForm.getSecurityCode();
String
securityCode
=
"admin"
;
String
ip
=
super
.
getRequestIP
(
request
);
if
(
StringUtils
.
isEmpty
(
loginName
)
||
StringUtils
.
isEmpty
(
password
))
{
ret
.
put
(
KEY_RESULT_CODE
,
VALUE_RESULT_FAILURE
);
...
...
appbuild-manager/src/main/java/com/mortals/xhx/module/app/web/AppController.java
View file @
69ca25bb
package
com.mortals.xhx.module.app.web
;
import
com.mortals.framework.exception.AppException
;
import
com.mortals.framework.model.OrderCol
;
import
com.mortals.xhx.base.system.param.service.ParamService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RequestMapping
;
...
...
@@ -10,6 +12,9 @@ import javax.servlet.http.HttpServletResponse;
import
com.mortals.framework.web.BaseCRUDJsonMappingController
;
import
com.mortals.xhx.module.app.model.AppEntity
;
import
com.mortals.xhx.module.app.service.AppService
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Map
;
/**
* AppController
...
...
@@ -35,4 +40,11 @@ public class AppController extends BaseCRUDJsonMappingController<AppService,AppF
protected
void
init
(
HttpServletRequest
request
,
HttpServletResponse
response
,
AppForm
form
,
Map
<
String
,
Object
>
model
,
Context
context
)
{
super
.
init
(
request
,
response
,
form
,
model
,
context
);
}
@Override
protected
void
doListBefore
(
HttpServletRequest
request
,
HttpServletResponse
response
,
AppForm
form
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
super
.
doListBefore
(
request
,
response
,
form
,
model
,
context
);
form
.
getQuery
().
setOrderColList
(
Arrays
.
asList
(
new
OrderCol
(
"id"
,
"desc"
)));
}
}
\ No newline at end of file
appbuild-manager/src/main/java/com/mortals/xhx/module/project/web/ProjectController.java
View file @
69ca25bb
...
...
@@ -40,6 +40,9 @@ public class ProjectController extends BaseCRUDJsonMappingController<ProjectServ
@Override
protected
void
doListBefore
(
HttpServletRequest
request
,
HttpServletResponse
response
,
ProjectForm
form
,
Map
<
String
,
Object
>
model
,
Context
context
)
throws
AppException
{
super
.
doListBefore
(
request
,
response
,
form
,
model
,
context
);
}
...
...
appbuild-manager/src/main/resources/template/doc/base.docx
View file @
69ca25bb
No preview for this file type
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