转移系统的配置从sys到main模块

guns-sys/pom.xml

@@ -24,12 +24,6 @@
             <version>1.0.0</version>
             <version>1.0.0</version>
         </dependency>
         </dependency>
 
 
-        <dependency>
-            <groupId>cn.stylefeng</groupId>
-            <artifactId>guns-base-db-container</artifactId>
-            <version>1.0.0</version>
-        </dependency>
-
     </dependencies>
     </dependencies>
 
 
     <build>
     <build>

guns-vip-main/pom.xml

@@ -38,6 +38,13 @@
             <version>1.0.0</version>
             <version>1.0.0</version>
         </dependency>
         </dependency>
 
 
+        <!-- 数据源容器-->
+        <dependency>
+            <groupId>cn.stylefeng</groupId>
+            <artifactId>guns-base-db-container</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
         <!-- 分布式job -->
         <!-- 分布式job -->
         <!--        <dependency>-->
         <!--        <dependency>-->
         <!--            <groupId>cn.stylefeng</groupId>-->
         <!--            <groupId>cn.stylefeng</groupId>-->

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/properties/GunsPropertiesConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/GunsPropertiesConfig.java

-package cn.stylefeng.guns.sys.config.properties;
+package cn.stylefeng.guns.config;
 
 
 import cn.stylefeng.guns.sys.core.properties.BeetlProperties;
 import cn.stylefeng.guns.sys.core.properties.BeetlProperties;
 import cn.stylefeng.guns.sys.core.properties.GunsProperties;
 import cn.stylefeng.guns.sys.core.properties.GunsProperties;
@@ -15,12 +15,24 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @Configuration
 public class GunsPropertiesConfig {
 public class GunsPropertiesConfig {
 
 
+    /**
+     * beetl模板的配置
+     *
+     * @author fengshuonan
+     * @Date 2019-06-13 08:55
+     */
     @Bean
     @Bean
     @ConfigurationProperties(prefix = BeetlProperties.BEETLCONF_PREFIX)
     @ConfigurationProperties(prefix = BeetlProperties.BEETLCONF_PREFIX)
     public BeetlProperties beetlProperties() {
     public BeetlProperties beetlProperties() {
         return new BeetlProperties();
         return new BeetlProperties();
     }
     }
 
 
+    /**
+     * Guns的属性配置
+     *
+     * @author fengshuonan
+     * @Date 2019-06-13 08:56
+     */
     @Bean
     @Bean
     @ConfigurationProperties(prefix = GunsProperties.PREFIX)
     @ConfigurationProperties(prefix = GunsProperties.PREFIX)
     public GunsProperties gunsProperties() {
     public GunsProperties gunsProperties() {

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/SwaggerConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/SwaggerConfig.java

@@ -13,10 +13,9 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.sys.config;
+package cn.stylefeng.guns.config;
 
 
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Configuration;
 import springfox.documentation.builders.ApiInfoBuilder;
 import springfox.documentation.builders.ApiInfoBuilder;
@@ -36,7 +35,6 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2;
  */
  */
 @Configuration
 @Configuration
 @EnableSwagger2
 @EnableSwagger2
-@ConditionalOnProperty(prefix = "guns", name = "swagger-open", havingValue = "true")
 public class SwaggerConfig {
 public class SwaggerConfig {
 
 
     @Bean
     @Bean

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/EhCacheConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/cache/EhCacheConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.sys.config;
+package cn.stylefeng.guns.config.cache;
 
 
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cache.annotation.EnableCaching;

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/datasource/DataSourceConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/DataSourceConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.sys.config.datasource;
+package cn.stylefeng.guns.config.datasource;
 
 
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.config.properties.DruidProperties;
 import cn.stylefeng.roses.core.mutidatasource.aop.MultiSourceExAop;
 import cn.stylefeng.roses.core.mutidatasource.aop.MultiSourceExAop;

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/datasource/PluginsConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/PluginsConfig.java

-package cn.stylefeng.guns.sys.config.datasource;
+package cn.stylefeng.guns.config.datasource;
 
 
 import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
 import cn.stylefeng.guns.sys.core.shiro.ShiroKit;
 import cn.stylefeng.roses.core.metadata.CustomMetaObjectHandler;
 import cn.stylefeng.roses.core.metadata.CustomMetaObjectHandler;

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/datasource/SqlSessionFactoryConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/datasource/SqlSessionFactoryConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.sys.config.datasource;
+package cn.stylefeng.guns.config.datasource;
 
 
 import cn.stylefeng.datasource.container.context.DataSourceContext;
 import cn.stylefeng.datasource.container.context.DataSourceContext;
 import cn.stylefeng.datasource.container.context.SqlSessionFactoryContext;
 import cn.stylefeng.datasource.container.context.SqlSessionFactoryContext;

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/BeetlConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/web/BeetlConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.sys.config.web;
+package cn.stylefeng.guns.config.web;
 
 
 import cn.stylefeng.guns.sys.core.beetl.BeetlConfiguration;
 import cn.stylefeng.guns.sys.core.beetl.BeetlConfiguration;
 import cn.stylefeng.guns.sys.core.properties.BeetlProperties;
 import cn.stylefeng.guns.sys.core.properties.BeetlProperties;

guns-vip-main/src/main/java/cn/stylefeng/guns/config/ShiroConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/web/ShiroConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.config;
+package cn.stylefeng.guns.config.web;
 
 
 import cn.stylefeng.guns.oauth.core.shiro.matcher.WithOAuthTokenMatcher;
 import cn.stylefeng.guns.oauth.core.shiro.matcher.WithOAuthTokenMatcher;
 import cn.stylefeng.guns.sys.core.constant.Const;
 import cn.stylefeng.guns.sys.core.constant.Const;

guns-vip-main/src/main/java/cn/stylefeng/guns/config/SpringSessionConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/web/SpringSessionConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.config;
+package cn.stylefeng.guns.config.web;
 
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 
 

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/String2DateConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/web/String2DateConfig.java

-package cn.stylefeng.guns.sys.config.web;
+package cn.stylefeng.guns.config.web;
 
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.DateUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

guns-sys/src/main/java/cn/stylefeng/guns/sys/config/web/WebConfig.java → guns-vip-main/src/main/java/cn/stylefeng/guns/config/web/WebConfig.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package cn.stylefeng.guns.sys.config.web;
+package cn.stylefeng.guns.config.web;
 
 
 import cn.stylefeng.guns.sys.core.attribute.AttributeSetInteceptor;
 import cn.stylefeng.guns.sys.core.attribute.AttributeSetInteceptor;
 import cn.stylefeng.guns.sys.core.constant.Const;
 import cn.stylefeng.guns.sys.core.constant.Const;