浏览代码

bug修改

wangzhengliang 3 年之前
父节点
当前提交
07814f4ec1

+ 11 - 0
pom.xml

@@ -138,6 +138,17 @@
                 </configuration>
                 </configuration>
             </plugin>
             </plugin>
 
 
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <!-- 排除 doc 路径下的api文件 -->
+                        <exclude>**/doc/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
             <!-- smart doc -->
             <!-- smart doc -->
             <plugin>
             <plugin>
                 <groupId>com.github.shalousun</groupId>
                 <groupId>com.github.shalousun</groupId>

+ 3 - 3
src/main/java/com/chuanghai/ihotel/config/RedissionConfiguration.java

@@ -17,8 +17,8 @@ public class RedissionConfiguration {
     private String redisHost;
     private String redisHost;
     @Value("${spring.redis.port}")
     @Value("${spring.redis.port}")
     private String redisPort;
     private String redisPort;
-//    @Value("${spring.redis.password}")
-//    private String redisPwd;
+    @Value("${spring.redis.password}")
+    private String redisPwd;
 
 
     /**
     /**
      * 配置分布式锁的redisson
      * 配置分布式锁的redisson
@@ -30,7 +30,7 @@ public class RedissionConfiguration {
 
 
         //单机方式
         //单机方式
         config.useSingleServer()
         config.useSingleServer()
-//                .setPassword(redisPwd)
+                .setPassword(redisPwd)
                 .setAddress("redis://"+redisHost+":"+redisPort);
                 .setAddress("redis://"+redisHost+":"+redisPort);
 
 
         //集群
         //集群

文件差异内容过多而无法显示
+ 3 - 4
src/main/java/com/chuanghai/ihotel/util/DoorLockAESUtil.java


文件差异内容过多而无法显示
+ 5 - 6
src/main/java/com/chuanghai/ihotel/util/RSAUtils.java


+ 3 - 3
src/main/resources/application.yml

@@ -17,14 +17,14 @@ spring:
     type: redis
     type: redis
     redis:
     redis:
       # 缓存时间 600s
       # 缓存时间 600s
-      time-to-live: 600
+      time-to-live: 600000
       key-prefix: SPRING_CACHE_
       key-prefix: SPRING_CACHE_
       use-key-prefix: true
       use-key-prefix: true
       cache-null-values: true
       cache-null-values: true
   redis:
   redis:
-    host: 192.168.126.131
+    host: localhost
     port: 6379
     port: 6379
-    # password: chuanghai.redis
+    password: chuanghai.redis
     jedis:
     jedis:
       pool:
       pool:
         max-active: 100
         max-active: 100