控制服务实现登录功能 和菜单展示，以及中心服务bug修复

CenterService/src/main/java/com/java110/center/CenterServiceApplicationStart.java

@@ -3,12 +3,16 @@ package com.java110.center;
 import com.java110.event.center.init.CenterServiceStartInit;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import java.nio.charset.Charset;
+
 
 /**
  * spring boot 初始化启动类
@@ -31,7 +35,9 @@ public class CenterServiceApplicationStart {
     @Bean
     @LoadBalanced
     public RestTemplate restTemplate() {
-        return new RestTemplate();
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        return restTemplate;
     }
 
     public static void main(String[] args) throws Exception{

CenterService/src/main/java/com/java110/center/rest/CacheApi.java

@@ -1,4 +1,4 @@
-package com.java110.center.rest;
+package com.java110.center.api;
 
 import com.java110.center.smo.ICenterServiceCacheSMO;
 import com.java110.common.constant.ResponseConstant;

CenterService/src/main/java/com/java110/center/rest/HttpApi.java

@@ -1,4 +1,4 @@
-package com.java110.center.rest;
+package com.java110.center.api;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.center.smo.ICenterServiceSMO;

CenterService/src/main/java/com/java110/center/smo/impl/CenterServiceSMOImpl.java

@@ -364,6 +364,8 @@ public class CenterServiceSMOImpl extends LoggerEngine implements ICenterService
                 &&MappingCache.getValue(MappingConstant.KEY_NO_INVOKE_BUSINESS_SYSTEM).contains(dataFlow.getOrderTypeCd())){
             //不用调用 下游系统的配置(一般不存在这种情况，这里主要是在没有下游系统的情况下测试中心服务用)
             DataFlowFactory.addCostTime(dataFlow, "invokeBusinessSystem", "调用下游系统耗时", startDate);
+            dataFlow.setResponseBusinessJson(DataTransactionFactory.createCommonResponseJson(dataFlow.getTransactionId(),
+                    ResponseConstant.RESULT_CODE_SUCCESS, "成功",null));
             return ;
         }
 

CenterService/src/main/resources/application.yml

@@ -4,13 +4,16 @@ jedis:
       maxTotal: 100
       maxIdle: 20
       maxWaitMillis: 20000
-    host: 192.168.31.199
+    host: 135.192.86.200
     port: 6379
 
 eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    leaseExpirationDurationInSeconds: 30
   client:
     serviceUrl:
-      defaultZone: http://192.168.31.199:8761/eureka/
+      defaultZone: http://135.192.86.200:8761/eureka/
       #defaultZone: http://localhost:8761/eureka/
 server:
   port: 8001
@@ -19,7 +22,7 @@ spring:
     name: center-service
   redis:
     database: 0
-    host: 192.168.31.199
+    host: 135.192.86.200
     port: 6379
     pool:
       max-active: 300
@@ -36,7 +39,7 @@ spring:
     filters: stat,wall,log4j
     poolPreparedStatements: true
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://192.168.31.199:3306/TT
+    url: jdbc:mysql://135.192.86.200:3306/TT
     maxPoolPreparedStatementPerConnectionSize: 20
     password: TT@12345678
     testOnBorrow: false
@@ -52,8 +55,8 @@ spring:
 kafka:
   consumer:
     zookeeper:
-      connect: 192.168.31.199:2181
-    servers: 192.168.31.199:9092
+      connect: 135.192.86.200:2181
+    servers: 135.192.86.200:9092
     enable:
       auto:
         commit: true
@@ -71,8 +74,8 @@ kafka:
 
   producer:
     zookeeper:
-      connect: 192.168.31.199:2181
-    servers: 192.168.31.199:9092
+      connect: 135.192.86.200:2181
+    servers: 135.192.86.200:9092
     retries: 0
     batch:
       size: 4096

ConsoleService/pom.xml

@@ -80,7 +80,7 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.java110.center.CenterServiceApplicationStart</mainClass>
+                    <mainClass>com.java110.console.ConsoleServiceApplicationStart</mainClass>
                 </configuration>
             </plugin>
         </plugins>

ConsoleService/src/main/java/com/java110/console/ConsoleServiceApplicationStart.java

@@ -1,5 +1,6 @@
 package com.java110.console;
 
+import com.java110.service.init.ServiceStartInit;
 import org.apache.catalina.Context;
 import org.apache.catalina.connector.Connector;
 import org.apache.tomcat.util.descriptor.web.SecurityCollection;
@@ -8,12 +9,16 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.embedded.EmbeddedServletContainerFactory;
 import org.springframework.boot.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.http.converter.StringHttpMessageConverter;
 import org.springframework.web.client.RestTemplate;
 
+import java.nio.charset.Charset;
+
 
 /**
  * spring boot 初始化启动类
@@ -36,7 +41,9 @@ public class ConsoleServiceApplicationStart {
     @Bean
     @LoadBalanced
     public RestTemplate restTemplate() {
-        return new RestTemplate();
+        StringHttpMessageConverter m = new StringHttpMessageConverter(Charset.forName("UTF-8"));
+        RestTemplate restTemplate = new RestTemplateBuilder().additionalMessageConverters(m).build();
+        return restTemplate;
     }
 
     @Bean
@@ -61,7 +68,7 @@ public class ConsoleServiceApplicationStart {
         Connector connector = new Connector("org.apache.coyote.http11.Http11NioProtocol");
         connector.setScheme("http");
         //Connector监听的http的端口号
-        connector.setPort(7001);
+        connector.setPort(6001);
         connector.setSecure(false);
         //监听到http的端口号后转向到的https的端口号
         connector.setRedirectPort(8443);
@@ -70,6 +77,6 @@ public class ConsoleServiceApplicationStart {
 
     public static void main(String[] args) throws Exception{
         ApplicationContext context = SpringApplication.run(ConsoleServiceApplicationStart.class, args);
-
+        ServiceStartInit.initSystemConfig(context);
     }
 }

ConsoleService/src/main/java/com/java110/console/rest/ConsoleController.java

@@ -1,14 +1,16 @@
-package com.java110.console.rest;
+package com.java110.console.controller;
 
 import com.java110.common.exception.NoAuthorityException;
 import com.java110.common.exception.SMOException;
 import com.java110.console.smo.IConsoleServiceSMO;
 import com.java110.core.base.controller.BaseController;
+import com.java110.entity.service.PageData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -25,16 +27,22 @@ public class ConsoleController extends BaseController {
     private IConsoleServiceSMO consoleServiceSMOImpl;
 
     @RequestMapping(path = "/")
-    public String index(Model model) {
+    public String index(Model model, HttpServletRequest request) {
         String template = "index";
         try {
-            //1.0 判断用户是否登录
-            String managerId = checkLogin();
+            //1.0 获取对象
+            PageData pd = this.getPageData(request);
+            // 判断用户是否登录
+            checkLogin(pd);
             //2.0 查询菜单信息
-            List<Map> menuItems = consoleServiceSMOImpl.getMenuItemsByManageId(managerId);
+            List<Map> menuItems = consoleServiceSMOImpl.getMenuItemsByManageId(pd.getUserId());
+            List<Map> removeMenuItems = new ArrayList<Map>();
             for(Map menuItem : menuItems){
                 if(!"-1".equals(menuItem.get("parentId")) && !"1".equals(menuItem.get("level"))){
                     Map parentMenuItem = this.getMenuItemFromList(menuItems,menuItem.get("parentId").toString());
+                    if(parentMenuItem == null){
+                        continue;
+                    }
                     if(parentMenuItem.containsKey("subMenus")){
                         List<Map> subMenus = (List<Map>) parentMenuItem.get("subMenus");
                         subMenus.add(menuItem);
@@ -44,18 +52,23 @@ public class ConsoleController extends BaseController {
                         parentMenuItem.put("subMenus",subMenus);
                     }
 
-                    menuItems.remove(menuItem);
+                    removeMenuItems.add(menuItem);
                 }
             }
+
+            removeMap(menuItems,removeMenuItems);
             model.addAttribute("menus",menuItems);
             //3.0 查询各个系统调用量
         }catch (NoAuthorityException e){
             //跳转到登录页面
-            template = "login";
+            template = "redirect:/login";
         }catch (IllegalArgumentException e){
-            template = "error";
+            template = "redirect:/system/error";
         }catch (SMOException e){
-            template = "error";
+            template = "redirect:/system/error";
+        }catch (Exception e){
+            logger.error("系统异常：",e);
+            template = "redirect:/system/error";
         }finally {
             return template;
         }
@@ -64,13 +77,28 @@ public class ConsoleController extends BaseController {
 
     private Map getMenuItemFromList(List<Map> menuItems,String parentId){
         for(Map menuItem : menuItems){
-            if(menuItem.get("mId").equals(parentId)){
+            if(menuItem.get("mId").toString().equals(parentId)){
                 return menuItem;
             }
         }
         return null;
     }
 
+    /**
+     * 删除map
+     * @param menuItems
+     * @param removeMenuItems
+     */
+    private void removeMap(List<Map> menuItems,List<Map> removeMenuItems){
+        if(removeMenuItems == null  || removeMenuItems.size() == 0){
+            return;
+        }
+
+        for(Map removeMenuItem : removeMenuItems){
+            menuItems.remove(removeMenuItem);
+        }
+    }
+
     public IConsoleServiceSMO getConsoleServiceSMOImpl() {
         return consoleServiceSMOImpl;
     }

ConsoleService/src/main/java/com/java110/console/controller/LoginController.java

@@ -0,0 +1,32 @@
+package com.java110.console.controller;
+
+import com.java110.common.constant.ResponseConstant;
+import com.java110.common.exception.SMOException;
+import com.java110.common.factory.DataTransactionFactory;
+import com.java110.console.smo.IConsoleServiceSMO;
+import com.java110.core.base.controller.BaseController;
+import com.java110.entity.service.PageData;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 登录 控制类
+ * Created by wuxw on 2018/5/2.
+ */
+@Controller
+public class LoginController extends BaseController {
+
+
+
+    @RequestMapping(path = "/login",method = RequestMethod.GET)
+    public String index(HttpServletRequest request){
+        return "login";
+    }
+
+
+}

ConsoleService/src/main/java/com/java110/console/rest/LoginController.java

@@ -1,6 +1,7 @@
 package com.java110.console.rest;
 
 import com.java110.common.constant.ResponseConstant;
+import com.java110.common.exception.SMOException;
 import com.java110.common.factory.DataTransactionFactory;
 import com.java110.console.smo.IConsoleServiceSMO;
 import com.java110.core.base.controller.BaseController;
@@ -13,43 +14,36 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- * 登录 控制类
- * Created by wuxw on 2018/5/2.
+ * Created by wuxw on 2018/5/7.
  */
 @RestController
-public class LoginController extends BaseController {
+public class LoginRest extends BaseController {
+
 
     @Autowired
     private IConsoleServiceSMO consoleServiceSMOImpl;
-
     /**
      * 登录
      * 协议：
-     * {
-     "meta":{
-     "method":"",//主要用于，日志记录
-     "requestTime":"",
-     "transactionId":"请求流水" //不需要填 有系统统一设置
-     },
-     "param":{
-     *     "userCode":"",
-     *     "userPwd":"",
-     *     "code":"",
-     * }
+     * {"meta":{"method":"login","requestTime":"20180506013211"},"param":{"userCode":"123","userPwd":"123","pageSign":""}}}
      }
      *
      * @param request
      * @return
      */
-    @RequestMapping(path = "/login",method = RequestMethod.POST)
+    @RequestMapping(path = "/loginRest/login",method = RequestMethod.POST)
     public String login(HttpServletRequest request) {
         PageData pd = null;
-        try{
+        try {
             pd = this.getPageData(request);
-
-
+            consoleServiceSMOImpl.login(pd);
+        }catch (IllegalArgumentException e){
+            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_PARAM_ERROR,e.getMessage(),null);
+        }catch (SMOException e){
+            return DataTransactionFactory.pageResponseJson(pd,e.getResult().getCode(),e.getMessage(),null);
         }catch (Exception e){
-            return DataTransactionFactory.pageResponseJson(ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
+            logger.error("异常信息：",e);
+            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
         }
 
         return pd.getResJson().toJSONString();

ConsoleService/src/main/java/com/java110/console/smo/IConsoleServiceSMO.java

@@ -2,6 +2,7 @@ package com.java110.console.smo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.java110.common.exception.SMOException;
+import com.java110.entity.service.PageData;
 
 import java.util.List;
 import java.util.Map;
@@ -21,9 +22,9 @@ public interface IConsoleServiceSMO {
 
     /**
      * 用户登录
-     * @param userObj
+     * @param pd
      * @return
      * @throws SMOException
      */
-    public String login(JSONObject userObj) throws SMOException;
+    public void login(PageData pd) throws SMOException;
 }

ConsoleService/src/main/java/com/java110/console/smo/impl/ConsoleServiceSMOImpl.java

@@ -2,16 +2,20 @@ package com.java110.console.smo.impl;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.auth0.jwt.algorithms.Algorithm;
+import com.java110.common.cache.JWTCache;
 import com.java110.common.cache.MappingCache;
 import com.java110.common.constant.CommonConstant;
 import com.java110.common.constant.MappingConstant;
 import com.java110.common.constant.ResponseConstant;
 import com.java110.common.constant.ServiceCodeConstant;
 import com.java110.common.exception.SMOException;
+import com.java110.common.factory.AuthenticationFactory;
 import com.java110.common.factory.DataTransactionFactory;
 import com.java110.common.log.LoggerEngine;
 import com.java110.common.util.Assert;
 import com.java110.console.smo.IConsoleServiceSMO;
+import com.java110.entity.service.PageData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -40,59 +44,115 @@ public class ConsoleServiceSMOImpl extends LoggerEngine implements IConsoleServi
      */
     @Override
     public List<Map> getMenuItemsByManageId(String manageId) throws SMOException,IllegalArgumentException{
-
-            //获取组件
-            String appId = MappingCache.getValue(MappingConstant.KEY_CONSOLE_SERVICE_APP_ID);
-
-            Assert.hasLength(appId, "组件不能为空");
-
-            String centerServiceUrl = MappingCache.getValue(MappingConstant.KEY_CENTER_SERVICE_URL);
-
-            Assert.hasLength(centerServiceUrl, "中心服务器地址没有配置");
-
-            String securityCode = MappingCache.getValue(MappingConstant.KEY_CONSOLE_SECURITY_CODE);
-            Assert.hasLength(securityCode, "签名秘钥没有配置");
-            Map paramIn = new HashMap();
-            paramIn.put("manageId", manageId);
-            paramIn.put("menuGroup",CommonConstant.MENU_GROUP_LEFT);
-            String responseMsg = "";
-            String requestBody = DataTransactionFactory.createQueryOneCenterServiceRequestJson(appId, manageId, securityCode,
-                    DataTransactionFactory.createQueryOneBusinessRequestJson(ServiceCodeConstant.SERVICE_CODE_QUERY_MENU_ITEM,
-                    ServiceCodeConstant.SERVICE_CODE_QUERY_MENU_ITEM_NAME, paramIn));
-            if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_CONSOLE_SERVICE_SECURITY_ON_OFF))) {
-                try {
-                    requestBody = DataTransactionFactory.encrypt(requestBody, 2048);
-                    //调用查询菜单信息
-                    HttpHeaders header = new HttpHeaders();
-                    header.add(CommonConstant.ENCRYPT, MappingConstant.VALUE_ON);
-                    header.add(CommonConstant.ENCRYPT_KEY_SIZE, "2048");
-                    HttpEntity<String> httpEntity = new HttpEntity<String>(requestBody, header);
-                    responseMsg = restTemplate.postForObject(centerServiceUrl, httpEntity, String.class);
-                    responseMsg = DataTransactionFactory.decrypt(responseMsg, 2048);
-                }catch (Exception e){
-                    logger.error("调用接口失败",e);
-                    throw new SMOException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR,"调用接口失败"+e);
-                }
-            } else {
-                responseMsg = restTemplate.postForObject(centerServiceUrl,requestBody,String.class);
-            }
-
-        JSONObject businessObj = DataTransactionFactory.getOneBusinessFromCenterServiceResponseJson(responseMsg);
+        Map paramIn = new HashMap();
+        paramIn.put("manageId", manageId);
+        paramIn.put("menuGroup", CommonConstant.MENU_GROUP_LEFT);
+        paramIn.put(CommonConstant.ORDER_USER_ID,manageId);
+        paramIn.put(ServiceCodeConstant.SERVICE_CODE,ServiceCodeConstant.SERVICE_CODE_QUERY_MENU_ITEM);
+        paramIn.put(ServiceCodeConstant.SERVICE_CODE_NAME,ServiceCodeConstant.SERVICE_CODE_QUERY_MENU_ITEM_NAME);
+        JSONObject businessObj = doExecute(paramIn);
         JSONArray menus = businessObj.getJSONArray("menus");
         return menus.toJavaList(Map.class);
     }
 
     /**
      * 用户登录
-     * @param userObj
+     * @param pd
      * @return
      * @throws SMOException
      */
     @Override
-    public String login(JSONObject userObj) throws SMOException {
-        return null;
+    public void login(PageData pd) throws SMOException {
+        String userCode = pd.getParam().getString("userCode");
+        String userPwd = pd.getParam().getString("userPwd");
+        String pageSign = pd.getParam().getString("pageSign");
+
+        Assert.hasText(userCode,"用户编码不能为空");
+        Assert.hasText(userPwd,"用户密码不能为空");
+
+        Map paramIn = new HashMap();
+        paramIn.put("userCode", userCode);
+        paramIn.put(CommonConstant.ORDER_USER_ID,CommonConstant.ORDER_DEFAULT_USER_ID);
+        paramIn.put(ServiceCodeConstant.SERVICE_CODE,ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN);
+        paramIn.put(ServiceCodeConstant.SERVICE_CODE_NAME,ServiceCodeConstant.SERVICE_CODE_QUERY_USER_LOGIN_NAME);
+        //paramIn.put("userPwd", userPwd);
+        JSONObject businessObj = doExecute(paramIn);
+
+        JSONObject user = businessObj.getJSONObject("user");
+        //String newPwd = AuthenticationFactory.md5UserPassword(userPwd);
+        if(!AuthenticationFactory.md5UserPassword(userPwd).equals(user.getString("userPwd"))){
+            throw new SMOException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR,"密码不正确");
+        }
+        String token = "";
+        try {
+            Map userMap = new HashMap();
+            userMap.put(CommonConstant.LOGIN_USER_ID,user.getString("userId"));
+            userMap.put(CommonConstant.LOGIN_USER_NAME,user.getString("userName"));
+            token = AuthenticationFactory.createAndSaveToken(userMap);
+            pd.setToken(token);
+        }catch (Exception e){
+            logger.error("登录异常：",e);
+            throw new SMOException(ResponseConstant.RESULT_CODE_INNER_ERROR,"系统内部错误，请联系管理员");
+        }
+
+        //封装成功信息
+        pd.setResJson(DataTransactionFactory.pageResponseJson(pd.getTransactionId(),ResponseConstant.RESULT_CODE_SUCCESS,"登录成功 ",null));
+
+    }
+
+    private JSONObject doExecute(Map paramIn) {
+        //获取组件
+        String appId = MappingCache.getValue(MappingConstant.KEY_CONSOLE_SERVICE_APP_ID);
+
+        Assert.hasLength(appId, "组件不能为空");
+
+        String centerServiceUrl = MappingCache.getValue(MappingConstant.KEY_CENTER_SERVICE_URL);
+
+        Assert.hasLength(centerServiceUrl, "中心服务器地址没有配置");
+
+        String securityCode = MappingCache.getValue(MappingConstant.KEY_CONSOLE_SECURITY_CODE);
+        Assert.hasLength(securityCode, "签名秘钥没有配置");
+
+        String serviceCode = paramIn.get(ServiceCodeConstant.SERVICE_CODE).toString();
+        String serviceCodeName = paramIn.get(ServiceCodeConstant.SERVICE_CODE_NAME).toString();
+        String userId = paramIn.get(CommonConstant.ORDER_USER_ID).toString();
+        if(paramIn.containsKey(ServiceCodeConstant.SERVICE_CODE)){
+            paramIn.remove(ServiceCodeConstant.SERVICE_CODE);
+        }
+        if(paramIn.containsKey(ServiceCodeConstant.SERVICE_CODE_NAME)){
+            paramIn.remove(ServiceCodeConstant.SERVICE_CODE_NAME);
+        }
+
+        if(paramIn.containsKey(CommonConstant.ORDER_USER_ID)){
+            paramIn.remove(CommonConstant.ORDER_USER_ID);
+        }
+
+        String responseMsg = "";
+        String requestBody = DataTransactionFactory.createQueryOneCenterServiceRequestJson(appId, userId, securityCode,
+                DataTransactionFactory.createQueryOneBusinessRequestJson(serviceCode,
+                        serviceCodeName, paramIn));
+        if (MappingConstant.VALUE_ON.equals(MappingCache.getValue(MappingConstant.KEY_CONSOLE_SERVICE_SECURITY_ON_OFF))) {
+            try {
+                requestBody = DataTransactionFactory.encrypt(requestBody, 2048);
+                //调用查询菜单信息
+                HttpHeaders header = new HttpHeaders();
+                header.add(CommonConstant.ENCRYPT, MappingConstant.VALUE_ON);
+                header.add(CommonConstant.ENCRYPT_KEY_SIZE, "2048");
+                HttpEntity<String> httpEntity = new HttpEntity<String>(requestBody, header);
+                responseMsg = restTemplate.postForObject(centerServiceUrl, httpEntity, String.class);
+                responseMsg = DataTransactionFactory.decrypt(responseMsg, 2048);
+            }catch (Exception e){
+                logger.error("调用接口失败",e);
+                throw new SMOException(ResponseConstant.RESULT_CODE_NO_AUTHORITY_ERROR,"调用接口失败"+e);
+            }
+        } else {
+            responseMsg = restTemplate.postForObject(centerServiceUrl,requestBody,String.class);
+        }
+
+        return DataTransactionFactory.getOneBusinessFromCenterServiceResponseJson(responseMsg);
     }
 
+
     public RestTemplate getRestTemplate() {
         return restTemplate;
     }

ConsoleService/src/main/resources/application.yml

@@ -1,14 +1,26 @@
+jedis:
+  pool:
+    config:
+      maxTotal: 100
+      maxIdle: 20
+      maxWaitMillis: 20000
+    host: 135.192.86.200
+    port: 6379
+
 eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    leaseExpirationDurationInSeconds: 30
   client:
     serviceUrl:
-      defaultZone: http://192.168.31.199:8761/eureka/
+      defaultZone: http://135.192.86.200:8761/eureka/
       #defaultZone: http://localhost:8761/eureka/
 server:
-  port: 7001
+  port: 8443
   ssl:
     keyStoreType: PKCS12
     keyAlias: tomcat
-    key-store: keystore.p12
+    key-store: classpath:keystore.p12
     key-store-password: 12345678
   session:
       cookie:
@@ -18,7 +30,7 @@ spring:
     name: console-service
   redis:
     database: 0
-    host: 192.168.31.199
+    host: 135.192.86.200
     port: 6379
     pool:
       max-active: 300
@@ -35,7 +47,7 @@ spring:
     filters: stat,wall,log4j
     poolPreparedStatements: true
     type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://192.168.31.199:3306/TT
+    url: jdbc:mysql://135.192.86.200:3306/TT
     maxPoolPreparedStatementPerConnectionSize: 20
     password: TT@12345678
     testOnBorrow: false
@@ -58,4 +70,36 @@ spring:
     suffix: .html
     check-template-location: true
 
+#============== kafka ===================
+kafka:
+  consumer:
+    zookeeper:
+      connect: 135.192.86.200:2181
+    servers: 135.192.86.200:9092
+    enable:
+      auto:
+        commit: true
+    session:
+      timeout: 6000
+    auto:
+      commit:
+        interval: 100
+      offset:
+        reset: latest
+    topic: test
+    group:
+      id: consoleService
+    concurrency: 10
+
+  producer:
+    zookeeper:
+      connect: 135.192.86.200:2181
+    servers: 135.192.86.200:9092
+    retries: 0
+    batch:
+      size: 4096
+    linger: 1
+    buffer:
+      memory: 40960
+
 

ConsoleService/src/main/resources/data/login.json

@@ -0,0 +1,11 @@
+{
+  "meta":{
+    "code":"0000",//主要用于，日志记录
+    "message":"成功",
+    "responseTime":"",
+    "transactionId":"10001010" //由系统返回
+  },
+  "data":{
+    //这里是返回参数
+  }
+}

ConsoleService/src/main/resources/html/login.html

@@ -40,7 +40,7 @@
 			<div class="main-content">
 				<div class="row">
 					<div class="col-sm-10 col-sm-offset-1">
-						<div class="login-container">
+						<div class="login-container" style="margin-top: 100px;">
 							<div class="center">
 								<h1>
 									<i class="ace-icon fa fa-leaf green"></i>
@@ -50,6 +50,7 @@
 								<h4 class="blue" id="id-company-text">&copy; java110开发团队</h4>
 							</div>
 
+							<div class="space-6"></div>
 							<div class="space-6"></div>
 
 							<div class="position-relative">
@@ -67,29 +68,33 @@
 												<fieldset>
 													<label class="block clearfix">
 														<span class="block input-icon input-icon-right">
-															<input type="text" class="form-control" placeholder="请输入用户编码" />
+															<input type="text" id="userCode" class="form-control" placeholder="请输入用户编码" />
 															<i class="ace-icon fa fa-user"></i>
 														</span>
 													</label>
 
 													<label class="block clearfix">
 														<span class="block input-icon input-icon-right">
-															<input type="password" class="form-control" placeholder="请输入密码" />
+															<input type="password" id="userPwd" class="form-control" placeholder="请输入密码" />
 															<i class="ace-icon fa fa-lock"></i>
 														</span>
 													</label>
-
+													<span id="errorInfo" style="display:none;color:#DD5A43!important">
+														用户编码错误
+													</span>
 													<div class="space"></div>
 
+
 													<div class="clearfix">
 
-														<button type="button" class="width-35 pull-right btn btn-sm btn-primary">
+														<button type="button" class="width-35 pull-right btn btn-sm btn-primary" onclick="auth()">
 															<i class="ace-icon fa fa-key"></i>
 															<span class="bigger-110">登录</span>
 														</button>
 													</div>
 
 													<div class="space-4"></div>
+
 												</fieldset>
 											</form>
 
@@ -117,7 +122,8 @@
 		<!--[if IE]>
 <script src="../assets/js/jquery-1.11.3.min.js"></script>
 <![endif]-->
-		<script src="../javascript/login.js"></script>
+		<script src="../javascript/java110_req_data.js"></script>
+		<script src="../javascript/java110_auth.js"></script>
 		<script type="text/javascript">
 			if('ontouchstart' in document.documentElement) document.write("<script src='../assets/js/jquery.mobile.custom.min.js'>"+"<"+"/script>");
 		</script>

ConsoleService/src/main/resources/html/menu.html

@@ -7,7 +7,7 @@
 
     <ul class="nav nav-list">
         <li class="active">
-            <a href="index.html">
+            <a href="/">
                 <i class="menu-icon fa fa-tachometer"></i>
                 <span class="menu-text"> 我的菜单 </span>
             </a>