新增护理等服务模块

pom.xml

@@ -198,6 +198,20 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
             </dependency>
+
+            <!-- 护理护肤、商城、积分兑换、在线咨询管理端模块 -->
+            <dependency>
+                <groupId>com.xinelu</groupId>
+                <artifactId>xinelu-nurse-manage</artifactId>
+                <version>${xinelu.version}</version>
+            </dependency>
+
+            <!-- 护理护肤、商城、积分兑换、在线咨询小程序和APP模块 -->
+            <dependency>
+                <groupId>com.xinelu</groupId>
+                <artifactId>xinelu-nurse-applet</artifactId>
+                <version>${xinelu.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -208,6 +222,8 @@
         <module>xinelu-quartz</module>
         <module>xinelu-generator</module>
         <module>xinelu-common</module>
+        <module>xinelu-nurse-manage</module>
+        <module>xinelu-nurse-applet</module>
     </modules>
     <packaging>pom</packaging>
 

xinelu-admin/pom.xml

@@ -61,6 +61,17 @@
             <artifactId>xinelu-generator</artifactId>
         </dependency>
 
+        <!-- 护理护肤、商城、积分兑换、在线咨询小程序和APP模块 -->
+        <dependency>
+            <groupId>com.xinelu</groupId>
+            <artifactId>xinelu-nurse-manage</artifactId>
+        </dependency>
+
+        <!-- 护理护肤、商城、积分兑换、在线咨询小程序和APP模块 -->
+        <dependency>
+            <groupId>com.xinelu</groupId>
+            <artifactId>xinelu-nurse-applet</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java

@@ -20,6 +20,8 @@ import org.springframework.security.web.authentication.UsernamePasswordAuthentic
 import org.springframework.security.web.authentication.logout.LogoutFilter;
 import org.springframework.web.filter.CorsFilter;
 
+import javax.annotation.Resource;
+
 /**
  * spring security配置
  *
@@ -30,7 +32,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
     /**
      * 自定义用户认证逻辑
      */
-    @Autowired
+    @Resource
     private UserDetailsService userDetailsService;
 
     /**
@@ -109,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                 .antMatchers("/login", "/register", "/captchaImage").anonymous()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
-                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
+                .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**", "/applet/test/**", "/nurseApplet/**", "/nurseApp/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()
                 .and()

xinelu-nurse-applet/pom.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xinelu</artifactId>
+        <groupId>com.xinelu</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>xinelu-nurse-applet</artifactId>
+
+    <description>
+        护理护肤、商城、积分兑换、在线咨询小程序和APP模块
+    </description>
+
+    <dependencies>
+        <!-- 通用工具-->
+        <dependency>
+            <groupId>com.xinelu</groupId>
+            <artifactId>xinelu-common</artifactId>
+        </dependency>
+
+        <!-- 护理护肤、商城、积分兑换、在线咨询管理端模块 -->
+        <dependency>
+            <groupId>com.xinelu</groupId>
+            <artifactId>xinelu-nurse-manage</artifactId>
+        </dependency>
+
+        <!-- lombok 依赖-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+    </dependencies>
+</project>

xinelu-nurse-manage/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>xinelu</artifactId>
+        <groupId>com.xinelu</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>xinelu-nurse-manage</artifactId>
+
+    <description>
+        护理护肤、商城、积分兑换、在线咨询管理端模块
+    </description>
+
+    <dependencies>
+        <!-- 系统公共模块 -->
+        <dependency>
+            <groupId>com.xinelu</groupId>
+            <artifactId>xinelu-common</artifactId>
+        </dependency>
+
+        <!-- lombok 依赖-->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+
+        <!-- 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 -->
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-models</artifactId>
+            <version>1.6.2</version>
+        </dependency>
+    </dependencies>
+</project>