处理问题

wuweiit · Jun 3, 2018 · f32f28a · f32f28a
1 parent 507b480
commit f32f28a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/src/main/java/org/marker/mushroom/utils/GeneratePass.java b/src/main/java/org/marker/mushroom/utils/GeneratePass.java
@@ -1,7 +1,5 @@
 package org.marker.mushroom.utils;
 
-import org.marker.mushroom.core.config.impl.SystemConfig;
-import org.marker.mushroom.holder.SpringContextHolder;
 import org.marker.security.Base64;
 import org.marker.security.DES;
 import org.marker.security.MD5;
@@ -15,8 +13,7 @@ public class GeneratePass {
 
 
 	public static String encode(String password) {
-		SystemConfig syscfg = SystemConfig.getInstance();
-		String key = syscfg.get("secret_key");
+		String key = "iSDCRbyRZP0=";
 		try {
 			return MD5.getMD5Code(Base64.encode(DES.encrypt(
                        password.getBytes(), key)));

diff --git a/src/main/resources/config.properties b/src/main/resources/config.properties
@@ -23,9 +23,9 @@ mushroom.db.user=db_mrcms
 mushroom.db.pass=SwTaW4D7x4
 
 # redis config
-#mrcms.redis.host=localhost
-#mrcms.redis.port=6379
-#mrcms.redis.password=
-#mrcms.redis.timeout=2000
+mrcms.redis.host=192.168.1.4
+mrcms.redis.port=6379
+mrcms.redis.password=
+mrcms.redis.timeout=2000
 
 
diff --git a/src/main/resources/config/spring/spring-timer-task.xml b/src/main/resources/config/spring/spring-timer-task.xml
@@ -16,9 +16,9 @@
 
 
     <!-- Spring TimerTask(定时任务)的注解支持 --> 
-    <task:annotation-driven />
+    <!--<task:annotation-driven />-->
 	<!-- 扫描任务类 -->
- 	<context:component-scan base-package="org.marker.mushroom.task" />
+ 	<!--<context:component-scan base-package="org.marker.mushroom.task" />-->