瀏覽代碼

:white_check_mark: 升级swagger

Aron 6 年之前
父節點
當前提交
6820ea050e

+ 5 - 5
pom.xml

@@ -252,15 +252,15 @@
 			<version>2.9.2</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.xiaoymin</groupId>
-			<artifactId>swagger-bootstrap-ui</artifactId>
-			<version>1.8.2</version>
-		</dependency>
-		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.9.2</version>
 		</dependency>
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>swagger-bootstrap-ui</artifactId>
+			<version>1.9.3</version>
+		</dependency>
 
 		<dependency>
 			<groupId>org.jsoup</groupId>

+ 2 - 2
src/main/java/com/ifast/common/base/BaseDO.java

@@ -12,10 +12,10 @@ import java.util.Date;
 public class BaseDO implements Serializable {
 	/** 由mybatis-plus.global-config.sql-injector:com.baomidou.mybatisplus.mapper.LogicSqlInjector自动维护 */
 	@TableLogic
-	private boolean deleted;
+	private Boolean deleted;
 	/** 由MyBatisConfig.optimisticLockerInterceptor自动维护 */
 	@Version
-	private int version;
+	private Integer version;
 	/** 由MySQL自动维护 */
 	private Date createAt;
 	private Date updateAt;

+ 7 - 7
src/main/java/com/ifast/common/shiro/config/ShiroConfiguration.java

@@ -78,18 +78,18 @@ public class ShiroConfiguration {
         sessionManager.setSessionDAO(sessionDAO);
         return sessionManager;
     }
-    
-    @Bean(name="shiroCacheManager")
-    @DependsOn({"springContextHolder","cacheConfiguration"})
+
+    @Bean(name = "shiroCacheManager")
+    @DependsOn({"springContextHolder", "cacheConfiguration"})
     public CacheManager cacheManager() {
-    	SpringCacheManagerWrapper springCacheManager = new SpringCacheManagerWrapper();
-    	org.springframework.cache.CacheManager cacheManager = SpringContextHolder.getBean(org.springframework.cache.CacheManager.class);
-    	springCacheManager.setCacheManager(cacheManager);
+        SpringCacheManagerWrapper springCacheManager = new SpringCacheManagerWrapper();
+        org.springframework.cache.CacheManager cacheManager = SpringContextHolder.getBean(org.springframework.cache.CacheManager.class);
+        springCacheManager.setCacheManager(cacheManager);
         return springCacheManager;
     }
 
     @Bean
-    JWTAuthorizingRealm jwtAuthorizingRealm(MenuService menuService, RoleService roleService){
+    JWTAuthorizingRealm jwtAuthorizingRealm(MenuService menuService, RoleService roleService) {
         JWTAuthorizingRealm realm = new JWTAuthorizingRealm(menuService, roleService);
         realm.setCachingEnabled(true);
         realm.setAuthorizationCachingEnabled(true);

+ 9 - 1
src/main/java/com/ifast/common/utils/PasswdUtils.java

@@ -1,5 +1,7 @@
 package com.ifast.common.utils;
 
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.crypto.hash.Sha256Hash;
 import org.apache.shiro.crypto.hash.SimpleHash;
 
@@ -9,12 +11,18 @@ import org.apache.shiro.crypto.hash.SimpleHash;
  * </pre>
  * <small> 2019-05-09 09:42 | Aron</small>
  */
+@Slf4j
 public abstract class PasswdUtils {
 
     public final static String ALGORITHM = Sha256Hash.ALGORITHM_NAME;
 
-    public static String get(String passwd, String salt) {
+    private final static String DEFAULT_PASSWD = "123456";
 
+    public static String get(String passwd, String salt) {
+        if(StringUtils.isBlank(passwd)){
+            log.info("密码为null,使用默认密码:{}", DEFAULT_PASSWD);
+            passwd = DEFAULT_PASSWD;
+        }
         return new Sha256Hash(passwd, hash(salt)).toString();
     }
 

+ 2 - 0
src/main/java/com/ifast/demo/controller/DemoController.java

@@ -11,6 +11,7 @@ import com.ifast.demo.domain.DemoDO;
 import com.ifast.demo.service.DemoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +27,7 @@ import java.util.Arrays;
  */
 @Controller
 @RequestMapping("/demo/demoBase")
+@Profile("!prod")
 public class DemoController extends BaseController {
 	@Autowired
 	private DemoService demoBaseService;

+ 2 - 0
src/main/java/com/ifast/demo/controller/SmsController.java

@@ -6,6 +6,7 @@ import com.ifast.common.component.sms.dto.SendDTO;
 import com.ifast.common.component.sms.dto.VerifyDTO;
 import com.ifast.common.component.sms.support.SmsManager;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/api/sms")
+@Profile("!prod")
 public class SmsController {
 
     @Autowired private SmsManager smsSerevice;

+ 2 - 0
src/main/java/com/ifast/demo/controller/TestController.java

@@ -2,6 +2,7 @@ package com.ifast.demo.controller;
 
 import com.ifast.demo.dto.TestValidDTO;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.core.ValueOperations;
 import org.springframework.web.bind.annotation.*;
@@ -19,6 +20,7 @@ import java.util.concurrent.TimeUnit;
  */
 @RestController
 @RequestMapping("/test")
+@Profile("!prod")
 public class TestController {
 
     @Autowired