Commit 4feca00e authored by shiyu's avatar shiyu

shiro

parent d4b2a32e
...@@ -45,11 +45,41 @@ ...@@ -45,11 +45,41 @@
<artifactId>weixin-java-miniapp</artifactId> <artifactId>weixin-java-miniapp</artifactId>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId> <artifactId>shiro-spring-boot-web-starter</artifactId>
</dependency> </dependency>
-->
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring</artifactId>
<version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
<version>1.4.0</version>
<exclusions>
<exclusion>
<groupId>slf4j-api</groupId>
<artifactId>org.slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-ehcache</artifactId>
<version>1.4.0</version>
<exclusions>
<exclusion>
<groupId>slf4j-api</groupId>
<artifactId>org.slf4j</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>cn.hutool</groupId> <groupId>cn.hutool</groupId>
......
...@@ -3,7 +3,6 @@ package com.wwdz.ch.admin; ...@@ -3,7 +3,6 @@ package com.wwdz.ch.admin;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
...@@ -14,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement; ...@@ -14,7 +13,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
* @QQ:1197673878 * @QQ:1197673878
*/ */
@SpringBootApplication(scanBasePackages = { "com.wwdz.ch.db", "com.wwdz.ch.core", @SpringBootApplication(scanBasePackages = { "com.wwdz.ch.db", "com.wwdz.ch.core",
"com.wwdz.ch.admin" }, exclude = {DataSourceAutoConfiguration.class}) "com.wwdz.ch.admin" })
@MapperScan({ "com.wwdz.ch.db.dao", "com.wwdz.ch.db.dao.ex" }) @MapperScan({ "com.wwdz.ch.db.dao", "com.wwdz.ch.db.dao.ex" })
@EnableTransactionManagement @EnableTransactionManagement
@EnableScheduling @EnableScheduling
......
...@@ -81,7 +81,7 @@ public class ShiroConfig { ...@@ -81,7 +81,7 @@ public class ShiroConfig {
@Bean @Bean
@DependsOn("lifecycleBeanPostProcessor") // @DependsOn("lifecycleBeanPostProcessor")
public static DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() { public static DefaultAdvisorAutoProxyCreator defaultAdvisorAutoProxyCreator() {
DefaultAdvisorAutoProxyCreator creator = new DefaultAdvisorAutoProxyCreator(); DefaultAdvisorAutoProxyCreator creator = new DefaultAdvisorAutoProxyCreator();
creator.setProxyTargetClass(true); creator.setProxyTargetClass(true);
......
...@@ -21,7 +21,5 @@ logging: ...@@ -21,7 +21,5 @@ logging:
org.springframework: INFO org.springframework: INFO
org.mybatis: INFO org.mybatis: INFO
com.wwdz.ch.wx: DEBUG com.wwdz.ch.wx: DEBUG
com.wwdz.ch: INFO com.wwdz.ch: INFO
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<shiro-spring-boot-web-starter.version>1.4.0</shiro-spring-boot-web-starter.version> <shiro-spring-boot-web-starter.version>1.4.0</shiro-spring-boot-web-starter.version>
<hibernate-validator.version>6.0.15.Final</hibernate-validator.version> <hibernate-validator.version>6.0.15.Final</hibernate-validator.version>
<mysql-connector-java.version>5.1.46</mysql-connector-java.version> <mysql-connector-java.version>5.1.46</mysql-connector-java.version>
<druid-spring-boot-starter.version>1.2.16</druid-spring-boot-starter.version> <druid-spring-boot-starter.version>1.1.10</druid-spring-boot-starter.version>
<weixin-java-pay.version>3.3.0</weixin-java-pay.version> <weixin-java-pay.version>3.3.0</weixin-java-pay.version>
<weixin-java-miniapp.version>3.3.0</weixin-java-miniapp.version> <weixin-java-miniapp.version>3.3.0</weixin-java-miniapp.version>
<qcloudsms.version>1.0.5</qcloudsms.version> <qcloudsms.version>1.0.5</qcloudsms.version>
...@@ -33,6 +33,9 @@ ...@@ -33,6 +33,9 @@
<qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version> <qiniu-java-sdk.version>[7.2.0, 7.2.99]</qiniu-java-sdk.version>
<spring-boot-starter-json.version>2.0.4.RELEASE</spring-boot-starter-json.version> <spring-boot-starter-json.version>2.0.4.RELEASE</spring-boot-starter-json.version>
<spring-boot-starter-mail.version>2.0.4.RELEASE</spring-boot-starter-mail.version> <spring-boot-starter-mail.version>2.0.4.RELEASE</spring-boot-starter-mail.version>
<spring-boot-starter-web.version>2.0.4.RELEASE</spring-boot-starter-web.version>
<spring-boot-starter-sercurity.version>2.0.4.RELEASE</spring-boot-starter-sercurity.version>
<mapstruct.version>1.4.2.Final</mapstruct.version>
</properties> </properties>
<modules> <modules>
...@@ -58,12 +61,12 @@ ...@@ -58,12 +61,12 @@
<version>${pagehelper-spring-boot-starter.version}</version> <version>${pagehelper-spring-boot-starter.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
<artifactId>shiro-spring-boot-web-starter</artifactId> <artifactId>shiro-spring-boot-web-starter</artifactId>
<version>${shiro-spring-boot-web-starter.version}</version> <version>${shiro-spring-boot-web-starter.version}</version>
</dependency> </dependency>
-->
<dependency> <dependency>
<groupId>org.hibernate.validator</groupId> <groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId> <artifactId>hibernate-validator</artifactId>
...@@ -145,11 +148,11 @@ ...@@ -145,11 +148,11 @@
</dependencyManagement> </dependencyManagement>
<dependencies> <dependencies>
<!-- 热部署模块 --> <!-- 热部署模块 -->
<dependency> <!-- <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId> <artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>-->
<!-- 测试模块 --> <!-- 测试模块 -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment