From b9e713710b9a984d24c70937123d65a98e8dc8f7 Mon Sep 17 00:00:00 2001
From: xiangwb <xiangwb@drore.com>
Date: Wed, 9 May 2018 09:57:21 +0800
Subject: [PATCH] merge

---
 .../main/java/com/xwbing/druid}/DruidDataSourceConfig.java    | 4 ++--
 .../{domain/entity/model => druid}/DruidDataSourceModel.java  | 2 +-
 .../src/main/java/com/xwbing/util/CommonDataUtil.java         | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename {boot-web/src/main/java/com/xwbing/configuration => boot-service/src/main/java/com/xwbing/druid}/DruidDataSourceConfig.java (96%)
 rename boot-service/src/main/java/com/xwbing/{domain/entity/model => druid}/DruidDataSourceModel.java (96%)

diff --git a/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java b/boot-service/src/main/java/com/xwbing/druid/DruidDataSourceConfig.java
similarity index 96%
rename from boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java
rename to boot-service/src/main/java/com/xwbing/druid/DruidDataSourceConfig.java
index 0cb0a96..a136041 100644
--- a/boot-web/src/main/java/com/xwbing/configuration/DruidDataSourceConfig.java
+++ b/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
diff --git a/boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java b/boot-service/src/main/java/com/xwbing/druid/DruidDataSourceModel.java
similarity index 96%
rename from boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java
rename to boot-service/src/main/java/com/xwbing/druid/DruidDataSourceModel.java
index 08ace1d..5ef0f21 100644
--- a/boot-service/src/main/java/com/xwbing/domain/entity/model/DruidDataSourceModel.java
+++ b/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;
diff --git a/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java b/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java
index d1d0c5d..a7a9e0e 100644
--- a/boot-service/src/main/java/com/xwbing/util/CommonDataUtil.java
+++ b/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;