Skip to content

M
micro-security
Commit e736e239 authored by david.zhong's avatar david.zhong
Browse files
Options

权限提交

parent 6b5df543
Hide whitespace changes
Inline Side-by-side
Showing with 293 additions and 116 deletions
.gitignore 0 → 100644
View file @ e736e239
*/target/*
/.idea/*
*.iml
# Package Files #
*.jar
*.war
*.ear
# ignore eclipse files
.project
.classpath
.settings
.metadata
.factorypath
.springBeans
# ignore Maven generated target folders
target
logs
/micro-project/micro-as/*[!xml]
/micro-project/micro-context/*[!xml]
/micro-project/micro-domain/*[!xml]
/micro-project/micro-infrastructure/*[!xml]
/micro-project/micro-scheduler/*[!xml]
/micro-project/micro-transaction/*[!xml]
\ No newline at end of file
src/main/java/com/ost/micro/filter/UrlFilter.java
View file @ e736e239
......@@ -10,22 +10,35 @@ import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.LinkedHashMap;
import java.util.Map;
@Slf4j
@Component
public class UrlFilter extends ZuulFilter {
@Override
public String filterType() {
return FilterConstants.PRE_TYPE;
return FilterConstants.PRE_TYPE ;
}
@Override
public int filterOrder() {
return 0;
return 6;
}
@Override
public boolean shouldFilter() {
RequestContext ctx = RequestContext.getCurrentContext();
HttpServletRequest request = ctx.getRequest();
//String url = request.getScheme()+"://"+request.getServerName()+request.getRequestURI();
String url = request.getRequestURL().toString();
log.info("request url is {}",url);
if (url.contains("login") || url.contains("logout") || url.contains("captcha") || url.contains("webjars") || url.contains("druid")
|| url.contains("swagger") || url.contains("/v2/api-docs") || url.contains("swagger-ui.html") || url.contains("/swagger-resources")
|| url.contains("service") || url.contains("editor-app") || url.contains("/diagram-viewer") || url.contains("modeler.html")
|| url.contains("favicon.ico") || url.contains("sys")) {
return false;
}
return true;
}
......@@ -34,9 +47,20 @@ public class UrlFilter extends ZuulFilter {
log.info("开始进入UrlFilter zuul方法=======>");
RequestContext ctx = RequestContext.getCurrentContext();
HttpServletRequest request = ctx.getRequest();
//String originalRequestPath = request.getRequestURI().toString();
String originalRequestPath = request.getRequestURI().toString();
String url = request.getScheme()+"://"+request.getServerName();
log.info("request url is {}",url);
if (url.contains("backstage")) {
String modifiedRequestPath = "/api" + originalRequestPath;
log.info("modifiedRequestPath is {}",modifiedRequestPath);
ctx.put(FilterConstants.REQUEST_URI_KEY, modifiedRequestPath);
ctx.set(FilterConstants.SERVICE_ID_KEY,"micro-project-as-pay-operation");
}else if (url.contains("backmch")) {
String modifiedRequestPath = "/mch" + originalRequestPath;
log.info("modifiedRequestPath is {}",modifiedRequestPath);
ctx.put(FilterConstants.REQUEST_URI_KEY, modifiedRequestPath);
ctx.set(FilterConstants.SERVICE_ID_KEY,"micro-project-as-pay-merchant");
}
return null;
}
}
src/main/java/com/ost/micro/modules/security/controller/LoginController.java
View file @ e736e239
......@@ -126,13 +126,15 @@ public class LoginController {
throw new RenException("商家号为空或者错误",ErrorCode.BIZID_ERROR_OR_NULL);
}
}else if (url.contains("backstage")) {//运营商后台登录
String bizId = user.getBizId();
if (StringUtils.isNotEmpty(bizId)) {
log.info("商家账号不能登录运营商后台");
sysLog.setStatus(LoginStatusEnum.FAIL.value());
sysLog.setCreaterName(login.getUsername());
sysLogLoginService.save(sysLog);
throw new RenException("商家账号不能登录运营商后台",ErrorCode.ACCOUNT_ERROR);
if (null != user) {
String bizId = user.getBizId();
if (StringUtils.isNotEmpty(bizId)) {
log.info("商家账号不能登录运营商后台");
sysLog.setStatus(LoginStatusEnum.FAIL.value());
sysLog.setCreaterName(login.getUsername());
sysLogLoginService.save(sysLog);
throw new RenException("商家账号不能登录运营商后台",ErrorCode.ACCOUNT_ERROR);
}
}
}
......@@ -160,16 +162,6 @@ public class LoginController {
throw new RenException("账号停用",ErrorCode.ACCOUNT_DISABLE);
}
//账号停用
if(user.getStatus() == UserStatusEnum.DISABLE.value()){
sysLog.setStatus(LoginStatusEnum.LOCK.value());
sysLog.setCreater(user.getId());
sysLog.setCreaterName(user.getUsername());
sysLogLoginService.save(sysLog);
throw new RenException("账号停用",ErrorCode.ACCOUNT_DISABLE);
}
//商家账号停用
if(null != user.getDeptStatus() && user.getDeptStatus() == UserStatusEnum.DISABLE.value()){
sysLog.setStatus(LoginStatusEnum.LOCK.value());
......
src/main/java/com/ost/micro/modules/sys/controller/SysDeptController.java
View file @ e736e239
......@@ -24,10 +24,12 @@ import io.swagger.annotations.ApiOperation;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* 部门管理
......@@ -44,8 +46,8 @@ public class SysDeptController {
@GetMapping("list")
@ApiOperation("列表")
@RequiresPermissions("sys:dept:list")
public Result<List<SysDeptDTO>> list(){
List<SysDeptDTO> list = sysDeptService.list(new HashMap<>(1));
public Result<List<SysDeptDTO>> list(@ApiIgnore @RequestParam Map<String, Object> params){
List<SysDeptDTO> list = sysDeptService.list(params);
return new Result<List<SysDeptDTO>>().ok(list);
}
......
src/main/java/com/ost/micro/modules/sys/service/impl/SysRoleServiceImpl.java
View file @ e736e239
......@@ -80,6 +80,7 @@ public class SysRoleServiceImpl extends BaseServiceImpl<SysRoleDao, SysRoleEntit
QueryWrapper<SysRoleEntity> wrapper = new QueryWrapper<>();
wrapper.like(StringUtils.isNotBlank(name), "name", name);
wrapper.eq("status",1);
//普通管理员，只能查询所属部门及子部门的数据
UserDetail user = SecurityUser.getUser();
......
src/main/resources/application-dev.yml
View file @ e736e239
......@@ -9,9 +9,9 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql://172.30.10.213:3306/micro-security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://172.30.10.177:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: dbclean&1st->$
password: 123456
redis:
host: 127.0.0.1
......@@ -23,17 +23,32 @@ spring:
zuul:
routes:
ignoredPatterns: /actuator/health
backstage:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: true
backmch:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: true
ignoredPatterns: /actuator/health,
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: true
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
#serviceId: micro-project-scheduler-pay-fake
url: http://172.30.10.44:6032
stripPrefix: true
\ No newline at end of file
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
\ No newline at end of file
src/main/resources/application-prod.yml
View file @ e736e239
......@@ -9,7 +9,7 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql:// 10.113.8.24:3306/micr_auth?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql:// 10.113.8.24:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: micr_auth
password: dbclean&1st->$
......@@ -24,16 +24,32 @@ spring:
zuul:
routes:
ignoredPatterns: /swagger-ui.html, /actuator/health
api-1:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: false
api-2:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: false
api-3:
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: false
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
src/main/resources/application-test.yml
View file @ e736e239
......@@ -9,9 +9,9 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql://172.30.10.196:3306/micro-auth?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://172.30.10.127:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: dbclean&1st->$
password: 123456
redis:
host: 127.0.0.1
......@@ -23,16 +23,31 @@ spring:
zuul:
routes:
ignoredPatterns: /actuator/health
api-1:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: false
api-2:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: false
api-3:
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: true
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
src/main/resources/application-uat.yml
View file @ e736e239
......@@ -9,7 +9,7 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql://192.168.75.67:3306/micro_auth?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://192.168.75.67:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: dbroot&mcp.uat_
......@@ -23,16 +23,31 @@ spring:
zuul:
routes:
ignoredPatterns: /actuator/health
api-1:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: false
api-2:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: false
api-3:
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: true
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
src/main/resources/bootstrap.yml
View file @ e736e239
......@@ -5,5 +5,5 @@ spring:
name: micro-project.context.micro-security
cloud:
consul:
host: 172.30.10.213
host: 172.30.10.177
port: 8500
\ No newline at end of file
src/main/resources/mapper/sys/SysDeptDao.xml
View file @ e736e239
......@@ -12,6 +12,9 @@
#{id}
</foreach>
</if>
<if test="null != status">
and t1.status = #{status}
</if>
</where>
order by t1.sort asc
</select>
......
target/classes/application-dev.yml
View file @ e736e239
......@@ -9,9 +9,9 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql://172.30.10.213:3306/micro-security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://172.30.10.177:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: dbclean&1st->$
password: 123456
redis:
host: 127.0.0.1
......@@ -23,17 +23,32 @@ spring:
zuul:
routes:
ignoredPatterns: /actuator/health
backstage:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: true
backmch:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: true
ignoredPatterns: /actuator/health,
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: true
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
#serviceId: micro-project-scheduler-pay-fake
url: http://172.30.10.44:6032
stripPrefix: true
\ No newline at end of file
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
\ No newline at end of file
target/classes/application-prod.yml
View file @ e736e239
......@@ -9,7 +9,7 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql:// 10.113.8.24:3306/micr_auth?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql:// 10.113.8.24:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: micr_auth
password: dbclean&1st->$
......@@ -24,16 +24,32 @@ spring:
zuul:
routes:
ignoredPatterns: /swagger-ui.html, /actuator/health
api-1:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: false
api-2:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: false
api-3:
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: false
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
target/classes/application-test.yml
View file @ e736e239
......@@ -9,9 +9,9 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql://172.30.10.196:3306/micro-auth?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://172.30.10.127:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: dbclean&1st->$
password: 123456
redis:
host: 127.0.0.1
......@@ -23,16 +23,31 @@ spring:
zuul:
routes:
ignoredPatterns: /actuator/health
api-1:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: false
api-2:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: false
api-3:
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: true
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
target/classes/application-uat.yml
View file @ e736e239
......@@ -9,7 +9,7 @@ server:
spring:
datasource:
druid:
url: jdbc:mysql://192.168.75.67:3306/micro_auth?useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://192.168.75.67:3306/micro_security?useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root
password: dbroot&mcp.uat_
......@@ -23,16 +23,31 @@ spring:
zuul:
routes:
ignoredPatterns: /actuator/health
api-1:
path: /api/**
serviceId: micro-project-as-pay-operation
stripPrefix: false
api-2:
path: /mch/**
serviceId: micro-project-as-pay-merchant
stripPrefix: false
api-3:
# backstage:
# path: /api/**
# serviceId: micro-project-as-pay-operation
# stripPrefix: true
# backmch:
# path: /mch/**
# serviceId: micro-project-as-pay-merchant
# stripPrefix: true
payfake:
path: /pay/searchorder/**
serviceId: micro-project-scheduler-pay-fake
stripPrefix: true
login:
path: /login/**
url: forward:/login
logout:
path: /logout/**
url: forward:/logout
captcha:
path: /captcha/**
url: forward:/captcha
sys:
path: /sys/**
url: forward:/sys
all:
path: /**
serviceId: micro-project-as-pay-operation
target/classes/bootstrap.yml
View file @ e736e239
......@@ -5,5 +5,5 @@ spring:
name: micro-project.context.micro-security
cloud:
consul:
host: 172.30.10.213
host: 172.30.10.177
port: 8500
\ No newline at end of file
target/classes/mapper/sys/SysDeptDao.xml
View file @ e736e239
......@@ -12,6 +12,9 @@
#{id}
</foreach>
</if>
<if test="null != status">
and t1.status = #{status}
</if>
</where>
order by t1.sort asc
</select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment