后台管理模块

ssj-sys/pom.xml

@@ -10,13 +10,17 @@
   <name>ssj-sys</name>
   <description>sys</description>
 
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <elasticsearch.version>7.2.0</elasticsearch.version>
+    </properties>
+
 	<dependencies>
 	
    	    <dependency>
 			<groupId>com.ssj</groupId>
-    		<artifactId>ssj-kmt-exercise-service</artifactId>
+    		<artifactId>ssj-kmt-exercise-service-impl</artifactId>
 		</dependency>
-
         <dependency>
             <groupId>com.ssj</groupId>
             <artifactId>ssj-sys-service</artifactId>
@@ -43,6 +47,16 @@
             <artifactId>ssj-common-file</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.dubbo</groupId>
+            <artifactId>dubbo-registry-nacos</artifactId>
+            <version>2.7.5</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.nacos</groupId>
+            <artifactId>nacos-client</artifactId>
+            <version>1.1.4</version>
+        </dependency>
 	</dependencies>
 
 </project>

ssj-sys/src/main/java/com/ssj/SysApp.java

@@ -1,5 +1,6 @@
 package com.ssj;
 
+import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -10,6 +11,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 @SpringBootApplication(scanBasePackages = {"com.ssj"})
 @EnableJpaRepositories
 @ServletComponentScan
+@EnableDubbo
 public class SysApp extends SpringBootServletInitializer{
 	
     public static void main(String[] args) {

ssj-sys/src/main/java/com/ssj/sys/controller/AnalysisController.java

@@ -12,6 +12,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+
 import com.ssj.bean.sys.fx.domain.Merchant;
 import com.ssj.bean.sys.role.domain.Admin;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -36,7 +37,7 @@ import com.ssj.sys.util.thirdparty.excel.ExcelColumn;
 @Controller
 public class AnalysisController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private AnalysisService analysisService;
 	
 	

ssj-sys/src/main/java/com/ssj/sys/controller/AppInfoController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.sys.appinfo.bean.AppInfo;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -39,7 +39,7 @@ import java.util.Map;
 @RequestMapping("/sys/appinfo")
 public class AppInfoController extends BaseController {
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private AppInfoService appInfoService;
 
     @Autowired

ssj-sys/src/main/java/com/ssj/sys/controller/AwardController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.award.domain.AwardActivity;
 import com.ssj.bean.sys.award.domain.AwardConsume;
@@ -48,28 +48,28 @@ import com.ssj.sys.util.thirdparty.excel.ExcelColumn;
 @RequestMapping("/sys/award")
 public class AwardController extends BaseController {
 	
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private AwardMaterialService awardMaterialService;
     
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private AwardActivityService awardActivityService;
     
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private AwardActivityLogService awardActivityLogService;
     
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private AwardStockService awardStockService;
     
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private AwardGrantService awardGrantService;
     
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private MerchantService merchantService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private AwardConsumeService awardConsumeService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private AwardSncodeService awardSncodeService;
 	
 	//指点的code

ssj-sys/src/main/java/com/ssj/sys/controller/BookListController.java

@@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.fx.domain.*;
@@ -45,40 +45,40 @@ import static java.math.BigDecimal.ROUND_HALF_DOWN;
 @Controller
 public class BookListController extends BaseController {
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private LibBookLockingService lockingService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private AdminService adminService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private LibStaffingService libStaffingService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private DevicePartsService devicePartsService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MaterielService materielService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MaterielTemplateService materielTemplateService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private SortService sortService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MerchantService merchantService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MaterielOffService materielOffService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MaterielOffDetailService materielOffDetailService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private RoleService roleService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MaterielHomeService materielHomeService;
 
     @RequestMapping("/salseCountList")

ssj-sys/src/main/java/com/ssj/sys/controller/CardController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.cardinfo.domain.Card;
 import com.ssj.bean.sys.cardinfo.domain.CardAward;
@@ -30,13 +30,13 @@ import java.util.*;
 @Controller
 @RequestMapping("/sys/card")
 public class CardController extends BaseController {
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private CardService cardService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private CardAwardService cardAwardService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private ILibJoinService libJoinService;
 	
     /**

ssj-sys/src/main/java/com/ssj/sys/controller/CodeExchangeController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.codeexchange.CodeExchange;
@@ -29,7 +29,7 @@ import java.util.Map;
 @RequestMapping("/sys/codeexchange")
 public class CodeExchangeController extends BaseController {
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private CodeExchangeService codeExchangeService;
 
     @RequestMapping("/codeList")

ssj-sys/src/main/java/com/ssj/sys/controller/CommentTemplateController.java

@@ -1,5 +1,5 @@
 package com.ssj.sys.controller;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.template.CommentTemplate;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -30,7 +30,7 @@ import java.util.Map;
 public class CommentTemplateController extends BaseController {
 
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private CommentTemplateService commentTemplateService;
 
     @RequestMapping("/commentList")

ssj-sys/src/main/java/com/ssj/sys/controller/CounterController.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.kmt.kmt.domain.KmtCourse;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.framework.basic.utils.DateHelper;
@@ -33,17 +33,17 @@ import com.ssj.sys.util.Constants;
 @Controller
 public class CounterController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private CounterService counterService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private OrderDetailsService orderDetailsService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibJoinService libJoinService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibSubscribeService libSubscribeService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LessonServiceSalesService lessonServiceSalesService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private KmtCourseService kmtCourseService;
 
 

ssj-sys/src/main/java/com/ssj/sys/controller/CuratorV1Controller.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.framework.basic.common.bean.Page;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.core.common.controller.BaseController;
@@ -22,9 +22,9 @@ import java.util.Optional;
 @RequestMapping("/sys/curator")
 public class CuratorV1Controller extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibManagerAuditService libManagerAuditService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private CuratorV1Service curatorV1Service;
 
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/DispatcherController.java

@@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.ssj.bean.weixin.libmy.domain.LibBookApply;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -34,9 +34,9 @@ import java.util.*;
 @RequestMapping("/sys/dispatcher")
 @Controller
 public class DispatcherController extends BaseController {
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private LibBookLockingService lockingService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private LibBookApplyService applyService;
 
     @RequestMapping("/lockList")

ssj-sys/src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.fx.domain.Merchant;
 import com.ssj.bean.sys.role.domain.Admin;
@@ -33,13 +33,13 @@ import java.util.*;
 @RequestMapping("sys/finance")
 public class FinanceReportController extends BaseController {
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private IFinanceService financeService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private MerchantService merchantService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private DeviceBalanceService deviceBalanceService;
 
     //小塾使用情况总表

ssj-sys/src/main/java/com/ssj/sys/controller/FxController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.conch.conch.domain.ConchDerver;
@@ -60,49 +60,49 @@ import java.util.*;
 @Controller
 public class FxController  extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private DevicePartsService devicePartsService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private DeviceSalesService deviceSalesService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private DeviceService deviceService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private MerchantService merchantService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private ConchDerverService conchDerverService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private AdminService adminService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private RoleService roleService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private OrganizationService  organizationService;
 	
 	@Autowired
     private FileInfoService fileInfoService;   
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private DeviceActService deviceActService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private DevicePartsActService devicePartsActService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private CnAreaService cnAreaService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private ILibJoinService libJoinService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private ILibJoinConsumeService libJoinConsumeService;
 	
-	@Reference(version = "1.0" ,timeout = 150000)
+	@Autowired
 	private MerchantAreaService merchantAreaService;
 
 

ssj-sys/src/main/java/com/ssj/sys/controller/GameH5Controller.java

@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.game.domain.GameQuestion;
 import com.ssj.bean.sys.game.domain.GameQuestionOption;
@@ -30,10 +30,10 @@ import java.util.*;
 @RequestMapping("/sys/game")
 public class GameH5Controller extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private GameQuestionService gameQuestionService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private GameQuestionOptionService gameQuestionOptionService;
 
     @RequestMapping("/questionList")

ssj-sys/src/main/java/com/ssj/sys/controller/ImLibUserController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.imlibuser.TbClassStudent;
 import com.ssj.bean.sys.imlibuser.TbClassStudentTemp;
@@ -60,65 +60,65 @@ import java.util.*;
 public class ImLibUserController extends BaseController {
 
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassStudentService tbLibImStudentService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassStudentTempService tbLibImStudentTempService;
 	
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassTeacherService tbLibImTeacherService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassTeacherTempService tbLibImTeacherTempService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private ConchCommonService conchCommonService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
  	private ILibJoinService joinService;    
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibVipServiceService libVipServiceService;   
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibVipService libVipService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private IBookManagerService managerService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private ParentV2Service parentV2Service;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private UserService userService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private EasemobService easemobService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassService tbClassService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassStudentService tbClassStudentService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassStudentTempService tbClassStudentTempService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassTeacherService tbClassTeacherService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private TbClassTeacherTempService tbClassTeacherTempService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private IBookManagerService bookManagerService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
  	private ILibJoinConsumeService joinConsumeService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private CuratorV1Service curatorV1Service;
 
 

ssj-sys/src/main/java/com/ssj/sys/controller/IndexController.java

@@ -11,7 +11,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.menu.domain.Menu;
 import com.ssj.bean.sys.role.domain.Admin;
@@ -26,9 +26,9 @@ import com.ssj.service.weixin.library.service.ILibJoinService;
 @RequestMapping("sys/login")
 @Controller
 public class IndexController extends BaseController {
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private MenuService menuService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private ILibJoinService libJoinService;
 	
 	

ssj-sys/src/main/java/com/ssj/sys/controller/JxyController.java

@@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.jxy.domain.Jxy;
@@ -37,15 +37,15 @@ import java.util.*;
 @RequestMapping("sys/jxy")
 @Controller
 public class JxyController extends BaseController {
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	 private JxyService jxyService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	 private JxyImgService jxyImgService;
 
 	@Autowired
 	private FileInfoService fileInfoService;
 
-	@Reference(version = "1.0",timeout = 60000)
+	@Autowired
 	private SubActivityService subActivityService;
 	/**
 	 * 

ssj-sys/src/main/java/com/ssj/sys/controller/KmtExampaperAreaController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.kmt.kmt.domain.KmtExampaperArea;
 import com.ssj.bean.kmt.kmt.domain.KmtExampaperDetail;
@@ -34,12 +34,12 @@ import java.util.*;
  */
 public class KmtExampaperAreaController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private IKmtExampaperAreaService exampaperService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private SortService sortService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private KmtExampaperDetailService kmtExampaperDetailService;
 	
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/LogController.java

@@ -10,7 +10,7 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.core.common.controller.BaseController;
 import com.ssj.framework.log.domain.RequestApiLog;
@@ -25,7 +25,7 @@ import com.ssj.framework.weixin.util.DateUtil;
 @RequestMapping("/sys/log")
 public class LogController extends BaseController {
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private RequestApiLogService requestApiLogService;
 
     @RequestMapping("/list")

ssj-sys/src/main/java/com/ssj/sys/controller/LoginController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.sys.role.domain.Admin;
 import com.ssj.bean.weixin.user.domain.User;
 import com.ssj.framework.core.common.controller.BaseController;
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpSession;
 @Controller
 public class LoginController extends BaseController {
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private AdminService adminService;
 	
 	

ssj-sys/src/main/java/com/ssj/sys/controller/MenuController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.common.framework.core.domain.Response;
@@ -37,13 +37,13 @@ public class MenuController extends BaseController {
 	@Autowired
 	private TokenManager tokenManager;
 	 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private MenuService menuService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private WxMaterialService wxMaterialService;
     
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private WxMsgEventService wxMsgEventService;
 	
 	  @RequestMapping("/sysAllMenuQuery")

ssj-sys/src/main/java/com/ssj/sys/controller/MessageController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.message.domain.Message;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -27,13 +27,13 @@ import java.util.Map;
 @RequestMapping("/sys/message")
 public class MessageController extends BaseController {
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private AppCommonService appCommonService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private MessageService messageService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private SortService sortService;
 
 	@RequestMapping("/messageList")

ssj-sys/src/main/java/com/ssj/sys/controller/OrganizationController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.organization.domain.Organization;
 import com.ssj.bean.sys.role.domain.Admin;
@@ -36,13 +36,13 @@ import java.util.Map;
 @RequestMapping("sys/org")
 @Controller
 public class OrganizationController  extends BaseController {
-  @Reference(version = "1.0" ,timeout = 60000)
+  @Autowired
 	private OrganizationService organizationService;
     
-  @Reference(version = "1.0" ,timeout = 60000)
+  @Autowired
 	 private LibStaffingService libStaffingService;
 	 
-  @Reference(version = "1.0" ,timeout = 60000)
+  @Autowired
 	 private SortService sortService;
 	 
     /**

ssj-sys/src/main/java/com/ssj/sys/controller/PeiyouController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.parent.domain.SSJPeiyouBook;
@@ -39,7 +39,7 @@ import java.util.Map;
 @RequestMapping("/sys/peiyou")
 public class PeiyouController extends BaseController {
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private SSJPeiyouBookService ssjPeiyouBookService;
 
     @Autowired

ssj-sys/src/main/java/com/ssj/sys/controller/QdSalesController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.core.common.controller.BaseController;
 import com.ssj.service.weixin.library.service.ILibJoinService;
@@ -20,10 +20,10 @@ import java.util.Map;
 @Controller
 public class QdSalesController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibQdSaleService qdSaleService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private ILibJoinService libJoinService;
 	
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/ReportController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.framework.basic.common.bean.SplitPage;
 import com.ssj.framework.basic.utils.DateHelper;
@@ -47,30 +47,30 @@ import java.util.*;
 @RequestMapping("sys/report")
 public class ReportController extends BaseController {
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibUserHistoryService libUserHistoryService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibOrderDetailsService libOrderDetailsService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ExperienceService experienceService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibVipService libVipService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibJoinService libJoinService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibVipCodeService libVipCodeService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private CounterService counterService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	 private ValidVipService validVipService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibQdSaleService qdSaleService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private OrderService orderService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private IBookBorrowService bookBorrowService;
       
     public HSSFCellStyle getStyle(HSSFWorkbook workbook) {  

ssj-sys/src/main/java/com/ssj/sys/controller/RoleController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.common.framework.core.domain.Response;
@@ -43,27 +43,27 @@ import java.util.Map;
 @Controller
 public class RoleController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private RoleService roleService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private AdminService adminService;
 	
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private ILibJoinService libJoinService;
     
     @Autowired
 	private TokenManager tokenManager;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private LibOrderDetailsService orderDetailService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private PushTemplateService pushTemplateService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private LibStaffingService libStaffingService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private AdminOrgService adminOrgService;
     
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/SconOtaController.java

@@ -1,5 +1,5 @@
 package com.ssj.sys.controller;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.conch.conch.domain.SconOtaManager;
@@ -37,7 +37,7 @@ public class SconOtaController extends BaseController {
     @Autowired
     private FileInfoService fileInfoService;
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private SconOtaManagerService sconOtaManagerService;
 
     @RequestMapping("/sconotaList")

ssj-sys/src/main/java/com/ssj/sys/controller/ShortcutsController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.shortcuts.domain.Shortcuts;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -28,7 +28,7 @@ import java.util.Map;
 @RequestMapping("/sys/shortcuts")
 public class ShortcutsController extends BaseController {
 
-	@Reference(version = "1.0", timeout = 60000)
+	@Autowired
 	private ShortcutsService shortcutsService;
 
 	@RequestMapping("/shortcutsList")

ssj-sys/src/main/java/com/ssj/sys/controller/SortController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.sort.domain.Sort;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -24,7 +24,7 @@ import com.ssj.service.sys.sort.service.SortService;
 @RequestMapping("/sys/sort")
 public class SortController extends BaseController {
  
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private SortService sortService;
 	
 	 @RequestMapping("/list")

ssj-sys/src/main/java/com/ssj/sys/controller/SsjTermtrainQuestionController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.parent.domain.SSJTermtrainQuestion;
@@ -43,7 +43,7 @@ import java.util.Map;
 public class SsjTermtrainQuestionController extends BaseController {
 
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private  SSJTermtrainQuestionService ssjTermtrainQuestionService;
 
     @Autowired

ssj-sys/src/main/java/com/ssj/sys/controller/SysCuratorController.java

@@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.conch.curator.dto.CuratorTeacherListDto;
 import com.ssj.bean.sys.fx.domain.Merchant;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
@@ -44,13 +44,13 @@ import java.util.*;
 @RequestMapping("/sys/admin/curator")
 public class SysCuratorController extends BaseController {
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private SysCuratorService sysCuratorService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private ILibJoinService joinService;
-    @Reference(version = "1.0" ,timeout = 150000)
+    @Autowired
     private MerchantService merchantService;
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private ParentService parentService;
 
     @RequestMapping("/index")

ssj-sys/src/main/java/com/ssj/sys/controller/SysLibController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.role.domain.Admin;
@@ -49,58 +49,58 @@ import java.util.*;
 @RequestMapping("sys/lib")
 @Controller
 public class SysLibController extends BaseController {
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	 private LibUserHistoryService libUserHistoryService;
 	
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private UserService userService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserCountService userCountService;
 
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private ILibJoinService libJoinService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private ILibBookService libBookService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private IBookDetailService bookDetailService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private IReadVipService libVipService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private SortService sortService;
 
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private LibVipServiceService libVipServiceService;//判断是否有服务
 	 
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybScoringContentService zuoybScoringContentService;
 	 
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private IBookBaseService bookBaseService;
 
 	@Autowired
 	 private TokenManager tokenManager;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private IBookManagerService  managerService;
 	 
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private PushTemplateService pushTemplateService;
 	 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private CnAreaService cnAreaService;
 		
-//	@Reference(version = "1.0" ,timeout = 60000)
+//	@Autowired
 //	private ReadQueryService readQueryService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private OrganizationService organizationService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private IBookBorrowService bookBorrowService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	 private ZuoybCourseService zuoybCourseService;
     
 

ssj-sys/src/main/java/com/ssj/sys/controller/SysOrderController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.weixin.libmy.domain.LibVip;
 import com.ssj.bean.weixin.order.domain.Order;
 import com.ssj.bean.weixin.sales.domain.LibOrderDetails;
@@ -38,22 +38,22 @@ import java.util.*;
 @Controller
 public class SysOrderController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private OrderService orderService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibOrderDetailsService libOrderDetailsService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private SortService sortService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibJoinService libJoinService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibVipServiceService libVipServiceService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibStaffingService libStaffingService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibSalesPriceService libSalesPriceService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private ILibVipService vipService;
 	
 	

ssj-sys/src/main/java/com/ssj/sys/controller/SysProblemController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.fx.domain.Merchant;
@@ -64,37 +64,37 @@ import java.util.*;
 @RequestMapping("sys/problem")
 @Controller
 public class SysProblemController extends BaseController{
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ProblemService  problemService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ExperienceService  experienceService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private SortService  sortService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private  ILibSubscribeService libSubscribeService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private  ILibJoinService  libJoinService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibUserHistoryService  libUserHistoryService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private  ILibVipService iLibVipService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserService userService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	private PushTemplateService pushTemplateService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	private ValidVipService validVipService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	private CnAreaService cnAreaService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
     private RequestMethodLogService requestMethodLogServicee;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	private SconXingeService sconXingeService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	 private IBanbenDetailService banbenDetailService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private MerchantService merchantService;
-	@Reference(version = "1.0",timeout  = 60000)
+	@Autowired
 	private MerchantAreaService areaService;
 	
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/SysSalesController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
 import com.ssj.bean.weixin.sales.domain.*;
@@ -34,27 +34,27 @@ import java.util.Map;
 @Controller
 public class SysSalesController extends BaseController {
 	
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private LibStaffingService libStaffingService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private LibSalesPriceService libSalesPriceService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private LibCommissionService libCommissionService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private SortService sortService;
 	 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibOrderDetailsService libOrderDetailsService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibVipCodeService libVipCodeService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibBorrowedServiceService  libBorrowedServiceService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibVipServiceService  libVipServiceService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ZuoybStudentPushSerivce zuoybStudentPushSerivce;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
     private ILibJoinService libJoinService;
 	 
 	   /**

ssj-sys/src/main/java/com/ssj/sys/controller/SysZuoybController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.sort.domain.Sort;
@@ -65,41 +65,41 @@ public class SysZuoybController extends BaseController {
 	}
 
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	 private ZuoybCourseService zuoybCourseService;
 	 /**
 	  * 打分基础数据
 	  */
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybScoringContentService zuoybScoringContentService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybScoringContentDetailsService zuoybScoringContentDetailsService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private SortService sortService;
 	
- 	 @Reference(version = "1.0" ,timeout = 60000)
+ 	 @Autowired
 	 private ILibJoinService libJoinService;
  	 
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybWeekService zuoybWeekService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybWeekTeacherService zuoybWeekTeacherService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybKnowHowService  zuoybKnowHowService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private ZuoybKnowHowDetailsService  zuoybKnowHowDetailsService;
 	 
 	 //作业大纲
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private  ZuoybStudentWorkHowService   zuoybStudentWorkHowService;
 	 
 	 //作业大纲
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private  ZuoybStudentBgService   zuoybStudentBgService;
 	 //作业大纲
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private  ZuoybKnowHowDetailsSortService   zuoybKnowHowDetailsSortService;
-	 @Reference(version = "1.0" ,timeout = 60000)
+	 @Autowired
 	 private  ZuoybKnowHowDetailsKdService   zuoybKnowHowDetailsKdService;
 	/** 
 	 * 

ssj-sys/src/main/java/com/ssj/sys/controller/TeacherAuditController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.teacher.domain.ApplyTeacher;
 import com.ssj.bean.weixin.libmy.domain.TbLibManager;
@@ -35,25 +35,25 @@ import java.util.*;
 public class TeacherAuditController extends BaseController {
 
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private IApplyTeachService applyService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private IBookManagerService managerService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserService userService;
 	
 	@Autowired
 	private TokenManager  tokenManager;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private PushTemplateService pushTemplateService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private SconXingeService sconXingeService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibManagerAuditService libManagerAuditService;
 	
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/UserCardtController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.cardinfo.domain.TbCardInfo;
 import com.ssj.bean.weixin.libmy.domain.TbLibJoin;
@@ -28,16 +28,16 @@ import com.ssj.service.weixin.user.service.UserService;
 public class UserCardtController extends BaseController {
 
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ICardInfoService cardInfoService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserService usersService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibJoinService libJoinService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private  UserService  userService;
 	
 	/**

ssj-sys/src/main/java/com/ssj/sys/controller/UserCenterController.java

@@ -4,7 +4,7 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.afterturn.easypoi.excel.entity.enmus.ExcelType;
 import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.conch.conch.domain.ConchDerver;
 import com.ssj.bean.sys.homework.domain.HomeworkPicture;
@@ -57,31 +57,31 @@ import java.util.*;
 @RequestMapping("/sys/usercenter")
 public class UserCenterController extends BaseController {
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserCenterService userCenterService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserService userService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private HomeworkPictureService homeworkPictureService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private HomeworkService homeworkService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private IBookManagerService managerService;
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private OnlineTeacherWeightService onlineTeacherWeightService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ConchDerverService conchDerverService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibVipService vipService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private LibVipServiceService libVipServiceService;
 
 	@RequestMapping("/userList")

ssj-sys/src/main/java/com/ssj/sys/controller/VipBindClassController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.files.domain.FileInfo;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.appinfo.bean.AppInfo;
@@ -40,10 +40,10 @@ import java.util.Map;
 @RequestMapping("/sys/orgclass")
 public class VipBindClassController extends BaseController {
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private VipBindClassService vipBindClassService;
 
-    @Reference(version = "1.0", timeout = 60000)
+    @Autowired
     private VipBindClassTempService vipBindClassTempService;
 
     @RequestMapping("/orgclassTempList")

ssj-sys/src/main/java/com/ssj/sys/controller/WebController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.weixin.problem.domain.Problem;
 import com.ssj.framework.core.security.manager.TokenManager;
 import com.ssj.framework.core.util.PropertiesUtil;
@@ -29,9 +29,9 @@ import com.ssj.weixin.utils.Location;
 public class WebController {
 	@Autowired
 	private TokenManager tokenManager;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ConchDerverService conchDerverService;
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ProblemService  problemService;
 	 /**
      * 首页

ssj-sys/src/main/java/com/ssj/sys/controller/WeiXinController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.common.framework.core.domain.Response;
@@ -33,14 +33,14 @@ import java.util.*;
 @Controller
 public class WeiXinController  extends BaseController {
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private UserService userService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private SortService sortService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private MessageReplyService messageReplyService;
     
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
 	private PushTemplateService pushTemplateService;
 
 	@Autowired

ssj-sys/src/main/java/com/ssj/sys/controller/WxcardController.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.controller;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ssj.bean.common.framework.core.domain.Response;
@@ -40,7 +40,7 @@ public class WxcardController extends BaseController {
 	
 	private static Logger log = LoggerFactory.getLogger(WxcardController.class);
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private ILibMainCardService cardService;
 	
 	@Autowired

ssj-sys/src/main/java/com/ssj/sys/interceptor/LoginInterceptor.java

@@ -1,6 +1,6 @@
 package com.ssj.sys.interceptor;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.sys.role.domain.Admin;
 import com.ssj.bean.weixin.problem.domain.RequestMethodLog;
 import com.ssj.bean.weixin.push.domain.SendTemplateShort;
@@ -22,12 +22,12 @@ import java.util.*;
 
 @Component
 public class LoginInterceptor extends HandlerInterceptorAdapter{
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private RequestMethodLogService requestMethodLogService;
 
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private LibStaffingService libStaffingService;
-    @Reference(version = "1.0" ,timeout = 60000)
+    @Autowired
     private PushTemplateService pushTemplateService;
 
     private static Set<String> sysURLList = new HashSet<String>();
@@ -183,7 +183,7 @@ public class LoginInterceptor extends HandlerInterceptorAdapter{
     }
 
     public static void initModelAndView(HttpServletRequest request, ModelAndView modelAndView) throws Exception {
-        modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url")+"/ssj");
+        modelAndView.addObject("sysUrl", PropertiesUtil.getValue("sys_url"));
         //modelAndView.addObject("sysUrl", "http://127.0.0.1:8080/");
         modelAndView.addObject("imgUrl", PropertiesUtil.getValue("STATIC_FILE_URL"));
 

ssj-sys/src/main/java/com/ssj/sys/photoscroll/controller/PhotoscrollController.java

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.alibaba.dubbo.config.annotation.Reference;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.ssj.bean.common.framework.core.domain.Response;
 import com.ssj.bean.sys.photoscroll.bean.Photoscroll;
 import com.ssj.framework.basic.common.bean.SplitPage;
@@ -27,10 +27,10 @@ import com.ssj.service.sys.sort.service.SortService;
 @RequestMapping("/sys/photoscroll")
 public class PhotoscrollController extends BaseController {
 	
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private PhotoscrollService photoscrollService;
 
-	@Reference(version = "1.0" ,timeout = 60000)
+	@Autowired
 	private SortService sortService;
 
     @Autowired

ssj-sys/src/main/resources/application-test.properties

@@ -0,0 +1,82 @@
+logging.config=classpath:logback-test.xml
+spring.datasource.url=jdbc:mysql://192.168.2.152:3306/ssj?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+spring.datasource.username=aijia
+spring.datasource.password=SSJ1QAZxsw2!@
+
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+spring.datasource.initialSize=10
+spring.datasource.minIdle=10
+spring.datasource.maxActive=100
+spring.datasource.maxWait=60000
+spring.datasource.timeBetweenEvictionRunsMillis=60000
+spring.datasource.minEvictableIdleTimeMillis=30000
+spring.datasource.validationQuery=SELECT 1
+spring.datasource.testWhileIdle=true
+spring.datasource.testOnBorrow=false
+spring.datasource.testOnReturn=false
+spring.datasource.poolPreparedStatements=true
+spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
+spring.datasource.filters=stat,wall,slf4j
+spring.datasource.connectionProperties=druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
+
+spring.data.solr.host=http://172.18.121.4:8080/solr
+spring.data.mongodb.uri=mongodb://root:aijia#123@47.106.111.166:27017/aijia
+spring.data.mongodb.option.min-connection-per-host=0 
+spring.data.mongodb.option.max-connection-per-host=100 
+spring.data.mongodb.option.threads-allowed-to-block-for-connection-multiplier=5 
+spring.data.mongodb.option.server-selection-timeout=30000 
+spring.data.mongodb.option.max-wait-time=120000 
+spring.data.mongodb.option.max-connection-idle-time=0 
+spring.data.mongodb.option.max-connection-life-time=0 
+spring.data.mongodb.option.connect-timeout=10000 
+spring.data.mongodb.option.socket-timeout=0
+
+spring.data.mongodb.option.socket-keep-alive=false 
+spring.data.mongodb.option.ssl-enabled=false 
+spring.data.mongodb.option.ssl-invalid-host-name-allowed=false 
+spring.data.mongodb.option.always-use-m-beans=false
+
+spring.data.mongodb.option.heartbeat-socket-timeout=20000 
+spring.data.mongodb.option.heartbeat-connect-timeout=20000 
+spring.data.mongodb.option.min-heartbeat-frequency=500 
+spring.data.mongodb.option.heartbeat-frequency=10000 
+spring.data.mongodb.option.local-threshold=15
+
+spring.redis.database=0
+spring.redis.password=aijia@78342
+spring.redis.timeout=3000
+spring.redis.block-when-exhausted=true
+
+
+
+#spring.redis.cluster.nodes=120.79.157.115:6379
+spring.redis.cluster.nodes=192.168.2.176:7000,192.168.2.176:7001,192.168.2.176:7002,192.168.2.176:7003,192.168.2.176:7004,192.168.2.176:7005
+spring.redis.cluster.timeout=30
+spring.redis.cluster.pool.max-active=8
+spring.redis.cluster.pool.max-wait=-1
+spring.redis.cluster.pool.max-idle=8
+spring.redis.cluster.pool.min-idle=0
+
+
+spring.jmx.enabled=false
+
+spring.rabbitmq.host=192.168.2.176
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=guest
+spring.rabbitmq.password=guest
+spring.rabbitmq.publisher-confirms=true
+spring.rabbitmq.publisher-returns=true
+
+
+dubbo.registry.id=ssj-dubbo-registry
+dubbo.registry.address=zookeeper://192.168.2.196:2181
+dubbo.protocol.serialization=java
+dubbo.consumer.timeout=50000
+
+
+spring.elasticsearch.cluster.host=192.168.2.132
+spring.elasticsearch.cluster.port=9200
+spring.elasticsearch.cluster.scheme=http
+spring.elasticsearch.cluster.username=elastic
+spring.elasticsearch.cluster.password=zhidian@123

ssj-sys/src/main/resources/application.properties

@@ -1,15 +1,17 @@
-spring.application.name=ssj-sys-web
+
 server.port=8080
+server.tomcat.uri-encoding=utf-8
 logger.level=info
+
 dubbo.scan.base-packages=com.ssj
 dubbo.application.id=ssj-sys-web
 dubbo.application.name=ssj-sys-web
 dubbo.consumer.cluster=failsafe
 dubbo.consumer.check=false
 
-spring.profiles.active=common,@activatedProperties@
-
-spring.mvc.static-path-pattern=/static/**  
+mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
+mybatis-plus.mapper-locations=classpath:mybatis/mapper/*.xml
+mybatis-plus.refresh-mapper=false
 
 spring.thymeleaf.prefix=classpath:/templates/
 spring.thymeleaf.suffix=.html
@@ -17,3 +19,25 @@ spring.thymeleaf.mode=HTML5
 spring.thymeleaf.encoding=UTF-8
 spring.thymeleaf.servlet.content-type=text/html
 spring.thymeleaf.cash=false
+
+spring.application.name=ssj-sys-web
+spring.mvc.static-path-pattern=/static/**  
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+spring.jpa.database = MYSQL
+spring.jpa.hibernate.ddl-auto=none
+spring.jpa.show-sql=false     
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+spring.jpa.hibernate.implicit_naming_strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
+spring.jpa.hibernate.physical_naming_strategy=com.ssj.framework.spring.jpa.PhysicalNamingStrategyImpl
+spring.jpa.open-in-view=true
+session.expire=1800
+spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
+spring.jackson.time-zone=GMT+8
+spring.http.multipart.maxFileSize=200MB
+spring.http.multipart.maxRequestSize=5000MB
+spring.http.multipart.enabled=false
+
+spring.profiles.active=@activatedProperties@
+
+
+