diff --git a/pom.xml b/pom.xml index f92533b..64200bc 100644 --- a/pom.xml +++ b/pom.xml @@ -198,6 +198,20 @@ lombok ${lombok.version} + + + + com.xinelu + xinelu-nurse-manage + ${xinelu.version} + + + + + com.xinelu + xinelu-nurse-applet + ${xinelu.version} + @@ -208,6 +222,8 @@ xinelu-quartz xinelu-generator xinelu-common + xinelu-nurse-manage + xinelu-nurse-applet pom diff --git a/xinelu-admin/pom.xml b/xinelu-admin/pom.xml index c420dbf..86cb1d2 100644 --- a/xinelu-admin/pom.xml +++ b/xinelu-admin/pom.xml @@ -61,6 +61,17 @@ xinelu-generator + + + com.xinelu + xinelu-nurse-manage + + + + + com.xinelu + xinelu-nurse-applet + diff --git a/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java b/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java index 4533991..0810dfc 100644 --- a/xinelu-framework/src/main/java/com/xinelu/framework/config/SecurityConfig.java +++ b/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() diff --git a/xinelu-nurse-applet/pom.xml b/xinelu-nurse-applet/pom.xml new file mode 100644 index 0000000..63437ec --- /dev/null +++ b/xinelu-nurse-applet/pom.xml @@ -0,0 +1,44 @@ + + + + xinelu + com.xinelu + 0.0.1 + + 4.0.0 + + xinelu-nurse-applet + + + 护理护肤、商城、积分兑换、在线咨询小程序和APP模块 + + + + + + com.xinelu + xinelu-common + + + + + com.xinelu + xinelu-nurse-manage + + + + + org.projectlombok + lombok + + + + + io.swagger + swagger-models + 1.6.2 + + + \ No newline at end of file diff --git a/xinelu-nurse-manage/pom.xml b/xinelu-nurse-manage/pom.xml new file mode 100644 index 0000000..8da76a1 --- /dev/null +++ b/xinelu-nurse-manage/pom.xml @@ -0,0 +1,38 @@ + + + + xinelu + com.xinelu + 0.0.1 + + 4.0.0 + + xinelu-nurse-manage + + + 护理护肤、商城、积分兑换、在线咨询管理端模块 + + + + + + com.xinelu + xinelu-common + + + + + org.projectlombok + lombok + + + + + io.swagger + swagger-models + 1.6.2 + + + \ No newline at end of file