merge

boot-service/src/main/java/com/xwbing/druid/DruidDataSourceConfig.java

@@ -1,7 +1,6 @@
-package com.xwbing.configuration;
+package com.xwbing.druid;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import com.xwbing.domain.entity.model.DruidDataSourceModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -19,6 +18,7 @@ import java.sql.SQLException;
  * 作者:  xiangwb
  */
 @Configuration
+//@ConfigurationProperties(prefix = "spring.datasource")
 @EnableConfigurationProperties(DruidDataSourceModel.class)
 public class DruidDataSourceConfig {
     @Resource

boot-service/src/main/java/com/xwbing/druid/DruidDataSourceModel.java

@@ -1,4 +1,4 @@
-package com.xwbing.domain.entity.model;
+package com.xwbing.druid;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java

@@ -2,17 +2,17 @@ package com.xwbing.util;
 
 import com.alibaba.fastjson.JSONObject;
 
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 作者: xiangwb
  * 说明: 公共数据类
  */
 public class CommonDataUtil {
-    private static Map<String, JSONObject> token = new HashMap<>();
+    private static Map<String, JSONObject> token = new ConcurrentHashMap<>();
     private static final long MINUTES = 1000 * 60;
     public static final int MINUTE = 1;
     public static final int HOUR = MINUTE * 60;