gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangxin
2018-02-23 09:16:32 +08:00
parent 606bc2a0c9
commit 3571544622
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -31,9 +31,12 @@ import com.nis.web.service.configuration.FtpCfgService;
import com.nis.web.service.configuration.IpCfgService; import com.nis.web.service.configuration.IpCfgService;
import com.nis.web.service.configuration.MailCfgService; import com.nis.web.service.configuration.MailCfgService;
import com.nis.web.service.configuration.MediaCfgService; import com.nis.web.service.configuration.MediaCfgService;
import com.nis.web.service.configuration.ServiceDictInfoService;
import com.nis.web.service.configuration.SslCfgService; import com.nis.web.service.configuration.SslCfgService;
import com.nis.web.service.configuration.SysDictInfoService;
import com.nis.web.service.configuration.TunnelCfgService; import com.nis.web.service.configuration.TunnelCfgService;
import com.nis.web.service.configuration.WebCfgService; import com.nis.web.service.configuration.WebCfgService;
import com.nis.web.service.systemService.ServiceConfigInfoService;
import com.nis.web.service.systemService.SystemServiceService; import com.nis.web.service.systemService.SystemServiceService;
public class BaseController { public class BaseController {
@@ -92,9 +95,16 @@ public class BaseController {
@Autowired @Autowired
protected SystemServiceService systemServiceService; protected SystemServiceService systemServiceService;
@Autowired
protected ServiceDictInfoService serviceDictInfoService;
@Autowired
protected SysDictInfoService sysDictInfoService;
protected final Logger logger = Logger.getLogger(this.getClass()); protected final Logger logger = Logger.getLogger(this.getClass());
@Autowired
protected ServiceConfigInfoService serviceConfigInfoService;
/** /**
* 管理基础路径 * 管理基础路径
*/ */