Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
aserver
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
15所TongWeb
aserver
Commits
eafa619a
Commit
eafa619a
authored
Mar 11, 2021
by
刘可心
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
设为首页以及登录首页
parent
0a713015
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
126 additions
and
3 deletions
+126
-3
HelperController.java
...java/com/archser/aserver/controller/HelperController.java
+26
-0
IndexController.java
.../java/com/archser/aserver/controller/IndexController.java
+21
-1
HelperService.java
src/main/java/com/archser/aserver/service/HelperService.java
+60
-0
DM_UpdateSQL.xml
src/main/resources/DBUpdate/DM_UpdateSQL.xml
+13
-2
oracle.sql
src/main/resources/oracle.sql
+6
-0
No files found.
src/main/java/com/archser/aserver/controller/HelperController.java
View file @
eafa619a
...
@@ -139,5 +139,31 @@ public class HelperController extends Controller {
...
@@ -139,5 +139,31 @@ public class HelperController extends Controller {
}
}
}
}
/**
* LiuKexin 20210310 判断此页是否设置为首页
*/
public
void
HomeIsAlready
()
{
String
username
=
this
.
getAttr
(
"username"
);
String
homeUrl
=
this
.
getPara
(
"homeUrl"
);
if
(
null
==
homeUrl
)
{
renderJson
(
Ret
.
fail
(
"msg"
,
"获取数据错误"
));
}
renderJson
(
helperService
.
HomeIsAlready
(
username
,
homeUrl
));
}
/**
* LiuKexin 20210310 设置首页
*/
public
void
settingHome
()
{
String
username
=
this
.
getAttr
(
"username"
);
String
homeUrl
=
this
.
getPara
(
"homeUrl"
);
String
origin
=
this
.
getPara
(
"origin"
);
if
(
null
==
homeUrl
||
null
==
origin
)
{
renderJson
(
Ret
.
fail
(
"msg"
,
"获取数据错误"
));
}
renderJson
(
helperService
.
settingHome
(
username
,
homeUrl
,
origin
));
}
}
}
src/main/java/com/archser/aserver/controller/IndexController.java
View file @
eafa619a
...
@@ -206,6 +206,7 @@ public class IndexController extends Controller {
...
@@ -206,6 +206,7 @@ public class IndexController extends Controller {
return
;
return
;
}
}
}
}
System
system
=
InfoSystem
.
getSystem
(
app
);
System
system
=
InfoSystem
.
getSystem
(
app
);
if
(
system
==
null
)
{
if
(
system
==
null
)
{
this
.
renderJson
(
Ret
.
fail
(
"msg"
,
"没有找到应用:"
+
app
));
this
.
renderJson
(
Ret
.
fail
(
"msg"
,
"没有找到应用:"
+
app
));
...
@@ -247,6 +248,7 @@ public class IndexController extends Controller {
...
@@ -247,6 +248,7 @@ public class IndexController extends Controller {
}
}
}
}
/** 修改如果登陆用户为admin用户则直接登陆 huwenbin 2020/5/20 end */
/** 修改如果登陆用户为admin用户则直接登陆 huwenbin 2020/5/20 end */
try
{
try
{
String
jws
=
Jwts
.
builder
()
String
jws
=
Jwts
.
builder
()
// 设置密匙ID
// 设置密匙ID
...
@@ -278,7 +280,25 @@ public class IndexController extends Controller {
...
@@ -278,7 +280,25 @@ public class IndexController extends Controller {
logService
.
saveAsLog
(
"login"
,
username
,
JwtInterceptor
.
getIpAddr
(
getRequest
()),
"生成登录票据失败"
,
app
);
logService
.
saveAsLog
(
"login"
,
username
,
JwtInterceptor
.
getIpAddr
(
getRequest
()),
"生成登录票据失败"
,
app
);
}
}
}
}
/**
* LiuKexin 20210310 登录前先获取设置首页的信息
*/
@Clear
public
void
getUserHome
()
{
String
username
=
this
.
getPara
(
"username"
);
Record
findUser
=
Db
.
findById
(
"AS_USER"
,
"username"
,
username
);
if
(
null
==
findUser
)
{
renderJson
(
Ret
.
fail
());
return
;
}
Record
findUserHome
=
Db
.
findById
(
"AS_USER_HOME"
,
"user_id"
,
findUser
.
getInt
(
"ID"
));
if
(
null
==
findUserHome
)
{
renderJson
(
Ret
.
fail
());
return
;
}
renderJson
(
Ret
.
ok
(
"app"
,
findUserHome
.
getStr
(
"system"
)).
set
(
"callback"
,
findUserHome
.
getStr
(
"home_url"
)));
}
/**
/**
* @Description: 验证密码强度
* @Description: 验证密码强度
...
...
src/main/java/com/archser/aserver/service/HelperService.java
View file @
eafa619a
...
@@ -8,6 +8,7 @@ import com.jfinal.kit.Ret;
...
@@ -8,6 +8,7 @@ import com.jfinal.kit.Ret;
import
com.jfinal.plugin.activerecord.Db
;
import
com.jfinal.plugin.activerecord.Db
;
import
com.jfinal.plugin.activerecord.Page
;
import
com.jfinal.plugin.activerecord.Page
;
import
com.jfinal.plugin.activerecord.Record
;
import
com.jfinal.plugin.activerecord.Record
;
import
com.jfinal.plugin.activerecord.SqlPara
;
import
com.jfinal.upload.UploadFile
;
import
com.jfinal.upload.UploadFile
;
import
java.io.File
;
import
java.io.File
;
...
@@ -99,4 +100,63 @@ public class HelperService {
...
@@ -99,4 +100,63 @@ public class HelperService {
return
false
;
return
false
;
}
}
}
}
/**
* LiuKexin 20210310 判断此页是否为首页
* @param username
* @param homeUrl
* @return
*/
public
Ret
HomeIsAlready
(
String
username
,
String
homeUrl
)
{
try
{
Record
findHomeUrl
=
Db
.
findFirst
(
Db
.
getSqlPara
(
"findHomeUrlByUsername"
,
Kv
.
by
(
"username"
,
username
)));
if
(
null
==
findHomeUrl
)
{
return
Ret
.
ok
(
"noHome"
,
"没有设置首页"
);
}
if
(
homeUrl
.
equals
(
findHomeUrl
.
getStr
(
"home_url"
)))
{
return
Ret
.
ok
(
"homeSame"
,
"设置的首页一致"
);
}
return
Ret
.
ok
(
"homeAlready"
,
"已经设置过首页"
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
Ret
.
fail
(
"msg"
,
"设置首页异常 "
);
}
}
/**
* LiuKexin 20210311 设置首页
* @param username
* @param homeUrl
* @param origin
* @return
*/
public
Ret
settingHome
(
String
username
,
String
homeUrl
,
String
origin
)
{
try
{
//获取用户的ID
Record
findUser
=
Db
.
findById
(
"AS_USER"
,
"username"
,
username
);
if
(
null
==
findUser
)
{
return
Ret
.
fail
(
"msg"
,
"获取数据失败"
);
}
Integer
userId
=
findUser
.
getInt
(
"ID"
);
Record
userHome
=
new
Record
();
userHome
.
set
(
"user_id"
,
userId
);
userHome
.
set
(
"home_url"
,
homeUrl
);
userHome
.
set
(
"system"
,
Db
.
findById
(
"AS_SYSTEM"
,
"url"
,
origin
));
//根据用户ID 判断是否设置过首页
Record
findUserHome
=
Db
.
findById
(
"AS_USER_HOME"
,
"user_id"
,
userId
);
if
(
null
==
findUserHome
)
{
userHome
.
set
(
"id"
,
"SEQ_USER_HOME.nextval"
);
Db
.
save
(
"AS_USER_HOME"
,
userHome
);
return
Ret
.
ok
(
"msg"
,
"保存成功"
);
}
userHome
.
set
(
"id"
,
findUserHome
.
getInt
(
"ID"
));
Db
.
update
(
"AS_USER_HOME"
,
userHome
);
return
Ret
.
ok
(
"msg"
,
"保存成功"
);
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
return
Ret
.
fail
(
"msg"
,
"设置首页异常 "
);
}
}
}
}
src/main/resources/DBUpdate/DM_UpdateSQL.xml
View file @
eafa619a
...
@@ -2962,8 +2962,7 @@
...
@@ -2962,8 +2962,7 @@
alter table AS_FILE_RECYLE add "ecert_sign" VARCHAR2(50);
alter table AS_FILE_RECYLE add "ecert_sign" VARCHAR2(50);
</sql>
</sql>
</version>
</version>
<!-- <version edition="137" description="帮助中心">
<version
edition=
"137"
description=
"帮助中心"
>
<sql creator="liukexin" createDate="20210301" note="帮助中心">
<sql creator="liukexin" createDate="20210301" note="帮助中心">
CREATE TABLE "AS_HELPER"
CREATE TABLE "AS_HELPER"
(
(
...
@@ -2986,4 +2985,15 @@
...
@@ -2986,4 +2985,15 @@
values(SEQ_MENU.nextval,'helpCenter','帮助中心管理','帮助中心管理','#/helpManager',9,'后台管理','系统管理',4);
values(SEQ_MENU.nextval,'helpCenter','帮助中心管理','帮助中心管理','#/helpManager',9,'后台管理','系统管理',4);
</sql>
</sql>
</version>
</version>
<version edition="139" description="设置首页">
<sql creator="liukexin" createDate="20210309" note="设置首页">
CREATE TABLE "AS_USER_HOME"
(
"ID" NUMBER(22,6) NOT NULL,
"USER_ID" NUMBER(22,6),
"HOME_URL" VARCHAR(255),
"SYSTEM" VARCHAR(100),
CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ;
</sql>
</version> -->
</update>
</update>
\ No newline at end of file
src/main/resources/oracle.sql
View file @
eafa619a
...
@@ -15,6 +15,12 @@ from AS_HELPER
...
@@ -15,6 +15,12 @@ from AS_HELPER
select
AS_HELPER_SEQ
.
nextval
id
from
dual
select
AS_HELPER_SEQ
.
nextval
id
from
dual
#
end
#
end
#
sql
(
"findHomeUrlByUsername"
)
select
*
from
as_user_home
where
user_id
in
(
select
id
from
as_user
where
username
=#
para
(
username
)
)
#
end
###
根据部门
Id
查询全宗信息
###
根据部门
Id
查询全宗信息
#
sql
(
"getFondDataByOrganId"
)
#
sql
(
"getFondDataByOrganId"
)
select
*
from
as_fond
where
organ_id
=#
para
(
organ_id
)
select
*
from
as_fond
where
organ_id
=#
para
(
organ_id
)
...
...
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