xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-11-09 20:23:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
kkaiyun
2023-05-10 20:09:42 +08:00
parent 05e91f7786 c7501c7f36
commit 3693856a05
14 changed files with 143 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
smart-admin-api/sa-common/src/main/java/net/lab1024/sa/common/module/support/operatelog/core/OperateLogAspect.java
View File

@@ -1,13 +1,11 @@
package net.lab1024.sa.common.module.support.operatelog.core;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.servlet.ServletUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.common.common.constant.RequestHeaderConst;
import net.lab1024.sa.common.common.domain.RequestUser;
import net.lab1024.sa.common.common.util.SmartRequestUtil;
import net.lab1024.sa.common.module.support.operatelog.OperateLogDao;

4
smart-admin-api/sa-common/src/main/resources/code-generator-template/js/list.vue.vm
View File

@@ -44,13 +44,13 @@
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="queryData">
<template #icon>
<ReloadOutlined />
<SearchOutlined />
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<template #icon>
<SearchOutlined />
<ReloadOutlined />
</template>
重置
</a-button>

10
smart-admin-api/sa-common/src/main/resources/dev/sa-common.yaml
View File

@@ -3,7 +3,7 @@ spring:
datasource:
url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v2?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: root
password: Xxxx1024
password: Zhuoda1024lab
initial-size: 2
min-idle: 2
max-active: 10
@@ -61,14 +61,6 @@ spring:
cache:
type: caffeine
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
accesslog:
enabled: true
pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
#swagger: 提高swagger 方法名称有重复的日志提示
logging:
level:

10
smart-admin-api/sa-common/src/main/resources/pre/sa-common.yaml
View File

@@ -1,7 +1,7 @@
spring:
# 数据库连接信息
datasource:
url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v2_pre?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
url: jdbc:mysql://127.0.0.1:3306/smart_admin_v2_pre?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: root
password: Zhuoda123456
initial-size: 5
@@ -61,14 +61,6 @@ spring:
cache:
type: caffeine
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
accesslog:
enabled: true
pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
#swagger: 提高swagger 方法名称有重复的日志提示
logging:
level:

8
smart-admin-api/sa-common/src/main/resources/prod/sa-common.yaml
View File

@@ -61,14 +61,6 @@ spring:
cache:
type: caffeine
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
accesslog:
enabled: true
pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
#swagger: 提高swagger 方法名称有重复的日志提示
logging:
level:

7
smart-admin-api/sa-common/src/main/resources/test/sa-common.yaml
View File

@@ -61,13 +61,6 @@ spring:
cache:
type: caffeine
# tomcat 配置，主要用于 配置 访问日志（便于将来排查错误）
server:
tomcat:
basedir: ${localPath:/home}/logs/smart_admin_v2/tomcat-logs
accesslog:
enabled: true
pattern: '%t %{X-Forwarded-For}i %a "%r" %s %D (%D ms)'
#swagger: 提高swagger 方法名称有重复的日志提示
logging: