diff --git a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
index f2dfc46a..c2cf7346 100644
--- a/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
+++ b/smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/service/LoginService.java
@@ -159,8 +159,8 @@ public class LoginService implements StpInterface {
// 对于万能密码:受限制sa token 要求loginId唯一,万能密码只能插入一段uuid
String saTokenLoginId = SUPER_PASSWORD_LOGIN_ID_PREFIX + StringConst.COLON + UUID.randomUUID().toString().replace("-", "") + StringConst.COLON + employeeEntity.getEmployeeId();
- // 万能密码登录只能登录15分钟
- StpUtil.login(saTokenLoginId, 900);
+ // 万能密码登录只能登录30分钟
+ StpUtil.login(saTokenLoginId, 1800);
} else {
diff --git a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
index 101f2019..4618fcf7 100644
--- a/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
+++ b/smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/operatelog/core/OperateLogAspect.java
@@ -27,6 +27,7 @@ import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
+import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.ModelAndView;
import javax.annotation.Resource;
@@ -238,6 +239,7 @@ public abstract class OperateLogAspect {
if (arg instanceof HttpServletRequest
|| arg instanceof HttpServletResponse
|| arg instanceof ModelAndView
+ || arg instanceof MultipartFile
|| arg instanceof BindResult) {
continue;
}
diff --git a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
index b8e542ed..1de462cd 100644
--- a/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
+++ b/smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
@@ -6,7 +6,7 @@
* @Copyright ${basic.copyright}
-->
-
-
+ >
+
#if($insertAndUpdate.countPerLine == 1)
-
- #foreach ($field in $formFields)
- #if($field.frontComponent == "Input")
+
+ #foreach ($field in $formFields)
+ #if($field.frontComponent == "Input")
-
+
- #end
- #if($field.frontComponent == "InputNumber")
+ #end
+ #if($field.frontComponent == "InputNumber")
-
+
- #end
- #if($field.frontComponent == "Textarea")
+ #end
+ #if($field.frontComponent == "Textarea")
-
+
- #end
- #if($field.frontComponent == "BooleanSelect")
+ #end
+ #if($field.frontComponent == "BooleanSelect")
-
+
- #end
- #if($field.frontComponent == "SmartEnumSelect")
+ #end
+ #if($field.frontComponent == "SmartEnumSelect")
-
+
- #end
- #if($field.frontComponent == "DictSelect")
+ #end
+ #if($field.frontComponent == "DictSelect")
-
+
- #end
- #if($field.frontComponent == "Date")
+ #end
+ #if($field.frontComponent == "Date")
-
+
- #end
- #if($field.frontComponent == "DateTime")
+ #end
+ #if($field.frontComponent == "DateTime")
-
+
- #end
- #if($field.frontComponent == "Upload")
+ #end
+ #if($field.frontComponent == "Upload")
- form.$!{field.fieldName} = e"
- />
+ form.$!{field.fieldName} = e"
+ />
- #end
- #end
-
+ #end
+ #end
+
#end
#if($insertAndUpdate.countPerLine > 1)
-
- #set($span=24 / $!insertAndUpdate.countPerLine )
- #foreach ($field in $formFields)
-
- #if($field.frontComponent == "Input")
-
-
-
- #end
- #if($field.frontComponent == "InputNumber")
-
-
-
- #end
- #if($field.frontComponent == "Textarea")
-
-
-
- #end
- #if($field.frontComponent == "BooleanSelect")
-
-
-
- #end
- #if($field.frontComponent == "SmartEnumSelect")
-
-
-
- #end
- #if($field.frontComponent == "DictSelect")
-
-
-
- #end
- #if($field.frontComponent == "Date")
-
-
-
- #end
- #if($field.frontComponent == "DateTime")
-
-
-
- #end
- #if($field.frontComponent == "Upload")
-
- form.$!{field.fieldName} = e"
- />
-
- #end
-
- #end
-
+
+ #set($span=24 / $!insertAndUpdate.countPerLine )
+ #foreach ($field in $formFields)
+
+ #if($field.frontComponent == "Input")
+
+
+
+ #end
+ #if($field.frontComponent == "InputNumber")
+
+
+
+ #end
+ #if($field.frontComponent == "Textarea")
+
+
+
+ #end
+ #if($field.frontComponent == "BooleanSelect")
+
+
+
+ #end
+ #if($field.frontComponent == "SmartEnumSelect")
+
+
+
+ #end
+ #if($field.frontComponent == "DictSelect")
+
+
+
+ #end
+ #if($field.frontComponent == "Date")
+
+
+
+ #end
+ #if($field.frontComponent == "DateTime")
+
+
+
+ #end
+ #if($field.frontComponent == "Upload")
+
+ form.$!{field.fieldName} = e"
+ />
+
+ #end
+
+ #end
+
#end
-
+
-
-
- 取消
- 保存
-
-
-
+
+
+ 取消
+ 保存
+
+
+
diff --git a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
index 4ae563f4..0122533b 100644
--- a/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
+++ b/smart-admin-api/sa-base/src/main/resources/prod/sa-base.yaml
@@ -3,7 +3,7 @@ spring:
datasource:
url: jdbc:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: root
- password: Zhuoda#1024lab
+ password: Zhuoda1024lab
initial-size: 10
min-idle: 10
max-active: 100
diff --git a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml b/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
index f1c8d04a..27de1c00 100644
--- a/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
+++ b/smart-admin-api/sa-base/src/main/resources/test/sa-base.yaml
@@ -3,7 +3,7 @@ spring:
datasource:
url: jdbc:p6spy:mysql://127.0.0.1:3306/smart_admin_v3?autoReconnect=true&useServerPreparedStmts=false&rewriteBatchedStatements=true&characterEncoding=UTF-8&useSSL=false&allowMultiQueries=true&serverTimezone=Asia/Shanghai
username: root
- password: Java@1024
+ password: Zhuoda1024lab
initial-size: 2
min-idle: 2
max-active: 10
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
index 8e68a8a1..004aadcb 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/components/support/dict-select/index.vue
@@ -1,11 +1,11 @@
@@ -108,7 +108,7 @@
emit('update:value', valueList);
emit('change', valueList);
} else {
- let findValue = dictValueList.value.find((e) => e.valueCode == value);
+ let findValue = dictValueList.value.find((e) => e.valueCode === value);
emit('update:value', findValue.valueCode);
emit('change', findValue.valueCode);
}
diff --git a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
index 2130e1bf..e34147c1 100644
--- a/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
+++ b/smart-admin-web/javascript-ant-design-vue3/src/layout/components/page-tag/index.vue
@@ -1,11 +1,11 @@
@@ -130,6 +130,7 @@
const { useToken } = theme;
const { token } = useToken();
+ const borderRadius = token.value.borderRadius + 'px';