F

application/src/main/java/com/lyg/application/controller/TaAttachController.java

@@ -58,7 +58,7 @@ public class TaAttachController extends BaseController {
     public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                             @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
+                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_time") String sortDesc) throws Exception {
         
         IPage<TaAttach> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaAttach> queryWrapper = new QueryWrapper<>();

application/src/main/java/com/lyg/application/controller/TaPostController.java

@@ -61,11 +61,15 @@ public class TaPostController extends BaseController {
     @GetMapping("/taPost")
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                         @ApiParam("标题") @RequestParam(value = "title", required = false) String title,
+                         @ApiParam("作者") @RequestParam(value = "author", required = false) String author,
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_time") String sortDesc) throws Exception {
 
         IPage<TaPost> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaPost> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(StringUtil.isNotEmpty(title),"title", title);
+        queryWrapper.like(StringUtil.isNotEmpty(author), "author", author);
         queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
         queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
         IPage<TaPost> result = taPostService.page(pg, queryWrapper);
@@ -89,7 +93,6 @@ public class TaPostController extends BaseController {
             throw new Exception("数据不为空");
         }
         taPostService.savePost(taPost);
-        taPostService.save(taPost);
         return SaResult.data(taPost);
     }
 

application/src/main/java/com/lyg/application/controller/TaSourceAttachController.java

@@ -59,7 +59,7 @@ public class TaSourceAttachController extends BaseController {
     public SaResult list(@ApiParam("页码") @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                          @ApiParam("单页数据量") @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                          @ApiParam("正序排列") @RequestParam(value = "sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
+                         @ApiParam("倒序排列") @RequestParam(value = "sortDesc", defaultValue = "created_time") String sortDesc) throws Exception {
 
         IPage<TaSourceAttach> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<TaSourceAttach> queryWrapper = new QueryWrapper<>();

application/src/main/java/com/lyg/application/controller/TaCategoryController.java → application/src/main/java/com/lyg/application/controller/TdCategoryController.java

@@ -4,8 +4,6 @@ import cn.dev33.satoken.util.SaResult;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import java.util.List;
-import com.lyg.common.Constants;
 import com.lyg.common.util.StringUtil;
 import com.lyg.framework.log.OpLog;
 import com.lyg.system.controller.BaseController;
@@ -16,8 +14,8 @@ import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.lyg.application.entity.TaCategory;
-import com.lyg.application.service.TaCategoryService;
+import com.lyg.application.entity.TdCategory;
+import com.lyg.application.service.TdCategoryService;
 
  /**
  * 分类;(ta_category)表控制层
@@ -27,10 +25,10 @@ import com.lyg.application.service.TaCategoryService;
 @Api(tags = "分类对象功能接口")
 @RestController
 @RequestMapping("/")
-public class TaCategoryController extends BaseController {
+public class TdCategoryController extends BaseController {
     
     @Autowired
-    private TaCategoryService taCategoryService;
+    private TdCategoryService tdCategoryService;
     
     /** 
      * 通过ID查询单条数据 
@@ -41,9 +39,9 @@ public class TaCategoryController extends BaseController {
     @OpLog(module = "分类", action = "查询单条数据", desc = "ID：{{#id}}")
     @AccessLimit()
     @ApiOperation("通过ID查询单条数据")
-    @GetMapping("/taCategory/{id}")
+    @GetMapping("/tdCategory/{id}")
     public SaResult queryById(@ApiParam("对象ID") @PathVariable String id) throws Exception {
-        return SaResult.data(taCategoryService.getById(id));
+        return SaResult.data(tdCategoryService.getById(id));
     }
     
     /** 
@@ -56,17 +54,17 @@ public class TaCategoryController extends BaseController {
     @OpLog(module = "分类", action = "分页列表查询")
     @AccessLimit()
     @ApiOperation("分页查询")
-    @GetMapping("/taCategory")
+    @GetMapping("/tdCategory")
     public SaResult list(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                             @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
+                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_time") String sortDesc) throws Exception {
         
-        IPage<TaCategory> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaCategory> queryWrapper = new QueryWrapper<>();
-        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
-        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
-        IPage<TaCategory> result = taCategoryService.page(pg, queryWrapper);
+        IPage<TdCategory> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TdCategory> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.orderByAsc(StringUtil.isNotEmpty(sortAsc), StringUtil.humpToLine(sortAsc));
+//        queryWrapper.orderByDesc(StringUtil.isNotEmpty(sortDesc), StringUtil.humpToLine(sortDesc));
+        IPage<TdCategory> result = tdCategoryService.page(pg, queryWrapper);
         
         return SaResult.data(result);
     }
@@ -74,33 +72,33 @@ public class TaCategoryController extends BaseController {
     /** 
      * 新增数据
      *
-     * @param taCategory 实例对象
+     * @param tdCategory 实例对象
      * @return 实例对象
      */
     @OpLog(module = "分类", action = "新增数据")
     @AccessLimit()
     @ApiOperation("新增数据")
-    @PostMapping("/taCategory")
-    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TaCategory taCategory) throws Exception {
-        taCategoryService.save(taCategory);
-        return SaResult.data(taCategory);
+    @PostMapping("/tdCategory")
+    public SaResult add(@ApiParam("对象实体") @Validated @RequestBody TdCategory tdCategory) throws Exception {
+        tdCategoryService.save(tdCategory);
+        return SaResult.data(tdCategory);
     }
     
     /** 
      * 更新数据
      *
-     * @param taCategory 实例对象
+     * @param tdCategory 实例对象
      * @return 实例对象
      */
     @OpLog(module = "分类", action = "更新数据")
     @AccessLimit()
     @ApiOperation("更新数据")
-    @PutMapping("/taCategory/{id}")
-    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TaCategory taCategory,
+    @PutMapping("/tdCategory/{id}")
+    public SaResult edit(@ApiParam("对象实体") @Validated @RequestBody TdCategory tdCategory,
                             @ApiParam("对象ID") @PathVariable String id ) throws Exception {
-        taCategory.setCategoryId(id);
-        taCategoryService.updateById(taCategory);
-        return SaResult.data(taCategory);
+        tdCategory.setCategoryId(id);
+        tdCategoryService.updateById(tdCategory);
+        return SaResult.data(tdCategory);
     }
     
     /** 
@@ -112,9 +110,9 @@ public class TaCategoryController extends BaseController {
     @OpLog(module = "分类", action = "删除数据", desc = "ID：{{#id}}")
     @AccessLimit()
     @ApiOperation("通过主键删除数据")
-    @DeleteMapping("/taCategory/{id}")
+    @DeleteMapping("/tdCategory/{id}")
     public SaResult deleteById(@ApiParam("对象ID") @PathVariable String id){
-        taCategoryService.removeById(id);
+        tdCategoryService.removeById(id);
         return SaResult.data("success");
     }
 }

application/src/main/java/com/lyg/application/entity/TaAttach.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.NotBlank;
 public class TaAttach implements Serializable,Cloneable{
 
     @ApiModelProperty(name = "附件Id",notes = "")
-    @TableId(value = "attach_id", type = IdType.ASSIGN_UUID)
+//    @TableId(value = "attach_id", type = IdType.ASSIGN_UUID)
     private String attachId ;
 
     @NotBlank(message = "附件名不能为空")

application/src/main/java/com/lyg/application/entity/TaCategory.java

@@ -1,64 +0,0 @@
-package com.lyg.application.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import javax.validation.constraints.NotBlank;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 分类;
- *
- * @author : http://www.chiner.pro
- * @date : 2024-3-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value = "分类", description = "")
-@TableName("td_category")
-public class TaCategory implements Serializable, Cloneable {
-
-    @ApiModelProperty(name = "分类Id", notes = "")
-    @TableId(value = "category_id", type = IdType.ASSIGN_UUID)
-    private String categoryId;
-
-    @NotBlank(message = "分类名不能为空")
-    @ApiModelProperty(name = "分类名", notes = "")
-    private String categoryName;
-
-    @ApiModelProperty(name = "上级单位;-1为根级目录", notes = "")
-    private String parentId;
-
-    @ApiModelProperty(name = "序号", notes = "")
-    private Integer sort;
-
-    @ApiModelProperty(name = "状态", notes = "0 正常 1不正常")
-    private Integer status;
-
-    @ApiModelProperty(name = "", notes = "")
-    @TableField(fill = FieldFill.INSERT)
-    private LocalDateTime createdTime;
-
-    @ApiModelProperty(name = "", notes = "")
-    @TableField(fill = FieldFill.INSERT)
-    private String createdBy;
-
-    @ApiModelProperty(name = "", notes = "")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private LocalDateTime updatedTime;
-
-    @ApiModelProperty(name = "", notes = "")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updatedBy;
-
-    @ApiModelProperty(name = "", notes = "0 存在 1 删除")
-    @TableField(fill = FieldFill.INSERT)
-    private Integer deleted;
-
-}

application/src/main/java/com/lyg/application/entity/TaPost.java

@@ -1,5 +1,6 @@
 package com.lyg.application.entity;
 
+import cn.hutool.json.JSON;
 import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -34,6 +35,8 @@ public class TaPost implements Serializable, Cloneable {
     @ApiModelProperty(name = "文章标题", notes = "")
     private String title;
 
+
+    @TableField("`describe`") // 假设select是关键字
     @ApiModelProperty(name = "描述", notes = "")
     private String describe;
 

application/src/main/java/com/lyg/application/entity/TdCategory.java

@@ -0,0 +1,62 @@
+package com.lyg.application.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 分类;
+ * @author : http://www.chiner.pro
+ * @date : 2024-3-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "分类",description = "")
+@TableName("td_category")
+public class TdCategory implements Serializable,Cloneable{
+
+    @ApiModelProperty(name = "分类Id",notes = "")
+    @TableId(value = "category_id", type = IdType.ASSIGN_UUID)
+    private String categoryId ;
+
+    @NotBlank(message = "分类名不能为空")
+    @ApiModelProperty(name = "分类名",notes = "")
+    private String categoryName ;
+
+    @ApiModelProperty(name = "上级单位;-1为根级目录",notes = "")
+    private String parentId ;
+
+    @ApiModelProperty(name = "序号",notes = "")
+    private Integer sortNo ;
+
+    @ApiModelProperty(name = "状态",notes = "0 不正常 1正常")
+    private Integer status ;
+
+    @ApiModelProperty(name = "",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createdTime ;
+
+    @ApiModelProperty(name = "",notes = "")
+    @TableField(fill = FieldFill.INSERT)
+    private String createdBy ;
+
+    @ApiModelProperty(name = "",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private LocalDateTime updatedTime ;
+
+    @ApiModelProperty(name = "",notes = "")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updatedBy ;
+
+    @ApiModelProperty(name = "",notes = "0 存在 1 删除")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer deleted ;
+
+}

application/src/main/java/com/lyg/application/mapper/TaCategoryMapper.java → application/src/main/java/com/lyg/application/mapper/TdCategoryMapper.java

@@ -2,8 +2,7 @@ package com.lyg.application.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import com.lyg.application.entity.TaCategory;
+import com.lyg.application.entity.TdCategory;
 
  /**
  * 分类;(ta_category)表数据库访问层
@@ -11,6 +10,6 @@ import com.lyg.application.entity.TaCategory;
  * @date : 2024-3-22
  */
 @Mapper
-public interface TaCategoryMapper  extends BaseMapper<TaCategory>{
+public interface TdCategoryMapper extends BaseMapper<TdCategory>{
     
 }

application/src/main/java/com/lyg/application/service/TaCategoryService.java

@@ -1,14 +0,0 @@
-package com.lyg.application.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.lyg.application.entity.TaCategory;
-import com.lyg.system.service.IBaseService;
-
- /**
- * 分类;(ta_category)表服务接口
- * @author : http://njyunzhi.com
- * @date : 2024-3-22
- */
-public interface TaCategoryService extends IBaseService<TaCategory> {
-    
-}

application/src/main/java/com/lyg/application/service/TdCategoryService.java

@@ -0,0 +1,14 @@
+package com.lyg.application.service;
+
+import com.lyg.application.entity.TdCategory;
+import com.lyg.system.service.IBaseService;
+
+/**
+ * 分类;(td_category)表服务接口
+ *
+ * @author : http://njyunzhi.com
+ * @date : 2024-3-25
+ */
+public interface TdCategoryService extends IBaseService<TdCategory> {
+
+}

application/src/main/java/com/lyg/application/service/impl/TaCategoryServiceImpl.java

@@ -1,18 +0,0 @@
-package com.lyg.application.service.impl;
-
-import com.lyg.system.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.lyg.application.entity.TaCategory;
-import com.lyg.application.mapper.TaCategoryMapper;
-import com.lyg.application.service.TaCategoryService;
-
- /**
- * 分类;(ta_category)表服务实现类
- * @author : http://www.chiner.pro
- * @date : 2024-3-22
- */
-@Service
-public class TaCategoryServiceImpl extends BaseServiceImpl<TaCategoryMapper, TaCategory> implements TaCategoryService {
-    
-}

application/src/main/java/com/lyg/application/service/impl/TaPostServiceImpl.java

@@ -13,7 +13,6 @@ import com.lyg.system.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -46,16 +45,22 @@ public class TaPostServiceImpl extends BaseServiceImpl<TaPostMapper, TaPost> imp
         taSourceAttach.setAttachId(attachId);
         taSourceAttachMapper.insert(taSourceAttach);
 
-
-        //保存所有的附件
-        List<TaAttach> taAttachList = new ArrayList<>();
-        for (TaAttach item : taPost.getTaAttachList()) {
-            item.setAttachId(attachId);
-            taAttachList.add(item);
+        if (taPost.getTaAttachList() != null) {
+
+            //保存所有的附件
+            for (TaAttach item : taPost.getTaAttachList()) {
+                if (item.getAttachId() == null) {
+                    item.setAttachId(attachId);
+                    taAttachMapper.insert(item);
+                } else {
+                    taAttachMapper.updateById(item);
+                }
+            }
         }
 
-        taAttachService.saveBatch(taAttachList);
 
+        taPost.setPostId(postId);
+        baseMapper.insert(taPost);
 
     }
 

application/src/main/java/com/lyg/application/service/impl/TdCategoryServiceImpl.java

@@ -0,0 +1,18 @@
+package com.lyg.application.service.impl;
+
+import com.lyg.application.entity.TdCategory;
+import com.lyg.application.mapper.TdCategoryMapper;
+import com.lyg.application.service.TdCategoryService;
+import com.lyg.system.service.impl.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * 分类;(td_category)表服务实现类
+ *
+ * @author : http://www.chiner.pro
+ * @date : 2024-3-25
+ */
+@Service
+public class TdCategoryServiceImpl extends BaseServiceImpl<TdCategoryMapper, TdCategory> implements TdCategoryService {
+
+}

application/src/main/resources/application.yml

@@ -64,5 +64,6 @@ yz:
       - "/static/**"
       - "/h5/**"
       - "/sysUser/current"
+      - "/login/**"
 #  excel-tpl-path: E:\work\Java+web\17填报系统\performance-reporting-service\application\src\main\resources\
 

application/src/main/resources/mapper/TaAttachMapper.xml

@@ -6,7 +6,7 @@
     <select id="getAttachList" resultType="com.lyg.application.entity.TaAttach">
         select * FROM ta_attach  a
         WHERE
-        a.source_id = #{attachId}
+        a.attach_id = #{attachId}
         AND a.`status` = 1
         AND a.deleted = 0
     </select>

application/src/main/resources/mapper/TaCategoryMapper.xml → application/src/main/resources/mapper/TdCategoryMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.lyg.application.mapper.TaCategoryMapper">
+<mapper namespace="com.lyg.application.mapper.TdCategoryMapper">
     
 </mapper>

framework/pom.xml

@@ -40,14 +40,6 @@
             <scope>runtime</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/com.oracle.database.nls/orai18n -->
-        <!-- gbk 字符支持 -->
-<!--        <dependency>-->
-<!--            <groupId>com.oracle.database.nls</groupId>-->
-<!--            <artifactId>orai18n</artifactId>-->
-<!--            <version>${orai18n.version}</version>-->
-<!--        </dependency>-->
-
 
         <!-- Sa-Token 权限认证, 在线文档：https://sa-token.cc/ -->
         <dependency>

framework/src/main/java/com/lyg/framework/mybatisplus/MyMetaObjectHandler.java

@@ -30,8 +30,8 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             String tenantId = (String) request.getAttribute("tenantId");
             String userId = userService.getUserIdBy(user);
 
-            this.strictInsertFill(metaObject, "createAt", LocalDateTime::now, LocalDateTime.class);
-            this.strictInsertFill(metaObject, "updateAt", LocalDateTime::now, LocalDateTime.class);
+            this.strictInsertFill(metaObject, "createdTime", LocalDateTime::now, LocalDateTime.class);
+            this.strictInsertFill(metaObject, "updatedTime", LocalDateTime::now, LocalDateTime.class);
 
             if (user != null) {
                 this.strictInsertFill(metaObject, "createBy", () -> userId, String.class);
@@ -58,9 +58,9 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
             String userId = userService.getUserIdBy(user);
             String userName = userService.getUserNameBy(user);
 
-            this.strictInsertFill(metaObject, "updateDate", LocalDateTime::now, LocalDateTime.class);
+            this.strictInsertFill(metaObject, "updatedTime", LocalDateTime::now, LocalDateTime.class);
             if (user != null) {
-                this.strictInsertFill(metaObject, "updateUser", () -> userId, String.class);
+                this.strictInsertFill(metaObject, "updateBy", () -> userId, String.class);
             }
         } catch (Exception e) {
             e.printStackTrace();

framework/src/main/java/com/lyg/framework/mybatisplus/MybatisPlusConfig.java

@@ -30,7 +30,7 @@ public class MybatisPlusConfig {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
 
         // 分页插件
-        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.ORACLE));
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
 
         if (tenantConfig.getEnabled()) {
             // 多租户插件

framework/src/main/java/com/lyg/framework/satoken/SaServletFilter2.java

@@ -24,19 +24,19 @@ public class SaServletFilter2 implements Filter {
     @Override
     public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
         // 只有登录之后才行
-        if (StpUtil.isLogin()) {
+//        if (StpUtil.isLogin()) {
             appendUser(servletRequest);
-        }
+//        }
 
         //
         filterChain.doFilter(servletRequest, servletResponse);
     }
 
     private void appendUser(ServletRequest request) {
-        Object user = userService.getUserBy(StpUtil.getLoginId());
-        if (null != user) {
-            request.setAttribute("user", user);
-        }
-        request.setAttribute("tenantId", userService.getTenantIdBy(user));
+//        Object user = userService.getUserBy(StpUtil.getLoginId());
+//        if (null != user) {
+//            request.setAttribute("user", user);
+//        }
+//        request.setAttribute("tenantId", userService.getTenantIdBy(user));
     }
 }

framework/src/main/java/com/lyg/framework/satoken/SaTokenConfigure.java

@@ -24,15 +24,15 @@ public class SaTokenConfigure {
         SaServletFilter saServletFilter = new SaServletFilter();
         saServletFilter.addInclude("/**");
         saServletFilter.addExclude(filterConfig.getAnnList().toArray(new String[0]));
-        saServletFilter.setAuth(auth -> {
-            // OPTIONS 请求不校验, 主要是为了解决跨域问题
-            SaRouter.notMatch(SaHttpMethod.OPTIONS).check(r -> {
-                // 平台账户或者租户必须登录一个
-                if (!StpUtil.isLogin()) {
-                    throw new SaTokenException("请登录后再访问接口");
-                }
-            });
-        });
+//        saServletFilter.setAuth(auth -> {
+//            // OPTIONS 请求不校验, 主要是为了解决跨域问题
+//            SaRouter.notMatch(SaHttpMethod.OPTIONS).check(r -> {
+//                // 平台账户或者租户必须登录一个
+//                if (!StpUtil.isLogin()) {
+//                    throw new SaTokenException("请登录后再访问接口");
+//                }
+//            });
+//        });
 
         saServletFilter.setError(err -> {
             SaHolder.getResponse().setHeader("Content-Type", "application/json;charset=UTF-8");

framework/src/main/resources/framework.yml

@@ -46,22 +46,22 @@ tenant:
 access-limit:
   enabled: false
 
-sa-token:
-  # jwt秘钥
-  jwt-secret-key: d4d778d279cf11ed9b1d525400e8554f
-  # token名称 (同时也是cookie名称)
-  token-name: Authorization
-  # token有效期，单位s 默认30天, -1代表永不过期
-  timeout: 2592000
-  # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-  activity-timeout: -1
-  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
-  is-concurrent: true
-  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
-  is-share: true
-  # token风格
-  token-style: uuid
-  # 是否输出操作日志
-  is-log: false
-  # 是否尝试从 cookie 里读取 Token
-  is-read-cookie: false
+#sa-token:
+#  # jwt秘钥
+#  jwt-secret-key: d4d778d279cf11ed9b1d525400e8554f
+#  # token名称 (同时也是cookie名称)
+#  token-name: Authorization
+#  # token有效期，单位s 默认30天, -1代表永不过期
+#  timeout: 2592000
+#  # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
+#  activity-timeout: -1
+#  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
+#  is-concurrent: true
+#  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
+#  is-share: true
+#  # token风格
+#  token-style: uuid
+#  # 是否输出操作日志
+#  is-log: false
+#  # 是否尝试从 cookie 里读取 Token
+#  is-read-cookie: false

system/src/main/java/com/lyg/system/controller/BaseController.java

@@ -48,9 +48,9 @@ public class BaseController {
      */
     public SysUser currentUser() throws Exception {
         String loginId = StpUtil.getLoginIdAsString();
-        if (StringUtil.isEmpty(loginId)) {
-            throw new Exception("请先登录");
-        }
+//        if (StringUtil.isEmpty(loginId)) {
+//            throw new Exception("请先登录");
+//        }
         sysUserService.getById(loginId);
 
         SysUser user = sysUserService.getById(loginId);

system/src/main/java/com/lyg/system/controller/SysLogController.java

@@ -60,8 +60,8 @@ public class SysLogController extends BaseController {
         QueryWrapper<SysLog> queryWrapper = new QueryWrapper<>();
         queryWrapper.like(StringUtil.isNotEmpty(moduleName), "module_name", moduleName);
         queryWrapper.like(StringUtil.isNotEmpty(userName), "user_name", userName);
-        queryWrapper.between(null != start, "create_date", start, end);
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.between(null != start, "created_time", start, end);
+        queryWrapper.orderByDesc("created_time");
         IPage<SysLog> result = sysLogService.page(pg, queryWrapper);
 
         return SaResult.data(result);

system/src/main/java/com/lyg/system/controller/SysPositionController.java

@@ -61,7 +61,7 @@ public class SysPositionController extends BaseController {
                             @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                          @ApiParam("岗位名字") @RequestParam(value ="name", required = false) String name,
                          @ApiParam("正序排列") @RequestParam(value ="sortAsc", required = false) String sortAsc,
-                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "create_date") String sortDesc) throws Exception {
+                         @ApiParam("倒序排列") @RequestParam(value ="sortDesc", defaultValue = "created_time") String sortDesc) throws Exception {
         
         IPage<SysPosition> pg = new Page<>(pageNum, pageSize);
         QueryWrapper<SysPosition> queryWrapper = new QueryWrapper<>();

system/src/main/java/com/lyg/system/controller/SysUserController.java

@@ -76,28 +76,28 @@ public class SysUserController extends BaseController {
                             @ApiParam("sso ticket") @RequestParam(value = "appid", required = false) String appid) throws Exception {
         Map<String, Object> res = new HashMap<>();
         Boolean isLogin= StpUtil.isLogin();
-        if (!isLogin) {
-
-            if (!StringUtil.isEmpty(ticket)) {
-                // 如果是 SSO 登录
-                Object loginId = SaSsoProcessor.instance.checkTicket(ticket, "/sysUser/current");
-                if(loginId != null) {
-                    StpUtil.login(loginId, appid);
-                    res.put("token", StpUtil.getTokenValue());
-                } else {
-                    return SaResult.error("无效 Ticket").setCode(401);
-                }
-            } else {
-                return SaResult.error("请先登录").setCode(401);
-            }
-        }
-
-        SysUser sysUser = currentUser();
-
-        sysUser.setRolesList(sysRoleService.getByUser(sysUser.getUserId()));
-        sysUser.setMenuList(sysMenuService.getByUser(sysUser.getUserId()));
-
-        res.put("user", sysUser);
+//        if (!isLogin) {
+//
+//            if (!StringUtil.isEmpty(ticket)) {
+//                // 如果是 SSO 登录
+//                Object loginId = SaSsoProcessor.instance.checkTicket(ticket, "/sysUser/current");
+//                if(loginId != null) {
+//                    StpUtil.login(loginId, appid);
+//                    res.put("token", StpUtil.getTokenValue());
+//                } else {
+//                    return SaResult.error("无效 Ticket").setCode(401);
+//                }
+//            } else {
+//                return SaResult.error("请先登录").setCode(401);
+//            }
+//        }
+
+//        SysUser sysUser = currentUser();
+
+//        sysUser.setRolesList(sysRoleService.getByUser(sysUser.getUserId()));
+//        sysUser.setMenuList(sysMenuService.getByUser(sysUser.getUserId()));
+//
+//        res.put("user", sysUser);
         return SaResult.data(res);
     }
 
@@ -142,7 +142,7 @@ public class SysUserController extends BaseController {
         queryWrapper.like(!StringUtil.isEmpty(phone), "phone", phone);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.ne("user_id", Constants.ROOT_ID);
-        queryWrapper.orderByDesc("create_date");
+        queryWrapper.orderByDesc("created_time");
         IPage<SysUser> result = sysUserService.page(pg, queryWrapper);
 
         return SaResult.data(result);