优化

pom.xml

@@ -90,7 +90,11 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-
+        <!--健康检查模块-->
+       <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/com/example/demo/MyApplication.java

@@ -1,11 +1,11 @@
 package com.example.demo;
 
+import com.example.demo.filter.XssFilter;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
-
-import com.example.demo.filter.XssFilter;
+import org.springframework.data.redis.core.StringRedisTemplate;
 
 @SpringBootApplication
 //@EnableScheduling 开启spring任务调度
@@ -15,6 +15,11 @@ public static void main(String[] args) {
         // 返回一个上下文
         SpringApplication.run(MyApplication.class, args);
     }
+//
+//    @Bean
+//    StringRedisTemplate stringRedisTemplate() {
+//        return new StringRedisTemplate();
+//    }
 
     /**
      * 把Filter bean 注册到内嵌的Servlet容器中(Servlets 和Listeners的注册方式一样)

src/main/java/com/example/demo/common/util/JedisUtils.java

@@ -38,12 +38,12 @@ public class JedisUtils {
      * 初始化线程池
      */
     static {
-        JedisPoolConfig config = new JedisPoolConfig();
-        config.setMaxTotal(MAX_ACTIVE);
-        config.setMaxIdle(MAX_IDLE);
-        config.setMaxWaitMillis(MAX_WAIT);
-        config.setTestOnBorrow(BORROW);
-        jedisPool = new JedisPool(config, HOST, PORT, TIMEOUT, AUTH);
+//        JedisPoolConfig config = new JedisPoolConfig();
+//        config.setMaxTotal(MAX_ACTIVE);
+//        config.setMaxIdle(MAX_IDLE);
+//        config.setMaxWaitMillis(MAX_WAIT);
+//        config.setTestOnBorrow(BORROW);
+      //  jedisPool = new JedisPool(config, HOST, PORT, TIMEOUT, AUTH);
     }
 
     /**

src/main/java/com/example/demo/controller/LogsController.java

@@ -49,7 +49,6 @@ public String list(Model model) throws FileNotFoundException {
     public String get(@PathVariable("fileName") String fileName, Model model) {
         // 根据系统获取文件分隔符
         String fileSeparator = System.getProperty("file.separator");
-        System.err.println(fileSeparator);
         String sfilePath = logFilePath.concat(fileSeparator).concat(fileName).concat(".log");
         List<String> data = FileUtils.readFileByLines(sfilePath);
         model.addAttribute("data", data);

src/main/java/com/example/demo/controller/UserController.java

@@ -133,7 +133,7 @@ public JsonResult save(User user) throws Exception {
 
         // 新增
         if (user.getId() == null) {
-            int id = commonService.getTableNewId("pn_user", "id", 10001);
+            int id = commonService.getTableNewId("pn_user", "id");
             user.setId(id);
             // 暂时没有部门信息
             user.setDepartmentId(10001);

src/main/java/com/example/demo/mapper/CommonMapper.java

@@ -5,6 +5,7 @@
 
 import com.example.demo.entity.Log;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 系统公共方法映射接口
@@ -19,9 +20,9 @@ public interface CommonMapper {
      *
      * @param tableName 需要创建ID的数据库表名称,如"pn_user"
      * @param field     数据表字段,如Id,user_id,menu_id等
-     * @return 因为会存在null 的情况下，所以返回类型用Map
+     * @return 返回最前field 字段值
      */
-    Map<String, Object> getTableNewId(Map<String, Object> params);
+    Object getTableNewId(@Param("tableName") String tableName, @Param("field") String field);
 
     /**
      * 系统操作日志添加

src/main/java/com/example/demo/service/CommonService.java

@@ -22,6 +22,17 @@ public interface CommonService {
      */
     int getTableNewId(String tableName, String field, Integer initId);
 
+    /**
+     * 获取一个数据表的新ID,默认从10001开始
+     *
+     * @param tableName 需要创建ID的数据库表名称,如"pn_user"
+     * @param field     数据表字段,如Id,user_id,menu_id等
+     * @return
+     */
+    int getTableNewId(String tableName, String field);
+
+    //String getTableNewStringId(String tableName, String field);
+
     /**
      * 系统操作日志添加
      *

src/main/java/com/example/demo/service/GoodsService.java

@@ -1,10 +1,10 @@
 package com.example.demo.service;
 
+import com.example.demo.entity.Goods;
+
 import java.util.List;
 import java.util.Map;
 
-import com.example.demo.entity.Goods;
-
 /**
  * 商品信息服务层接口
  *
@@ -38,9 +38,9 @@ public interface GoodsService {
     /**
      * 修改商品库存和销量
      *
-     * @param goodsNum
-     * @param amount
-     * @return
+     * @param goodsNum 商品编码
+     * @param amount   销量
+     * @return 返回修改成功行数
      */
     int updateStockAndSaleCount(String goodsNum, int amount);
 

src/main/java/com/example/demo/service/impl/CommonServiceImpl.java

@@ -1,21 +1,21 @@
 package com.example.demo.service.impl;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.alibaba.fastjson.JSONObject;
 import com.example.demo.common.util.StringUtils;
 import com.example.demo.common.util.WebContextUtils;
 import com.example.demo.entity.Log;
 import com.example.demo.mapper.CommonMapper;
 import com.example.demo.service.CommonService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * 系统公共方法服务层接口实现类
@@ -26,48 +26,56 @@
 @Service
 public class CommonServiceImpl implements CommonService {
 
-	@Autowired
-	private CommonMapper commonMapper;
+    private static Logger logger = LoggerFactory.getLogger(CommonServiceImpl.class);
+
+    @Autowired
+    private CommonMapper commonMapper;
+
+    public int getTableNewId(String tableName, String field, Integer initId) {
+        Object result = commonMapper.getTableNewId(tableName, field);
+
+        // 结果为空
+        if (Objects.isNull(result)) {
+            return initId;
+        }
 
-	public int getTableNewId(String tableName, String field, Integer initId) {
-		Map<String, Object> params = new HashMap<>();
-		params.put("tableName", tableName);
-		params.put("field", field);
-		Map<String, Object> result = commonMapper.getTableNewId(params);
+        if (!(result instanceof Integer)) {
+            logger.debug("数据表：" + tableName + "的字段：" + field + "为非Integer类型");
+        }
 
-		// 结果集包含null
-		if (Objects.isNull(result) || !result.containsKey(field)) {
-			return initId;
-		}
+        // 原子操作
+        int id = StringUtils.parseInteger(result);
+        AtomicInteger atomicInteger = new AtomicInteger(id);
+        return atomicInteger.incrementAndGet();
+    }
 
-		// 原子操作
-		int id = StringUtils.parseInteger(result.get(field));
-		AtomicInteger atomicInteger = new AtomicInteger(id);
-		return atomicInteger.incrementAndGet();
-	}
+    @Override
+    public int getTableNewId(String tableName, String field) {
+        return this.getTableNewId(tableName, field, 10001);
+    }
 
-	@Override
-	public void addLog(Class<?> clazz, String method, String operation, Object params) {
-		Log log = new Log();
+    @Override
+    public void addLog(Class<?> clazz, String method, String operation, Object params) {
+        Log log = new Log();
 
-		log.setUserId(WebContextUtils.getCurrentUserId());
-		log.setUserName(WebContextUtils.getCurrentUserName());
-		log.setIp(WebContextUtils.getRemoteAddr());
-		log.setCreateTime(new Date());
-		log.setMethod(new StringBuilder(clazz.getSimpleName()).append(".").append(method).toString());
-		log.setOperation(operation);
-		log.setParams(JSONObject.toJSONString(params));
+        log.setUserId(WebContextUtils.getCurrentUserId());
+        log.setUserName(WebContextUtils.getCurrentUserName());
+        log.setIp(WebContextUtils.getRemoteAddr());
+        log.setCreateTime(new Date());
+        log.setMethod(new StringBuilder(clazz.getSimpleName()).append(".").append(method).toString());
+        log.setOperation(operation);
+        log.setParams(JSONObject.toJSONString(params));
 
-		commonMapper.addLog(log);
-	}
+        commonMapper.addLog(log);
+    }
 
-	@Override
-	public List<Log> listPageLog(Map<String, Object> params) {
-		return commonMapper.listPageLog(params);
-	}
+    @Override
+    public List<Log> listPageLog(Map<String, Object> params) {
+        return commonMapper.listPageLog(params);
+    }
 
-	@Override
-	public Integer countPageLog(Map<String, Object> params) {
-		return commonMapper.countPageLog(params);
-	}
+    @Override
+    public Integer countPageLog(Map<String, Object> params) {
+        return commonMapper.countPageLog(params);
+    }
 }

src/main/java/com/example/demo/task/Scheduler.java

@@ -10,7 +10,7 @@
  *
  * @QuiFar
  */
-@Component
+//@Component
 public class Scheduler {
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 

src/main/resources/application-dev.properties

@@ -4,12 +4,18 @@
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/pn?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&autoReconnectForPools=true
 spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.password=root
 spring.couchbase.env.ssl.enabled=false
 
 #-------------------------是否执行代码检查，一般开发环境为true,生产为false-------------------------#
 pn.isCheckCode=true
 pn.isLogger=true
 
 #日志路径
-mylogs.Path=E:/pn-project/target/tomcat/logs
+mylogs.Path=E:/pn-project/target/tomcat/logs
+
+#---------------------redis配置----------------------#
+#spring.redis.database=0
+#spring.redis.host=192.168.211.137
+#spring.redis.port=6379
+#spring.redis.password=123456

src/main/resources/application.properties

@@ -45,4 +45,8 @@ spring.datasource.tomcat.remove-abandoned-timeout=180
 #10个连接后才会执行回收器
 spring.datasource.tomcat.num-tests-per-eviction-run=10
 #连接超时
-spring.datasource.tomcat.max-wait=30000
+spring.datasource.tomcat.max-wait=30000
+
+#配置actuator系统健康监控
+management.security.enabled=false
+management.port=8080