From 0c93ac75c67df7e8124439ad49de6022d1485217 Mon Sep 17 00:00:00 2001 From: iLove9ou <624576640@qq.com> Date: Thu, 21 Jun 2018 11:35:22 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8Dtomcat=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E4=B8=8D=E5=8A=A0=E8=BD=BD=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=97=AE=E9=A2=98=202=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Ddefault=20byName=20bean=E5=88=9B=E5=BB=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=203=E3=80=81=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E5=90=8D=E7=A7=B0cache-cloud=E4=B8=8D=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E9=97=AE=E9=A2=98,=E6=94=B9=E6=88=90cache=5Fcloud?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sohu/cache/app/ApplicationStarter.java | 3 ++- .../sohu/cache/web/controller/BaseController.java | 14 ++++++++++---- .../cache/web/service/impl/AppServiceImpl.java | 11 +++++------ .../cache/web/service/impl/ConfigServiceImpl.java | 2 ++ .../web/service/impl/MemFaultServiceImpl.java | 6 ++++-- .../web/service/impl/ServerDataServiceImpl.java | 2 ++ .../impl/UserLoginStatusCookieServiceImpl.java | 2 ++ .../impl/UserLoginStatusSessionServiceImpl.java | 2 ++ .../cache/web/service/impl/UserServiceImpl.java | 2 ++ cachecloud-open-web/src/main/swap/local.properties | 6 +++--- .../src/main/swap/online.properties | 6 +++--- 11 files changed, 37 insertions(+), 19 deletions(-) diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/app/ApplicationStarter.java b/cachecloud-open-web/src/main/java/com/sohu/cache/app/ApplicationStarter.java index edf741ca..397a44c4 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/app/ApplicationStarter.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/app/ApplicationStarter.java @@ -3,6 +3,7 @@ import org.springframework.boot.Banner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.web.SpringBootServletInitializer; import org.springframework.context.annotation.ImportResource; /** @@ -10,7 +11,7 @@ */ @SpringBootApplication @ImportResource("classpath:spring/spring.xml") -public class ApplicationStarter { +public class ApplicationStarter extends SpringBootServletInitializer { public static void main(String[] args) { SpringApplication app = new SpringApplication(ApplicationStarter.class); diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/controller/BaseController.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/controller/BaseController.java index 81dfbe4a..653353f8 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/controller/BaseController.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/controller/BaseController.java @@ -11,6 +11,7 @@ import java.util.Map; import java.util.Set; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,14 +48,19 @@ public class BaseController { protected final Logger logger = LoggerFactory.getLogger(getClass()); + @Resource protected UserService userService; - + + @Resource protected AppService appService; - + + @Resource protected MachineCenter machineCenter; - + + @Resource protected UserLoginStatusService userLoginStatusService; - + + @Resource protected RedisCenter redisCenter; public void setUserService(UserService userService) { diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/AppServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/AppServiceImpl.java index 4998fb0f..73a2dcb2 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/AppServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/AppServiceImpl.java @@ -9,23 +9,22 @@ import com.sohu.cache.util.TypeUtil; import com.sohu.cache.web.enums.SuccessEnum; import com.sohu.cache.web.service.AppService; - -import org.springframework.util.Assert; - -import java.util.*; - import org.apache.commons.collections.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import redis.clients.jedis.HostAndPort; +import java.util.*; + /** * 应用操作实现类 * * @author leifu * @Time 2014年10月21日 */ +@Service public class AppServiceImpl implements AppService { private Logger logger = LoggerFactory.getLogger(AppServiceImpl.class); diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ConfigServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ConfigServiceImpl.java index 5c1827d1..478004c2 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ConfigServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ConfigServiceImpl.java @@ -17,12 +17,14 @@ import com.sohu.cache.util.ConstUtils; import com.sohu.cache.web.enums.SuccessEnum; import com.sohu.cache.web.service.ConfigService; +import org.springframework.stereotype.Service; /** * @author leifu * @Date 2016年5月23日 * @Time 上午10:35:26 */ +@Service public class ConfigServiceImpl implements ConfigService { private Logger logger = LoggerFactory.getLogger(ConfigServiceImpl.class); diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/MemFaultServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/MemFaultServiceImpl.java index e7a617d4..ae64d4ba 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/MemFaultServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/MemFaultServiceImpl.java @@ -1,10 +1,11 @@ package com.sohu.cache.web.service.impl; -import java.util.List; - import com.sohu.cache.dao.MemFaultDao; import com.sohu.cache.entity.InstanceFault; import com.sohu.cache.web.service.MemFaultService; +import org.springframework.stereotype.Service; + +import java.util.List; /** * 故障服务 @@ -12,6 +13,7 @@ * @Date 2015-6-6 * @Time 下午10:03:59 */ +@Service public class MemFaultServiceImpl implements MemFaultService { /** diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ServerDataServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ServerDataServiceImpl.java index 4379f997..07e1735a 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ServerDataServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/ServerDataServiceImpl.java @@ -11,7 +11,9 @@ import com.sohu.cache.entity.ServerStatus; import com.sohu.cache.server.data.Server; import com.sohu.cache.web.service.ServerDataService; +import org.springframework.stereotype.Service; +@Service public class ServerDataServiceImpl implements ServerDataService { private static final Logger logger = LoggerFactory.getLogger(ServerDataServiceImpl.class); //持久化接口 diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusCookieServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusCookieServiceImpl.java index 3af659ae..11f27251 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusCookieServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusCookieServiceImpl.java @@ -8,6 +8,7 @@ import com.sohu.cache.util.ConstUtils; import com.sohu.cache.web.service.UserLoginStatusService; +import org.springframework.stereotype.Service; /** * cookie保护登录状态 @@ -15,6 +16,7 @@ * @Date 2016年6月15日 * @Time 下午1:31:17 */ +@Service public class UserLoginStatusCookieServiceImpl implements UserLoginStatusService { @Override diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusSessionServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusSessionServiceImpl.java index c1d98d75..2c31bbac 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusSessionServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserLoginStatusSessionServiceImpl.java @@ -7,6 +7,7 @@ import org.apache.commons.lang.math.NumberUtils; import com.sohu.cache.web.service.UserLoginStatusService; +import org.springframework.stereotype.Service; /** @@ -15,6 +16,7 @@ * @Date 2016年6月15日 * @Time 下午1:31:05 */ +@Service public class UserLoginStatusSessionServiceImpl implements UserLoginStatusService { @Override diff --git a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserServiceImpl.java b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserServiceImpl.java index 116d6d69..a4c8bb38 100644 --- a/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserServiceImpl.java +++ b/cachecloud-open-web/src/main/java/com/sohu/cache/web/service/impl/UserServiceImpl.java @@ -11,6 +11,7 @@ import com.sohu.cache.entity.AppUser; import com.sohu.cache.web.enums.SuccessEnum; import com.sohu.cache.web.service.UserService; +import org.springframework.stereotype.Service; /** * 用户管理实现 @@ -18,6 +19,7 @@ * @Date 2014年10月27日 * @Time 上午9:57:43 */ +@Service public class UserServiceImpl implements UserService { private Logger logger = LoggerFactory.getLogger(UserServiceImpl.class); diff --git a/cachecloud-open-web/src/main/swap/local.properties b/cachecloud-open-web/src/main/swap/local.properties index 8a7d77b6..e2d84265 100644 --- a/cachecloud-open-web/src/main/swap/local.properties +++ b/cachecloud-open-web/src/main/swap/local.properties @@ -1,6 +1,6 @@ -cachecloud.db.url = jdbc:mysql://127.0.0.1:3306/cache-cloud -cachecloud.db.user = cachecloud -cachecloud.db.password = +cachecloud.db.url = jdbc:mysql://127.0.0.1:3306/cache_cloud +cachecloud.db.user = root +cachecloud.db.password = 123456 cachecloud.maxPoolSize = 20 isClustered = true diff --git a/cachecloud-open-web/src/main/swap/online.properties b/cachecloud-open-web/src/main/swap/online.properties index 64451922..528a3115 100644 --- a/cachecloud-open-web/src/main/swap/online.properties +++ b/cachecloud-open-web/src/main/swap/online.properties @@ -1,6 +1,6 @@ -cachecloud.db.url = jdbc:mysql://127.0.0.1:3306/cache-cloud -cachecloud.db.user = cachecloud -cachecloud.db.password = +cachecloud.db.url = jdbc:mysql://127.0.0.1:3306/cache_cloud +cachecloud.db.user = root +cachecloud.db.password = 123456 cachecloud.maxPoolSize = 20 isClustered = true