huojin
/
YouChain_WMS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新权限问题、XSS脚本攻击、积木报表授权、邮箱重复请求

main
huojin\hj 2025-06-06 16:46:06 +08:00
parent 765977e382
commit 232faf0033
40 changed files with 291 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/Filter/XssFilter.java 100644
View File

@ -0,0 +1,14 @@
package net.lab1024.sa.admin.Filter;
import jakarta.servlet.*;
import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
public class XssFilter implements Filter{
@Override
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
throws IOException, ServletException {
chain.doFilter(new XssRequestWrapper((HttpServletRequest) request), response);
}
}

30
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/Filter/XssRequestWrapper.java 100644
View File

@ -0,0 +1,30 @@
package net.lab1024.sa.admin.Filter;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequestWrapper;
import org.jsoup.Jsoup;
import org.jsoup.safety.Safelist;
public class XssRequestWrapper extends HttpServletRequestWrapper {
public XssRequestWrapper(HttpServletRequest request) {
super(request);
}
@Override
public String[] getParameterValues(String parameter) {
String[] values = super.getParameterValues(parameter);
if (values == null) {
return null;
}
int count = values.length;
String[] encodedValues = new String[count];
for (int i = 0; i < count; i++) {
encodedValues[i] = cleanXss(values[i]);
}
return encodedValues;
}
private String cleanXss(String value) {
return Jsoup.clean(value, Safelist.relaxed());
}
}

13
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/config/MvcConfig.java
View File

@ -1,8 +1,11 @@
package net.lab1024.sa.admin.config;
import jakarta.annotation.Resource;
import net.lab1024.sa.admin.Filter.XssFilter;
import net.lab1024.sa.admin.interceptor.AdminInterceptor;
import net.lab1024.sa.base.config.SwaggerConfig;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
@ -36,4 +39,14 @@ public class MvcConfig implements WebMvcConfigurer {
registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/");
}
@Bean
public FilterRegistrationBean<XssFilter> xssFilterRegistration() {
FilterRegistrationBean<XssFilter> registration = new FilterRegistrationBean<>();
registration.setFilter(new XssFilter());
registration.addUrlPatterns("/*");
registration.setName("xssFilter");
registration.setOrder(1);
return registration;
}
}

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/controller/AddressController.java
View File

@ -85,7 +85,7 @@ public class AddressController {
@Operation(summary = "批量删除 @author hj")
@PostMapping("/address/batchDelete")
@SaCheckPermission("address:batchDelete")
@SaCheckPermission("address:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return addressService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/controller/AreaController.java
View File

@ -72,7 +72,7 @@ public class AreaController {
@Operation(summary = "批量删除 @author hj")
@PostMapping("/area/batchDelete")
@SaCheckPermission("area:batchDelete")
@SaCheckPermission("area:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return areaService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/controller/CustomerController.java
View File

@ -72,7 +72,7 @@ public class CustomerController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/customer/batchDelete")
@SaCheckPermission("customer:batchDelete")
@SaCheckPermission("customer:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return customerService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/controller/ItemController.java
View File

@ -84,7 +84,7 @@ public class ItemController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/item/batchDelete")
@SaCheckPermission("item:batchDelete")
@SaCheckPermission("item:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return itemService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/controller/LocationController.java
View File

@ -73,7 +73,7 @@ public class LocationController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/location/batchDelete")
@SaCheckPermission("location:batchDelete")
@SaCheckPermission("location:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return locationService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/controller/StockController.java
View File

@ -84,7 +84,7 @@ public class StockController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/stock/batchDelete")
@SaCheckPermission("stock:batchDelete")
@SaCheckPermission("stock:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return stockService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/inventory/controller/InventoryController.java
View File

@ -61,7 +61,7 @@ public class InventoryController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/inventory/batchDelete")
@SaCheckPermission("inventory:batchDelete")
@SaCheckPermission("inventory:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return inventoryService.batchDelete(idList);

43
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/jimuReport/JimuReportTokenServiceImpl.java
View File

@ -1,28 +1,53 @@
package net.lab1024.sa.admin.module.business.wms.jimuReport;
import cn.dev33.satoken.session.SaSession;
import cn.dev33.satoken.stp.StpUtil;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.admin.module.system.login.domain.LoginResultVO;
import net.lab1024.sa.admin.module.system.login.service.LoginService;
import net.lab1024.sa.admin.util.AdminRequestUtil;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.http.HttpHeaders;
import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
/**
* 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
* 1.自定义获取登录token
* 2.自定义获取登录用户
*/
@Component
@Service
@Slf4j
public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
@Resource
private LoginService loginService;
/**
* 通过请求获取Token
*
* @param request
* @return
*/
@Override
public String getToken(HttpServletRequest request) {
//System.out.println("---------call---------getToken-----------------------");
//return TokenUtils.getTokenByRequest(request);
return "123456";
try {
String token = request.getParameter("token");
if (StringUtils.isNoneBlank(token)) {
return token;
}
String token2 = request.getHeader("x-access-token");
if (StringUtils.isNoneBlank(token2)) {
return token2;
}
} catch (Exception e) {
log.error("getToken error:{}", e.getMessage());
}
return null;
}
/**
@ -47,6 +72,7 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
/**
* 通过Token获取登录人用户名
*
* @param token
* @return
*/
@ -86,25 +112,26 @@ public class JimuReportTokenServiceImpl implements JmReportTokenServiceI {
/**
* Token校验
*
* @param token
* @return
*/
@Override
public Boolean verifyToken(String token) {
//System.out.println("---------verify-----Token---------------");
//return TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
return true;
String loginId = (String) StpUtil.getLoginIdByToken(token);
return StringUtils.isNoneBlank(loginId);
}
/**
* 自定义请求头
*
* @return
*/
@Override
public HttpHeaders customApiHeader() {
HttpHeaders header = new HttpHeaders();
header.add("custom-header1", "Please set a custom value 1");
header.add("token", "token value 2");
header.add("token", "1231231313213");
return header;
}
}

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/controller/AsnController.java
View File

@ -70,7 +70,7 @@ public class AsnController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/asn/batchDelete")
@SaCheckPermission("asn:batchDelete")
@SaCheckPermission("asn:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return asnService.batchDelete(idList);

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/controller/AsnDetailController.java
View File

@ -67,7 +67,7 @@ public class AsnDetailController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/asnDetail/batchDelete")
@SaCheckPermission("asnDetail:batchDelete")
@SaCheckPermission("asnDetail:delete")
@OperateLog
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return asnDetailService.batchDelete(idList);

24
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/requestSubmit/RequestSubmit.java 100644
View File

@ -0,0 +1,24 @@
package net.lab1024.sa.admin.module.business.wms.requestSubmit;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
public @interface RequestSubmit {
// 限制时间（秒）
int value() default 1;
// 用户标识类型（可选：IP/USER_ID）
IdentifierType identifierType() default IdentifierType.IP;
// 自定义业务key（用于区分不同接口）
String key() default "";
enum IdentifierType {
IP, // 根据IP限制
USER_ID // 根据用户ID限制
}
}

85
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/requestSubmit/RequestSubmitSubmitAspect.java 100644
View File

@ -0,0 +1,85 @@
package net.lab1024.sa.admin.module.business.wms.requestSubmit;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import java.util.concurrent.TimeUnit;
@Aspect
@Component
public class RequestSubmitSubmitAspect {
@Autowired
private StringRedisTemplate redisTemplate;
@Around("@annotation(repeatSubmit)")
public Object around(ProceedingJoinPoint joinPoint, RequestSubmit repeatSubmit) throws Throwable {
// 1. 生成Redis Key
String redisKey = buildRedisKey(joinPoint, repeatSubmit);
// 2. 检查是否已存在请求记录
if (Boolean.TRUE.equals(redisTemplate.hasKey(redisKey))) {
return ResponseDTO.userErrorParam("邮箱验证码已发送，一分钟内请勿重复发送");
}
// 3. 记录当前请求
redisTemplate.opsForValue().set(
redisKey,
"1",
repeatSubmit.value(),
TimeUnit.SECONDS
);
// 4. 执行业务方法
return joinPoint.proceed();
}
private String buildRedisKey(ProceedingJoinPoint joinPoint, RequestSubmit repeatSubmit) {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())
.getRequest();
StringBuilder key = new StringBuilder("request_submit:");
// 添加业务key
if (!repeatSubmit.key().isEmpty()) {
key.append(repeatSubmit.key()).append(":");
}
// 添加用户标识
switch (repeatSubmit.identifierType()) {
case IP:
key.append(getClientIp(request));
break;
case USER_ID:
// 实际项目中从Token或Session获取用户ID
Long userId = SmartRequestUtil.getRequestUserId();
if (userId == null) userId = 1L;
key.append(userId);
break;
default:
key.append("DEFAULT");
}
// 添加方法签名（防止不同接口冲突）
key.append(":").append(joinPoint.getSignature().toShortString());
return key.toString();
}
private String getClientIp(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
if (ip == null || ip.isEmpty() || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
return ip;
}
}

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/shipping/pick/controller/PickController.java
View File

@ -63,7 +63,7 @@ public class PickController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/pick/batchDelete")
@SaCheckPermission("pick:batchDelete")
@SaCheckPermission("pick:delete")
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return pickService.batchDelete(idList);
}

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/controller/TaskController.java
View File

@ -58,7 +58,7 @@ public class TaskController {
@Operation(summary = "批量删除 @author 霍锦")
@PostMapping("/task/batchDelete")
@SaCheckPermission("task:batchDelete")
@SaCheckPermission("task:delete")
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return taskService.batchDelete(idList);
}

5
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/employee/controller/EmployeeController.java
View File

@ -36,6 +36,7 @@ public class EmployeeController {
@PostMapping("/employee/query")
@Operation(summary = "员工管理查询 @author yaozz")
@SaCheckPermission("system:employee:query")
public ResponseDTO<PageResult<EmployeeVO>> query(@Valid @RequestBody EmployeeQueryForm query) {
return employeeService.queryEmployee(query);
}
@ -56,6 +57,7 @@ public class EmployeeController {
@Operation(summary = "更新员工个人中心信息 @author 善逸")
@PostMapping("/employee/update/center")
@SaCheckPermission("system:employee:update")
public ResponseDTO<String> updateCenter(@Valid @RequestBody EmployeeUpdateCenterForm updateCenterForm) {
updateCenterForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
return employeeService.updateCenter(updateCenterForm);
@ -63,6 +65,7 @@ public class EmployeeController {
@Operation(summary = "更新登录人头像 @author 善逸")
@PostMapping("/employee/update/avatar")
@SaCheckPermission("system:employee:update")
public ResponseDTO<String> updateAvatar(@Valid @RequestBody EmployeeUpdateAvatarForm employeeUpdateAvatarForm) {
employeeUpdateAvatarForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
return employeeService.updateAvatar(employeeUpdateAvatarForm);
@ -92,6 +95,7 @@ public class EmployeeController {
@Operation(summary = "修改密码 @author yaozz")
@PostMapping("/employee/update/password")
@ApiDecrypt
@SaCheckPermission("system:employee:password")
public ResponseDTO<String> updatePassword(@Valid @RequestBody EmployeeUpdatePasswordForm updatePasswordForm) {
updatePasswordForm.setEmployeeId(SmartRequestUtil.getRequestUserId());
return employeeService.updatePassword(SmartRequestUtil.getRequestUser(), updatePasswordForm);
@ -100,6 +104,7 @@ public class EmployeeController {
@Operation(summary = "获取密码复杂度 @author yaozz")
@GetMapping("/employee/getPasswordComplexityEnabled")
@ApiDecrypt
@SaCheckPermission("system:employee:password")
public ResponseDTO<Boolean> getPasswordComplexityEnabled() {
return ResponseDTO.ok(level3ProtectConfigService.isPasswordComplexityEnabled());
}

6
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java
View File

@ -8,6 +8,7 @@ import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.Valid;
import net.lab1024.sa.admin.constant.AdminSwaggerTagConst;
import net.lab1024.sa.admin.module.business.wms.requestSubmit.RequestSubmit;
import net.lab1024.sa.admin.module.system.login.domain.LoginForm;
import net.lab1024.sa.admin.module.system.login.domain.LoginResultVO;
import net.lab1024.sa.admin.module.system.login.service.LoginService;
@ -17,6 +18,7 @@ import net.lab1024.sa.base.common.constant.RequestHeaderConst;
import net.lab1024.sa.base.common.domain.ResponseDTO;
import net.lab1024.sa.base.common.util.SmartRequestUtil;
import net.lab1024.sa.base.module.support.captcha.domain.CaptchaVO;
import net.lab1024.sa.base.module.support.repeatsubmit.annoation.RepeatSubmit;
import net.lab1024.sa.base.module.support.securityprotect.service.Level3ProtectConfigService;
import org.springframework.web.bind.annotation.*;
@ -67,9 +69,11 @@ public class LoginController {
return loginService.getCaptcha();
}
@NoNeedLogin
@GetMapping("/login/sendEmailCode/{loginName}")
@Operation(summary = "获取邮箱登录验证码 @author yaozz")
@NoNeedLogin
@RequestSubmit(value = 60, key = "sendEmailCode")
public ResponseDTO<String> sendEmailCode(@PathVariable String loginName) {
return loginService.sendEmailCode(loginName);
}

1
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
View File

@ -231,6 +231,7 @@ public class LoginService implements StpInterface {
// 获取登录结果信息
String token = StpUtil.getTokenValue();
LoginResultVO loginResultVO = getLoginResult(requestEmployee, token);
//保存登录记录

1
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/menu/controller/MenuController.java
View File

@ -57,6 +57,7 @@ public class MenuController {
@Operation(summary = "查询菜单列表 @author yaozz")
@GetMapping("/menu/query")
@SaCheckPermission("system:menu:query")
public ResponseDTO<List<MenuVO>> queryMenuList() {
return ResponseDTO.ok(menuService.queryMenuList(null));
}

8
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/position/controller/PositionController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.admin.module.system.position.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@ -34,31 +35,36 @@ public class PositionController {
@Operation(summary = "分页查询 @author kaiyun")
@PostMapping("/position/queryPage")
@SaCheckPermission("system:position:query")
public ResponseDTO<PageResult<PositionVO>> queryPage(@RequestBody @Valid PositionQueryForm queryForm) {
return ResponseDTO.ok(positionService.queryPage(queryForm));
}
@Operation(summary = "添加 @author kaiyun")
@PostMapping("/position/add")
@SaCheckPermission("system:position:add")
public ResponseDTO<String> add(@RequestBody @Valid PositionAddForm addForm) {
return positionService.add(addForm);
}
@Operation(summary = "更新 @author kaiyun")
@PostMapping("/position/update")
@SaCheckPermission("system:position:update")
public ResponseDTO<String> update(@RequestBody @Valid PositionUpdateForm updateForm) {
return positionService.update(updateForm);
}
@Operation(summary = "批量删除 @author kaiyun")
@PostMapping("/position/batchDelete")
@SaCheckPermission("system:position:batchDelete")
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return positionService.batchDelete(idList);
}
@Operation(summary = "单个删除 @author kaiyun")
@GetMapping("/position/delete/{positionId}")
public ResponseDTO<String> batchDelete(@PathVariable Long positionId) {
@SaCheckPermission("system:position:delete")
public ResponseDTO<String> delete(@PathVariable Long positionId) {
return positionService.delete(positionId);
}

5
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminApiEncryptController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@ -37,6 +38,7 @@ public class AdminApiEncryptController extends SupportBaseController {
@ApiDecrypt
@PostMapping("/apiEncrypt/testRequestEncrypt")
@Operation(summary = "测试 请求加密")
@SaCheckPermission("support:apiEncrypt:testRequestEncrypt")
public ResponseDTO<JweForm> testRequestEncrypt(@RequestBody @Valid JweForm form) {
return ResponseDTO.ok(form);
}
@ -44,6 +46,7 @@ public class AdminApiEncryptController extends SupportBaseController {
@ApiEncrypt
@PostMapping("/apiEncrypt/testResponseEncrypt")
@Operation(summary = "测试 返回加密")
@SaCheckPermission("support:apiEncrypt:testResponseEncrypt")
public ResponseDTO<JweForm> testResponseEncrypt(@RequestBody @Valid JweForm form) {
return ResponseDTO.ok(form);
}
@ -52,6 +55,7 @@ public class AdminApiEncryptController extends SupportBaseController {
@ApiEncrypt
@PostMapping("/apiEncrypt/testDecryptAndEncrypt")
@Operation(summary = "测试 请求参数加密和解密、返回数据加密和解密")
@SaCheckPermission("support:apiEncrypt:testDecryptAndEncrypt")
public ResponseDTO<JweForm> testDecryptAndEncrypt(@RequestBody @Valid JweForm form) {
return ResponseDTO.ok(form);
}
@ -60,6 +64,7 @@ public class AdminApiEncryptController extends SupportBaseController {
@ApiEncrypt
@PostMapping("/apiEncrypt/testArray")
@Operation(summary = "测试 数组加密和解密")
@SaCheckPermission("support:apiEncrypt:testArray")
public ResponseDTO<List<JweForm>> testArray(@RequestBody @Valid ValidateList<JweForm> list) {
return ResponseDTO.ok(list);
}

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminDataMaskingDemoController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.RandomUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -29,6 +30,7 @@ public class AdminDataMaskingDemoController extends SupportBaseController {
@Operation(summary = "数据脱敏demo @author YouChain-yaozz")
@GetMapping("/dataMasking/demo/query")
@SaCheckPermission("support:dataMasking:query")
public ResponseDTO<List<DataVO>> query() {
List<DataVO> list = new ArrayList<>();

2
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminHeartBeatController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@ -31,6 +32,7 @@ public class AdminHeartBeatController extends SupportBaseController {
@PostMapping("/heartBeat/query")
@Operation(summary = "查询心跳记录 @author yaozz")
@SaCheckPermission("support:heartBeat:query")
public ResponseDTO<PageResult<HeartBeatRecordVO>> query(@RequestBody @Valid HeartBeatRecordQueryForm pageParam) {
return heartBeatService.pageQuery(pageParam);
}

5
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminProtectController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@ -45,6 +46,7 @@ public class AdminProtectController extends SupportBaseController {
@Operation(summary = "分页查询 @author YouChain-yaozz")
@PostMapping("/protect/loginFail/queryPage")
@SaCheckPermission("support:loginFail:queryPage")
public ResponseDTO<PageResult<LoginFailVO>> queryPage(@RequestBody @Valid LoginFailQueryForm queryForm) {
return ResponseDTO.ok(securityLoginService.queryPage(queryForm));
}
@ -52,18 +54,21 @@ public class AdminProtectController extends SupportBaseController {
@Operation(summary = "批量删除 @author YouChain-yaozz")
@PostMapping("/protect/loginFail/batchDelete")
@SaCheckPermission("support:loginFail:batchDelete")
public ResponseDTO<String> batchDelete(@RequestBody ValidateList<Long> idList) {
return securityLoginService.batchDelete(idList);
}
@Operation(summary = "更新三级等保配置 @author YouChain-yaozz")
@PostMapping("/protect/level3protect/updateConfig")
@SaCheckPermission("support:level3protect:updateConfig")
public ResponseDTO<String> updateConfig(@RequestBody @Valid Level3ProtectConfigForm configForm) {
return level3ProtectConfigService.updateLevel3Config(configForm);
}
@Operation(summary = "查询 三级等保配置 @author YouChain-yaozz")
@GetMapping("/protect/level3protect/getConfig")
@SaCheckPermission("support:level3protect:getConfig")
public ResponseDTO<String> getConfig() {
return ResponseDTO.ok(configService.getConfigValue(ConfigKeyEnum.LEVEL3_PROTECT_CONFIG));
}

1
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminReloadController.java
View File

@ -32,6 +32,7 @@ public class AdminReloadController extends SupportBaseController {
@Operation(summary = "查询reload列表 @author 开云")
@GetMapping("/reload/query")
@SaCheckPermission("support:reload:query")
public ResponseDTO<List<ReloadItemVO>> query() {
return reloadService.query();
}

1
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSerialNumberController.java
View File

@ -58,6 +58,7 @@ public class AdminSerialNumberController extends SupportBaseController {
@Operation(summary = "获取所有单号定义 @author yaozz")
@GetMapping("/serialNumber/all")
@SaCheckPermission("support:serialNumber:all")
public ResponseDTO<List<SerialNumberEntity>> getAll() {
return ResponseDTO.ok(serialNumberDao.selectList(null));
}

13
nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/support/AdminSmartJobController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.admin.module.system.support;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@ -33,7 +34,7 @@ public class AdminSmartJobController extends SupportBaseController {
@Operation(summary = "定时任务-立即执行 @yaozz")
@PostMapping("/job/execute")
@RepeatSubmit
@SaCheckPermission("support:job:execute")
public ResponseDTO<String> execute(@RequestBody @Valid SmartJobExecuteForm executeForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser();
executeForm.setUpdateName(requestUser.getUserName());
@ -48,13 +49,14 @@ public class AdminSmartJobController extends SupportBaseController {
@Operation(summary = "定时任务-分页查询 @yaozz")
@PostMapping("/job/query")
@SaCheckPermission("support:job:query")
public ResponseDTO<PageResult<SmartJobVO>> queryJob(@RequestBody @Valid SmartJobQueryForm queryForm) {
return jobService.queryJob(queryForm);
}
@Operation(summary = "定时任务-添加任务 @huojin")
@PostMapping("/job/add")
@RepeatSubmit
@SaCheckPermission("support:job:add")
public ResponseDTO<String> addJob(@RequestBody @Valid SmartJobAddForm addForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser();
addForm.setUpdateName(requestUser.getUserName());
@ -63,7 +65,7 @@ public class AdminSmartJobController extends SupportBaseController {
@Operation(summary = "定时任务-更新-任务信息 @huojin")
@PostMapping("/job/update")
@RepeatSubmit
@SaCheckPermission("support:job:update")
public ResponseDTO<String> updateJob(@RequestBody @Valid SmartJobUpdateForm updateForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser();
updateForm.setUpdateName(requestUser.getUserName());
@ -72,7 +74,7 @@ public class AdminSmartJobController extends SupportBaseController {
@Operation(summary = "定时任务-更新-开启状态 @yaozz")
@PostMapping("/job/update/enabled")
@RepeatSubmit
@SaCheckPermission("support:job:update")
public ResponseDTO<String> updateJobEnabled(@RequestBody @Valid SmartJobEnabledUpdateForm updateForm) {
RequestUser requestUser = SmartRequestUtil.getRequestUser();
updateForm.setUpdateName(requestUser.getUserName());
@ -81,13 +83,14 @@ public class AdminSmartJobController extends SupportBaseController {
@Operation(summary = "定时任务-删除 @huojin")
@GetMapping("/job/delete")
@RepeatSubmit
@SaCheckPermission("support:job:delete")
public ResponseDTO<String> deleteJob(@RequestParam Integer jobId) {
return jobService.deleteJob(jobId, SmartRequestUtil.getRequestUser());
}
@Operation(summary = "定时任务-执行记录-分页查询 @huojin")
@PostMapping("/job/log/query")
@SaCheckPermission("support:job:log:query")
public ResponseDTO<PageResult<SmartJobLogVO>> queryJobLog(@RequestBody @Valid SmartJobLogQueryForm queryForm) {
return jobService.queryJobLog(queryForm);
}

7
nc_wms_java/sa-admin/src/main/resources/dev/application.yaml
View File

@ -8,16 +8,15 @@
# 项目配置: 名称、日志目录
project:
name: sa-admin
log-directory: /home/logs/nc_wms/${project.name}/${spring.profiles.active}
log-directory: /home/wms/java/${project.name}/${spring.profiles.active}
# 项目端口和url根路径
server:
port: 8000
ssl:
key-store: classpath:javaboy.p12
key-store: file:/ssl/server.jks
key-store-type: PKCS12
key-store-password: 123456
key-alias: tomcathttps
key-store-password: 56uvgemn
enabled: true
servlet:
context-path: /

2
nc_wms_java/sa-admin/src/main/resources/dev/log4j2-spring.xml
View File

@ -106,7 +106,7 @@
<AppenderRef ref="druidSlowSqlLog"/>
</logger>
<Root level="debug">
<Root level="info">
<AppenderRef ref="Console"/>
<AppenderRef ref="debug"/>
<AppenderRef ref="info"/>

2
nc_wms_java/sa-admin/src/main/resources/dev/spy.properties
View File

@ -15,4 +15,4 @@ dateformat=yyyy-MM-dd HH:mm:ss
# 开启慢sql
outagedetection=true
# 慢SQL记录标准（单位秒）
outagedetectioninterval=2
outagedetectioninterval=5

BIN
nc_wms_java/sa-admin/src/main/resources/javaboy.p12
View File

Binary file not shown.

6
nc_wms_java/sa-admin/src/main/resources/prod/application.yaml
View File

@ -8,17 +8,17 @@
# 项目配置: 名称、日志目录
project:
name: sa-admin
log-directory: /home/logs/nc_wms/${project.name}/${spring.profiles.active}
log-directory: /home/logs/wms/${project.name}/${spring.profiles.active}
# 项目端口和url根路径
server:
port: 8000
ssl:
#key-store: classpath:server.jks
#key-store: classpath:server.jks 56uvgemn
#key-store: file:C:\Users\hj\Downloads\server.jks
key-store: file:/home/wms/server.jks
key-store-type: PKCS12
key-store-password: 56uvgemn
key-store-password: p263buoe
enabled: true
servlet:
context-path: /

2
nc_wms_java/sa-admin/src/main/resources/prod/log4j2-spring.xml
View File

@ -106,7 +106,7 @@
<AppenderRef ref="druidSlowSqlLog"/>
</logger>
<Root level="info">
<Root level="error">
<AppenderRef ref="Console"/>
<AppenderRef ref="debug"/>
<AppenderRef ref="info"/>

BIN
nc_wms_java/sa-admin/src/main/resources/server.jks
View File

Binary file not shown.

6
nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/controller/CodeGeneratorController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.base.module.support.codegenerator.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
@ -49,6 +50,7 @@ public class CodeGeneratorController extends SupportBaseController {
@Operation(summary = "查询数据库的表 @author yaozz")
@PostMapping("/codeGenerator/table/queryTableList")
@ResponseBody
@SaCheckPermission("support:codeGenerator:queryTableList")
public ResponseDTO<PageResult<TableVO>> queryTableList(@RequestBody @Valid TableQueryForm tableQueryForm) {
return ResponseDTO.ok(codeGeneratorService.queryTableList(tableQueryForm));
}
@ -58,6 +60,7 @@ public class CodeGeneratorController extends SupportBaseController {
@Operation(summary = "获取表的配置信息 @author yaozz")
@GetMapping("/codeGenerator/table/getConfig/{table}")
@ResponseBody
@SaCheckPermission("support:codeGenerator:getConfig")
public ResponseDTO<TableConfigVO> getTableConfig(@PathVariable String table) {
return ResponseDTO.ok(codeGeneratorService.getTableConfig(table));
}
@ -65,6 +68,7 @@ public class CodeGeneratorController extends SupportBaseController {
@Operation(summary = "更新配置信息 @author yaozz")
@PostMapping("/codeGenerator/table/updateConfig")
@ResponseBody
@SaCheckPermission("support:codeGenerator:updateConfig")
public ResponseDTO<String> updateConfig(@RequestBody @Valid CodeGeneratorConfigForm form) {
return codeGeneratorService.updateConfig(form);
}
@ -74,12 +78,14 @@ public class CodeGeneratorController extends SupportBaseController {
@Operation(summary = "代码预览 @author yaozz")
@PostMapping("/codeGenerator/code/preview")
@ResponseBody
@SaCheckPermission("support:codeGenerator:preview")
public ResponseDTO<String> preview(@RequestBody @Valid CodeGeneratorPreviewForm form) {
return codeGeneratorService.preview(form);
}
@Operation(summary = "代码下载 @author yaozz")
@GetMapping(value = "/codeGenerator/code/download/{tableName}", produces = "application/octet-stream")
@SaCheckPermission("support:codeGenerator:download")
public void download(@PathVariable String tableName, HttpServletResponse response) throws IOException {
ResponseDTO<byte[]> download = codeGeneratorService.download(tableName);

4
nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/file/controller/FileController.java
View File

@ -1,5 +1,6 @@
package net.lab1024.sa.base.module.support.file.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.extra.servlet.JakartaServletUtil;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -40,6 +41,7 @@ public class FileController extends SupportBaseController {
@Operation(summary = "文件上传 @author 胡克")
@PostMapping("/file/upload")
@SaCheckPermission("support:file:upload")
public ResponseDTO<FileUploadVO> upload(@RequestParam MultipartFile file, @RequestParam Integer folder) {
RequestUser requestUser = SmartRequestUtil.getRequestUser();
return fileService.fileUpload(file, folder, requestUser);
@ -47,12 +49,14 @@ public class FileController extends SupportBaseController {
@Operation(summary = "获取文件URL：根据fileKey @author 胡克")
@GetMapping("/file/getFileUrl")
@SaCheckPermission("support:file:getFileUrl")
public ResponseDTO<String> getUrl(@RequestParam String fileKey) {
return fileService.getFileUrl(fileKey);
}
@Operation(summary = "下载文件流（根据fileKey） @author 胡克")
@GetMapping("/file/downLoad")
@SaCheckPermission("support:file:download")
public void downLoad(@RequestParam String fileKey, HttpServletRequest request, HttpServletResponse response) throws IOException {
String userAgent = JakartaServletUtil.getHeaderIgnoreCase(request, RequestHeaderConst.USER_AGENT);
ResponseDTO<FileDownloadVO> downloadFileResult = fileService.getDownloadFile(fileKey, userAgent);

16
nc_wms_java/sa-base/src/main/resources/dev/sa-base.yaml
View File

@ -23,12 +23,10 @@ spring:
# redis 连接池配置信息
data:
redis:
sentinel:
master: mymaster
nodes: 47.117.45.79:26379,8.133.200.233:26379,123.60.65.29:26379
password: 123456 # Sentinel 密码
password: 123456 # Redis 主从节点密码
database: 1
host: 127.0.0.1
port: 6379
password:
timeout: 10000ms
lettuce:
pool:
@ -84,8 +82,8 @@ file:
storage:
mode: local
local:
upload-path: /home/ncwms/upload/ #文件上传目录
url-prefix:
upload-path: /home/wms/java/upload/ #文件上传目录
url-prefix: https://youchain5688.xyz:8000/upload/
cloud:
region: oss-cn-hangzhou
endpoint: oss-cn-hangzhou.aliyuncs.com
@ -156,7 +154,9 @@ sa-token:
# 启动时的字符画打印
is-print: false
# 是否从cookie读取token
is-read-cookie: false
is-read-cookie: true
# 是否从Header读取token
is-read-header: true
# SmartJob 定时任务配置(不需要可以直接删除以下配置，详细文档请看：https://www.xxxxxx.com)
smart:

12
nc_wms_java/sa-base/src/main/resources/prod/sa-base.yaml
View File

@ -1,9 +1,9 @@
spring:
# 数据库连接信息
datasource:
url: jdbc:p6spy:mysql://47.103.100.52:53306/nc_wms?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useCursorFetch=true
username: root
password: Youchain@56
url: jdbc:p6spy:mysql://10.1.114.14:3306/wmsqas?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai&useCursorFetch=true
username: ncwmsdbadm
password: WmsDB@25#DQxi
driver-class-name: com.p6spy.engine.spy.P6SpyDriver
initial-size: 10
min-idle: 10
@ -25,7 +25,7 @@ spring:
redis:
sentinel:
master: mymaster
nodes: 47.117.45.79:26379,8.133.200.233:26379,123.60.65.29:26379
nodes: 10.1.119.78:26379,10.1.119.79:26379,10.1.119.80:26379
password: 123456 # Sentinel 密码
password: 123456 # Redis 主从节点密码
database: 1
@ -84,8 +84,8 @@ file:
storage:
mode: local
local:
upload-path: /home/nc_wms/upload/ #文件上传目录
url-prefix: http://123.60.65.29:8000/upload/
upload-path: /home/wms/upload/ #文件上传目录
url-prefix: https://ncwmshaqas.amecnsh.com:8000/upload/
cloud:
region: oss-cn-hangzhou
endpoint: oss-cn-hangzhou.aliyuncs.com