【smart-app】 更新beta版本

Author: zhuoda

.gitignore

@@ -8,10 +8,11 @@
 ### **技术体系**
 
 - 前端：Vue3 + Vite5 + Vue-Router + Pinia + Ant Design Vue 4.X
-- 移动端：uniapp + uview2.x
+- 移动端：uniapp (vue3版本) + uni-ui + （同时支持APP、小程序、H5）
 - 后端：SpringBoot + Sa Token + Mybatis-plus + 多种数据库
-- 在线预览：[https://preview.smartadmin.vip](https://preview.smartadmin.vip)  
+- 电脑在线预览：[https://preview.smartadmin.vip](https://preview.smartadmin.vip)
 - 官方文档：[https://smartadmin.vip](https://smartadmin.vip)  
+- 移动端在线预览：[https://app.smartadmin.vip](https://app.smartadmin.vip/#/pages/login/login)
 ### **理念与思想**
 
 - 我们分享的不是徒劳无功的各种功能，而是必须有的功能，如：网络安全、数据变动记录、系统说明文档、版本更新记录、意见反馈、日志、心跳、单号生成器等等。

README.md

@@ -44,11 +44,9 @@ public class NoticeVO {
     private LocalDateTime publishTime;
 
     @Schema(description = "作者")
-    @NotBlank(message = "作者不能为空")
     private String author;
 
     @Schema(description = "来源")
-    @NotBlank(message = "标题不能为空")
     private String source;
 
     @Schema(description = "文号")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/oa/notice/domain/vo/NoticeVO.java

@@ -1,5 +1,6 @@
 package net.lab1024.sa.admin.module.system.login.controller;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.extra.servlet.ServletUtil;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
@@ -47,7 +48,10 @@ public ResponseDTO<LoginResultVO> login(@Valid @RequestBody LoginForm loginForm,
     @GetMapping("/login/getLoginInfo")
     @Operation(summary = "获取登录结果信息  @author 卓大")
     public ResponseDTO<LoginResultVO> getLoginInfo() {
-        return ResponseDTO.ok(loginService.getLoginResult(AdminRequestUtil.getRequestUser()));
+        LoginResultVO loginResult = loginService.getLoginResult(AdminRequestUtil.getRequestUser());
+        String tokenValue = StpUtil.getTokenValue();
+        loginResult.setToken(tokenValue);
+        return ResponseDTO.ok(loginResult);
     }
 
     @Operation(summary = "退出登陆  @author 卓大")

smart-admin-api/sa-admin/src/main/java/net/lab1024/sa/admin/module/system/login/controller/LoginController.java

@@ -124,7 +124,7 @@
             <if test="query.keywords != null and query.keywords !=''">
                 AND ( INSTR(t_notice.title,#{query.keywords})
                 OR INSTR(t_notice.author,#{query.keywords})
-                OR INSTR(t_notice.documentNumber,#{query.keywords})
+                OR INSTR(t_notice.document_number,#{query.keywords})
                 OR INSTR(t_notice.source,#{query.keywords})
                 )
             </if>

smart-admin-api/sa-admin/src/main/resources/mapper/business/oa/notice/NoticeDao.xml

@@ -25,12 +25,12 @@ public class PageParam {
 
     @Schema(description = "页码(不能为空)", example = "1")
     @NotNull(message = "分页参数不能为空")
-    private Integer pageNum;
+    private Long pageNum;
 
     @Schema(description = "每页数量(不能为空)", example = "10")
     @NotNull(message = "每页数量不能为空")
-    @Max(value = 200, message = "每页最大为200")
-    private Integer pageSize;
+    @Max(value = 500, message = "每页最大为500")
+    private Long pageSize;
 
     @Schema(description = "是否查询总条数")
     protected Boolean searchCount;

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/common/domain/PageParam.java

@@ -9,9 +9,7 @@
 import net.lab1024.sa.base.module.support.changelog.domain.form.ChangeLogQueryForm;
 import net.lab1024.sa.base.module.support.changelog.domain.vo.ChangeLogVO;
 import net.lab1024.sa.base.module.support.changelog.service.ChangeLogService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -36,4 +34,11 @@ public class ChangeLogController extends SupportBaseController {
     public ResponseDTO<PageResult<ChangeLogVO>> queryPage(@RequestBody @Valid ChangeLogQueryForm queryForm) {
         return ResponseDTO.ok(changeLogService.queryPage(queryForm));
     }
+
+
+    @Operation(summary = "变更内容详情 @author 卓大")
+    @GetMapping("/changeLog/getDetail/{changeLogId}")
+    public ResponseDTO<ChangeLogVO> getDetail(@PathVariable Long changeLogId) {
+        return ResponseDTO.ok(changeLogService.getById(changeLogId));
+    }
 }

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/controller/ChangeLogController.java

@@ -33,7 +33,6 @@ public class ChangeLogService {
 
     /**
      * 分页查询
-     *
      */
     public PageResult<ChangeLogVO> queryPage(ChangeLogQueryForm queryForm) {
         Page<?> page = SmartPageUtil.convert2PageQuery(queryForm);
@@ -57,7 +56,6 @@ public synchronized ResponseDTO<String> add(ChangeLogAddForm addForm) {
 
     /**
      * 更新
-     *
      */
     public synchronized ResponseDTO<String> update(ChangeLogUpdateForm updateForm) {
         ChangeLogEntity existVersion = changeLogDao.selectByVersion(updateForm.getVersion());
@@ -71,7 +69,6 @@ public synchronized ResponseDTO<String> update(ChangeLogUpdateForm updateForm) {
 
     /**
      * 批量删除
-     *
      */
     public synchronized ResponseDTO<String> batchDelete(List<Long> idList) {
         if (CollectionUtils.isEmpty(idList)) {
@@ -93,4 +90,8 @@ public synchronized ResponseDTO<String> delete(Long changeLogId) {
         changeLogDao.deleteById(changeLogId);
         return ResponseDTO.ok();
     }
+
+    public ChangeLogVO getById(Long changeLogId) {
+        return SmartBeanUtil.copy(changeLogDao.selectById(changeLogId), ChangeLogVO.class);
+    }
 }

smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/changelog/service/ChangeLogService.java

@@ -60,9 +60,9 @@ public class ${name.upperCamel}Controller {
 
     #if($deleteInfo.deleteEnum == "Single" || $deleteInfo.deleteEnum == "SingleAndBatch")
     @Operation(summary = "单个删除 @author ${basic.backendAuthor}")
-    @GetMapping("/${name.lowerCamel}/delete/{${name.lowerCamel}Id}")
+    @GetMapping("/${name.lowerCamel}/delete/{${primaryKeyFieldName}}")
     public ResponseDTO<String> batchDelete(@PathVariable ${primaryKeyJavaType} ${primaryKeyFieldName}) {
-        return ${name.lowerCamel}Service.delete(${name.lowerCamel}Id);
+        return ${name.lowerCamel}Service.delete(${primaryKeyFieldName});
     }
     #end
 #end

smart-admin-api/sa-base/src/main/resources/code-generator-template/java/controller/Controller.java.vm

@@ -65,22 +65,6 @@ server:
       pattern: "%t %{X-Forwarded-For}i %a %r %s (%D ms) %I (%B byte)"
 
 
-# 文件上传 配置
-#file:
-#  storage:
-#    mode: local
-#    local:
-#      upload-path: /home/smart_admin_v3/upload/   #文件上传目录
-#      url-prefix:
-#    cloud:
-#      region: oss-cn-qingdao
-#      endpoint: oss-cn-qingdao.aliyuncs.com
-#      bucket-name: common
-#      access-key:
-#      secret-key:
-#      url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
-#      private-url-expire-seconds: 3600
-
 # 文件上传 配置
 file:
   storage:
@@ -97,6 +81,7 @@ file:
       url-prefix: https://${file.storage.cloud.bucket-name}.${file.storage.cloud.endpoint}/
       private-url-expire-seconds: 3600
 
+
 # open api配置
 springdoc:
   swagger-ui: