修改代码

pom.xml

@@ -17,15 +17,9 @@
   </parent>
 
   <dependencies>
-
     <dependency>
       <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun-oss</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun-local</artifactId>
+      <artifactId>4dkankan-utils-fyun-https</artifactId>
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
     <dependency>
@@ -41,13 +35,6 @@
     </dependency>
 
     <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-mongodb</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-
-
-    <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <version>8.0.25</version>
@@ -103,7 +90,11 @@
       <version>1.2.83</version>
     </dependency>
 
-
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+      <version>1.18.20</version>
+    </dependency>
 
     <dependency>
       <groupId>org.springframework.boot</groupId>

src/main/java/com/fdkankan/manage/aop/VisitLogInterceptor.java

@@ -10,7 +10,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.manage.config.SaTokenConfigure;
-import com.fdkankan.manage.entity.OperLog;
 import com.fdkankan.manage.entity.SysUser;
 import com.fdkankan.manage.service.ISysUserService;
 import com.fdkankan.redis.util.RedisUtil;
@@ -23,7 +22,6 @@ import org.aspectj.lang.annotation.Pointcut;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -42,8 +40,6 @@ public class VisitLogInterceptor {
 	@Autowired
 	private RedisUtil redisUtil;
 
-	@Autowired
-	private MongoTemplate mongoTemplate;
 
 	@Autowired
 	private ISysUserService userService;
@@ -109,21 +105,6 @@ public class VisitLogInterceptor {
 				nickName = sysUser.getNickName();
 			}
 		}
-		//写入mongodb
-		OperLog operLog = new OperLog();
-		operLog.setUserId(userId);
-		operLog.setUserName(userName);
-		operLog.setNickName(nickName);
-		operLog.setRequestPath(requestPath);
-		operLog.setUri(uri);
-		operLog.setMethod(method);
-		operLog.setParams(params);
-		operLog.setIp(clientIP);
-		operLog.setBrowser(browser);
-		operLog.setCreateTime(Calendar.getInstance().getTime());
-		operLog.setResult(msg);
-		operLog.setOperationType("manage");
-		mongoTemplate.insert(operLog);
 
 		return result;
 	}

src/main/java/com/fdkankan/manage/controller/OperLogController.java

@@ -1,14 +1,7 @@
 package com.fdkankan.manage.controller;
 
-import com.fdkankan.manage.common.ResultData;
-import com.fdkankan.manage.service.OperLogService;
-import com.fdkankan.manage.vo.OperLogPageParamVO;
-import com.fdkankan.mongodb.base.MongoPageResult;
 import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,29 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class OperLogController {
 
     @Autowired
-    MongoTemplate mongoTemplate;
-
-    @Autowired
     RedisUtil redisUtil;
 
-    @Autowired
-    private OperLogService operLogService;
-
-    /**
-     * 操作日志列表
-     * @param param
-     * @return
-     */
-    @PostMapping("/pageOperLog")
-    public ResultData pageOperLog(@RequestBody OperLogPageParamVO param){
-
-        MongoPageResult mongoPageResult = operLogService.pageOperLog(param);
-
-        return ResultData.ok(mongoPageResult);
-
-    }
-
-
-
-
 }

src/main/java/com/fdkankan/manage/entity/OperLog.java

@@ -1,62 +0,0 @@
-package com.fdkankan.manage.entity;
-
-import com.fdkankan.mongodb.base.BaseMongoEntity;
-import lombok.Data;
-import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.data.mongodb.core.mapping.Field;
-
-/**
- * 操作日志
- */
-@Data
-@Document("OperLog")
-public class OperLog extends BaseMongoEntity{
-
-
-    /**
-     * 用户id
-     */
-    @Field("userId")
-    private Long userId;
-
-    /**
-     * 账号
-     */
-    @Field("userName")
-    private String userName;
-
-    /**
-     * 姓名
-     */
-    @Field("nickName")
-    private String nickName;
-
-    /**请求路径*/
-    @Field("requestPath")
-    private String requestPath;
-
-    /**请求url*/
-    @Field("uri")
-    private String uri;
-
-    /**请求方式*/
-    @Field("method")
-    private String method;
-
-    /**请求方式*/
-    @Field("params")
-    private String params;
-
-    /**请求ip*/
-    @Field("ip")
-    private String ip;
-
-    @Field("browser")
-    private String browser;
-
-    @Field("result")
-    private String result;
-
-    @Field("operationType")
-    private String operationType;
-}

src/main/java/com/fdkankan/manage/httpClient/param/TakeLookParam.java

@@ -3,8 +3,8 @@ package com.fdkankan.manage.httpClient.param;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.FiledUtil;
 import com.fdkankan.manage.vo.request.RequestBase;
-import jodd.util.StringUtil;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
 @Data
 public class TakeLookParam extends RequestBase {
@@ -18,14 +18,14 @@ public class TakeLookParam extends RequestBase {
     private String order;
 
     public String getField() {
-        if(StringUtil.isNotBlank(field)){
+        if(StringUtils.isNotBlank(field)){
             return FiledUtil.upperCharToUnderLine(field);
         }
         return "create_time";
     }
 
     public String getOrder() {
-        if(StringUtil.isNotBlank(order) && order.contains("end")){
+        if(StringUtils.isNotBlank(order) && order.contains("end")){
             return order.split("end")[0];
         }
         return "DESC";

src/main/java/com/fdkankan/manage/httpClient/vo/OverallParam.java

@@ -2,7 +2,6 @@ package com.fdkankan.manage.httpClient.vo;
 
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.FiledUtil;
-import jodd.util.StringUtil;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 
@@ -48,14 +47,14 @@ public class OverallParam {
     }
 
     public String getOrderBy() {
-        if(StringUtil.isNotBlank(field)){
+        if(StringUtils.isNotBlank(field)){
             return FiledUtil.upperCharToUnderLine(field);
         }
         return "time";
     }
 
     public String getSort() {
-        if(StringUtil.isNotBlank(order) && order.contains("end")){
+        if(StringUtils.isNotBlank(order) && order.contains("end")){
             return order.split("end")[0];
         }
         return "DESC";

src/main/java/com/fdkankan/manage/service/OperLogService.java

@@ -1,21 +0,0 @@
-package com.fdkankan.manage.service;
-
-import com.fdkankan.manage.entity.OperLog;
-import com.fdkankan.manage.vo.OperLogPageParamVO;
-import com.fdkankan.mongodb.base.MongoPageResult;
-import com.fdkankan.mongodb.service.MongodbBaseService;
-import java.util.List;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/30
- **/
-public interface OperLogService extends MongodbBaseService<OperLog> {
-
-    MongoPageResult pageOperLog(OperLogPageParamVO param);
-
-}

src/main/java/com/fdkankan/manage/service/impl/OperLogServiceImpl.java

@@ -1,48 +0,0 @@
-package com.fdkankan.manage.service.impl;
-
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.fdkankan.manage.entity.OperLog;
-import com.fdkankan.manage.service.OperLogService;
-import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.manage.vo.OperLogPageParamVO;
-import com.fdkankan.mongodb.base.MongoPageResult;
-import com.fdkankan.mongodb.service.impl.MongodbBaseServiceImpl;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/30
- **/
-@Service
-public class OperLogServiceImpl extends MongodbBaseServiceImpl<OperLog> implements OperLogService {
-
-    @Override
-    public MongoPageResult pageOperLog(OperLogPageParamVO param) {
-
-        Query query = new Query();
-        if(StrUtil.isNotEmpty(param.getNickName())){
-            query.addCriteria(Criteria.where("nickName").regex(param.getNickName()));
-        }
-        if(StrUtil.isNotEmpty(param.getUserName())){
-            query.addCriteria(Criteria.where("userName").regex(param.getUserName()));
-        }
-        if(Objects.nonNull(param.getStartTime()) || Objects.nonNull(param.getEndTime())){
-            query.addCriteria (Criteria.where("createTime").gte(Dateutils.getDate(param.getStartTime())).lte(Dateutils.getDate(param.getEndTime())));
-        }
-        //默认按操作时间降序排序
-        param.setOrderBy("createTime");
-
-        MongoPageResult<OperLog> operLogMongoPageResult = this.pageQuery(param, query);
-        return operLogMongoPageResult;
-    }
-}

src/main/java/com/fdkankan/manage/vo/InvoicePageParamVO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fdkankan.manage.vo.request.RequestBase;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.mongodb.base.BaseRequestMongo;
 import java.util.Date;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/fdkankan/manage/vo/OperLogPageParamVO.java

@@ -1,41 +0,0 @@
-package com.fdkankan.manage.vo;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fdkankan.manage.util.Dateutils;
-import com.fdkankan.mongodb.base.BaseRequestMongo;
-import lombok.Data;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Date;
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/5/31
- **/
-@Data
-public class OperLogPageParamVO extends BaseRequestMongo {
-
-    private String nickName;
-
-    private String userName;
-
-    private String startTime;
-
-    private String endTime;
-
-    private String operationType = "manage";
-
-    public String getStartTime() {
-        return Dateutils.getStartTime(startTime);
-    }
-
-
-    public String getEndTime() {
-        return Dateutils.getEndTime(endTime);
-    }
-
-}

src/main/java/com/fdkankan/manage/vo/request/SceneParam.java

@@ -4,8 +4,8 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.FiledUtil;
 import com.fdkankan.manage.vo.request.RequestBase;
-import jodd.util.StringUtil;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 
 import java.security.GeneralSecurityException;
@@ -45,14 +45,14 @@ public class SceneParam extends RequestBase {
     }
 
     public String getField() {
-        if(StringUtil.isNotBlank(field)){
+        if(StringUtils.isNotBlank(field)){
             return FiledUtil.upperCharToUnderLine(field);
         }
         return "create_time";
     }
 
     public String getOrder() {
-        if(StringUtil.isNotBlank(order) && order.contains("end")){
+        if(StringUtils.isNotBlank(order) && order.contains("end")){
             return order.split("end")[0];
         }
         return "DESC";

src/main/resources/logback-spring.xml

@@ -6,8 +6,9 @@
 <configuration scan="true" scanPeriod="10 seconds">
 
 	<contextName>logback</contextName>
+	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/backend/4dkankan_v4/manage/logs" />
+	<property name="log.path" value="${LOG_PATH}/manage/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->