整合core里的配置到spring.factories

guns-admin/src/main/java/com/stylefeng/guns/core/common/constant/state/IsMenu.java

-package com.stylefeng.guns.core.common.constant.state;
-
-/**
- * 是否是菜单的枚举
- *
- * @author fengshuonan
- * @date 2017年6月1日22:50:11
- */
-public enum IsMenu {
-
-    YES(1, "是"),
-    NO(0, "不是");//不是菜单的是按钮
-
-    int code;
-    String message;
-
-    IsMenu(int code, String message) {
-        this.code = code;
-        this.message = message;
-    }
-
-    public int getCode() {
-        return code;
-    }
-
-    public void setCode(int code) {
-        this.code = code;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    public static String valueOf(Integer status) {
-        if (status == null) {
-            return "";
-        } else {
-            for (IsMenu s : IsMenu.values()) {
-                if (s.getCode() == status) {
-                    return s.getMessage();
-                }
-            }
-            return "";
-        }
-    }
-}

guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/MenuWarpper.java

 package com.stylefeng.guns.modular.system.warpper;
 
-import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
-import com.stylefeng.guns.core.common.constant.state.IsMenu;
 import com.stylefeng.guns.core.base.warpper.BaseControllerWarpper;
+import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
+import com.stylefeng.guns.core.constant.IsMenu;
 
 import java.util.List;
 import java.util.Map;

guns-core/pom.xml

@@ -92,4 +92,12 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
 </project>

guns-core/src/main/java/com/stylefeng/guns/core/base/controller/GunsErrorView.java

 package com.stylefeng.guns.core.base.controller;
 
-import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.View;
 
 import javax.servlet.http.HttpServletRequest;
@@ -13,7 +12,6 @@ import java.util.Map;
  * @author fengshuonan
  * @date 2017-05-21 11:34
  */
-@Component("error")
 public class GunsErrorView implements View {
 
     @Override

guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultMultiConfig.java

+package com.stylefeng.guns.core.config;
+
+import com.stylefeng.guns.core.mutidatasource.aop.MultiSourceExAop;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 多数据源配置
+ *
+ * @author stylefeng
+ * @Date 2017/5/20 21:58
+ */
+@Configuration
+@ConditionalOnProperty(prefix = "guns", name = "muti-datasource-open", havingValue = "true")
+public class DefaultMultiConfig {
+
+    @Bean
+    public MultiSourceExAop multiSourceExAop() {
+        return new MultiSourceExAop();
+    }
+}

guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultProperties.java

+package com.stylefeng.guns.core.config;
+
+import com.stylefeng.guns.core.datasource.DruidProperties;
+import com.stylefeng.guns.core.mutidatasource.config.MutiDataSourceProperties;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+/**
+ * 默认的配置
+ *
+ * @author fengshuonan
+ * @date 2018-01-07 12:33
+ */
+@Configuration
+@PropertySource("classpath:/default-config.properties")
+public class DefaultProperties {
+
+    @Bean
+    @ConfigurationProperties(prefix = "spring.datasource")
+    public DruidProperties druidProperties() {
+        return new DruidProperties();
+    }
+
+    @Bean
+    @ConfigurationProperties(prefix = "guns.muti-datasource")
+    public MutiDataSourceProperties mutiDataSourceProperties() {
+        return new MutiDataSourceProperties();
+    }
+}

guns-core/src/main/java/com/stylefeng/guns/core/config/DefaultWebConfig.java

+package com.stylefeng.guns.core.config;
+
+import com.stylefeng.guns.core.base.controller.GunsErrorView;
+import com.stylefeng.guns.core.util.DateUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
+import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter;
+
+import javax.annotation.PostConstruct;
+import java.util.Date;
+
+@Configuration
+public class DefaultWebConfig extends WebMvcConfigurationSupport {
+
+    @Autowired
+    private RequestMappingHandlerAdapter handlerAdapter;
+
+    @Bean("error")
+    public GunsErrorView error() {
+        return new GunsErrorView();
+    }
+
+    @PostConstruct
+    public void addConversionConfig() {
+        ConfigurableWebBindingInitializer initializer = (ConfigurableWebBindingInitializer) handlerAdapter.getWebBindingInitializer();
+        GenericConversionService genericConversionService = (GenericConversionService) initializer.getConversionService();
+        genericConversionService.addConverter(new StringToDateConverter());
+    }
+
+    public class StringToDateConverter implements Converter<String, Date> {
+
+        @Override
+        public Date convert(String dateString) {
+            return DateUtil.parseTime(dateString);
+        }
+    }
+}
+
+

guns-core/src/main/java/com/stylefeng/guns/core/constant/IsMenu.java

@@ -9,7 +9,7 @@ package com.stylefeng.guns.core.constant;
 public enum IsMenu {
 
     YES(1, "是"),
-    NO(0, "不是");//不是菜单的是按钮
+    NO(0, "不是"); //不是菜单的是按钮
 
     int code;
     String message;

guns-core/src/main/java/com/stylefeng/guns/core/datasource/DruidProperties.java

 package com.stylefeng.guns.core.datasource;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 
 import java.sql.SQLException;
 
@@ -12,8 +10,6 @@ import java.sql.SQLException;
  * @author stylefeng
  * @date 2017-05-21 11:18
  */
-@Component
-@ConfigurationProperties(prefix = "spring.datasource")
 public class DruidProperties {
 
     private String url = "jdbc:mysql://127.0.0.1:3306/guns?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull";

guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/aop/MultiSourceExAop.java

@@ -12,9 +12,7 @@ import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.core.Ordered;
-import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 
@@ -25,8 +23,6 @@ import java.lang.reflect.Method;
  * @date 2017年3月5日 上午10:22:16
  */
 @Aspect
-@Component
-@ConditionalOnProperty(prefix = "guns", name = "muti-datasource-open", havingValue = "true")
 public class MultiSourceExAop implements Ordered {
 
     private Logger log = LoggerFactory.getLogger(this.getClass());

guns-core/src/main/java/com/stylefeng/guns/core/mutidatasource/config/MutiDataSourceProperties.java

 package com.stylefeng.guns.core.mutidatasource.config;
 
 import com.alibaba.druid.pool.DruidDataSource;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
 
 /**
  * 默认多数据源配置
@@ -10,8 +8,6 @@ import org.springframework.stereotype.Component;
  * @author fengshuonan
  * @date 2017-08-16 10:02
  */
-@Component
-@ConfigurationProperties(prefix = "guns.muti-datasource")
 public class MutiDataSourceProperties {
 
     private String defaultDataSourceName = "dataSourceGuns";

guns-core/src/main/resources/META-INF/spring.factories

+# AutoConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.stylefeng.guns.core.base.controller.GlobalController,\
+com.stylefeng.guns.core.config.DefaultFastjsonConfig,\
+com.stylefeng.guns.core.config.DefaultMultiConfig,\
+com.stylefeng.guns.core.config.DefaultProperties,\
+com.stylefeng.guns.core.config.DefaultWebConfig
\ No newline at end of file

guns-core/src/main/resources/default-config.properties

@@ -6,7 +6,7 @@ spring.aop.proxy-target-class=true
 
 
 ###################### mybatis-plus\u9ED8\u8BA4\u914D\u7F6E #######################
-mybatis-plus.mapper-locations=classpath*:com/stylefeng/guns/**/mapping/*.mapping
+mybatis-plus.mapper-locations=classpath*:com/stylefeng/guns/**/mapping/*.xml
 # 0:\u6570\u636E\u5E93ID\u81EA\u589E   1:\u7528\u6237\u8F93\u5165id  2:\u5168\u5C40\u552F\u4E00id(IdWorker)  3:\u5168\u5C40\u552F\u4E00ID(uuid)
 mybatis-plus.global-config.id-type=0
 mybatis-plus.global-config.db-column-underline=false