diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java index daab3382..930d73bf 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java @@ -33,6 +33,7 @@ import org.springframework.stereotype.Service; import java.io.File; import java.io.OutputStream; import java.io.StringWriter; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java index 68ba1b6a..81619de5 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/front/ListVariableService.java @@ -13,14 +13,13 @@ import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeTableFi import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService; import java.util.*; -import java.util.stream.Collectors; /** * @Author 1024创新实验室-主任:卓大 * @Date 2022/9/29 17:20:41 * @Wechat zhuoda1024 * @Email lab1024@163.com - * @Copyright 1024创新实验室 + * @Copyright 1024创新实验室 */ public class ListVariableService extends CodeGenerateBaseVariableService { @@ -66,7 +65,7 @@ public class ListVariableService extends CodeGenerateBaseVariableService { // 表格列表 List> listVariable = new ArrayList<>(); // 过滤掉不显示的字段 - List tableFields = form.getTableFields().stream().filter(CodeTableField::getShowFlag).collect(Collectors.toList()); + List tableFields = form.getTableFields().stream().filter(CodeTableField::getShowFlag).toList(); for (CodeTableField tableField : tableFields) { Map objectMap = BeanUtil.beanToMap(tableField); diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm index 00e21281..e336227b 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/code-generator-template/js/list.vue.vm @@ -22,12 +22,12 @@ #end #if($field.queryTypeEnum == "Dict") - + #end #if($field.queryTypeEnum == "Enum") - + #end #if($field.queryTypeEnum == "Date") diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml index 167a81ad..f9cab77f 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml @@ -31,4 +31,4 @@ AND INSTR(`tables`.table_name,#{queryForm.tableNameKeywords}) - \ No newline at end of file + diff --git a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml index 85f54951..9acd6717 100644 --- a/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml +++ b/smart-admin-api-java17-springboot3/sa-base/src/main/resources/prod/sa-base.yaml @@ -39,7 +39,7 @@ spring: host: smtp.163.com port: 465 username: lab1024@163.com - password: LAB1024LAB + password: 1024lab properties: mail: smtp: diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml index 167a81ad..f9cab77f 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/mapper/support/CodeGeneratorMapper.xml @@ -31,4 +31,4 @@ AND INSTR(`tables`.table_name,#{queryForm.tableNameKeywords}) - \ No newline at end of file + diff --git a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml index fafbe5e0..841f40b9 100644 --- a/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml +++ b/smart-admin-api-java8-springboot2/sa-base/src/main/resources/prod/sa-base.yaml @@ -79,7 +79,7 @@ server: # 文件上传 配置 file: storage: - mode: local + mode: cloud local: upload-path: /home/smart_admin_v3/upload/ #文件上传目录 url-prefix: @@ -87,8 +87,8 @@ file: region: oss-cn-hangzhou endpoint: oss-cn-hangzhou.aliyuncs.com bucket-name: 1024lab-smart-admin - access-key: - secret-key: + access-key: LTAI5tDnZ1wHwFHWMUNWznK2 + secret-key: 6tVJ9K2mbrDrcbBLIBRBzho13FZ52t url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/ private-url-expire-seconds: 3600 diff --git a/smart-admin-web-javascript/src/assets/images/login/login.gif b/smart-admin-web-javascript/src/assets/images/login/login.gif new file mode 100644 index 00000000..15cb607f Binary files /dev/null and b/smart-admin-web-javascript/src/assets/images/login/login.gif differ diff --git a/smart-admin-web-javascript/src/views/system/login3/login.less b/smart-admin-web-javascript/src/views/system/login3/login.less index d0d8665d..580bbba3 100644 --- a/smart-admin-web-javascript/src/views/system/login3/login.less +++ b/smart-admin-web-javascript/src/views/system/login3/login.less @@ -7,7 +7,7 @@ align-items: center; justify-content: center; .box-item { - width: 444px; + width: 460px; height: 600px; &.desc { background: #ffffff; diff --git a/smart-admin-web-javascript/src/views/system/login3/login.vue b/smart-admin-web-javascript/src/views/system/login3/login.vue index 28dd5ee1..86ee2ac5 100644 --- a/smart-admin-web-javascript/src/views/system/login3/login.vue +++ b/smart-admin-web-javascript/src/views/system/login3/login.vue @@ -13,9 +13,9 @@

欢迎登录 SmartAdmin V3

-

「高质量代码、简洁、安全」的开发平台

+

「高质量代码、简洁、高效、安全」的开发平台

- +
- +
@@ -246,7 +246,7 @@ resizable: true, filterOptions: { type: 'dict-select', - dictCode: DICT_CODE_ENUM.GOODS_PLACE, + dictCode: DICT_CODE_ENUM.GOODS_PLACE || 'GOODS_PLACE', }, width: 150, }, diff --git a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue index 2d842036..48289e5c 100644 --- a/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue +++ b/smart-admin-web-typescript/src/views/support/code-generator/code-generator-list.vue @@ -39,7 +39,16 @@ - +