LIVE_YE 2 éve
szülő
commit
d20443a02f

+ 39 - 22
pom.xml

@@ -85,30 +85,47 @@
                 <artifactId>jna-platform</artifactId>
                 <version>${jna.version}</version>
             </dependency>
-			
-<!--            &lt;!&ndash; swagger2&ndash;&gt;
-            <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger2</artifactId>
-                <version>${swagger.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-annotations</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>io.swagger</groupId>
-                        <artifactId>swagger-models</artifactId>
-                    </exclusion>
-                </exclusions>
+
+            <dependency>
+                <groupId>cn.jpush.api</groupId>
+                <artifactId>jpush-client</artifactId>
+                <version>3.4.3</version>
             </dependency>
-			
-            &lt;!&ndash; swagger2-UI&ndash;&gt;
+
             <dependency>
-                <groupId>io.springfox</groupId>
-                <artifactId>springfox-swagger-ui</artifactId>
-                <version>${swagger.version}</version>
-            </dependency>-->
+                <groupId>org.springframework.data</groupId>
+                <artifactId>spring-data-redis</artifactId>
+                <version>2.5.11</version>
+            </dependency>
+
+            <dependency>
+                <groupId>cn.jpush.api</groupId>
+                <artifactId>jiguang-common</artifactId>
+                <version>1.1.7</version>
+            </dependency>
+            <!--            &lt;!&ndash; swagger2&ndash;&gt;
+                        <dependency>
+                            <groupId>io.springfox</groupId>
+                            <artifactId>springfox-swagger2</artifactId>
+                            <version>${swagger.version}</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>io.swagger</groupId>
+                                    <artifactId>swagger-annotations</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                    <groupId>io.swagger</groupId>
+                                    <artifactId>swagger-models</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
+
+                        &lt;!&ndash; swagger2-UI&ndash;&gt;
+                        <dependency>
+                            <groupId>io.springfox</groupId>
+                            <artifactId>springfox-swagger-ui</artifactId>
+                            <version>${swagger.version}</version>
+                        </dependency>-->
             
             <!--io常用工具类 -->
             <dependency>

+ 10 - 1
ruoyi-admin/src/main/resources/application-druid.yml

@@ -54,4 +54,13 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true
+
+
+#极光推送
+jpush:
+    environment: false
+    masterSecret: vf8g4f84f74v8f4d78g4ff48
+push:
+    appKey: 54456f5d662dfdsg
+

+ 20 - 0
ruoyi-common/pom.xml

@@ -29,6 +29,26 @@
             <version>1.0.0</version>
         </dependency>
 
+        <!---->
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <version>3.4.3</version>
+        </dependency>
+
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jiguang-common</artifactId>
+            <version>1.1.7</version>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-redis</artifactId>
+            <version>2.5.11</version>
+        </dependency>
+
 <!--        &lt;!&ndash;hutool&ndash;&gt;
         <dependency>
             <groupId>cn.hutool</groupId>

+ 4 - 3
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -9,6 +9,7 @@ import javax.servlet.http.HttpServletRequest;
 import cn.hutool.cache.CacheUtil;
 import cn.hutool.cache.impl.CacheObj;
 import cn.hutool.cache.impl.TimedCache;
+import com.ruoyi.common.core.redis.RedisCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -49,9 +50,9 @@ public class TokenService
     protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
 
     private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
-/*
+
     @Autowired
-    private RedisCache redisCache;*/
+    private RedisCache redisCache;
 
     private final TimedCache<String, Object> CACHE_OBJECT = CacheUtil.newTimedCache(expireTime * 60 * 1000);
 
@@ -150,7 +151,7 @@ public class TokenService
         String userKey = getTokenKey(loginUser.getToken());
         CACHE_OBJECT.put(userKey, loginUser);
 
-        //redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
+        redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }
 
     /**

+ 0 - 1
ruoyi-system/pom.xml

@@ -22,7 +22,6 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
-
     </dependencies>
 
 </project>