Merge branch 'jsxswms' into integrationWms

zhang

4 天以前 af7b9db27bf72c92108329815ec771fb46e5b877

 src/main/java/com/zy/common/web/RouterController.java

@@ -1,6 +1,5 @@
package com.zy.common.web;

import com.core.common.Cools;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,14 +12,13 @@
@Controller
public class RouterController {

    @Value("${spring.application.name}")
    private String applicationName;
    @Value("${server.servlet.context-path}")
    private String contextPath;

    @RequestMapping("/")
    public void index(HttpServletResponse response) {
        try{
            String redirect = Cools.isEmpty(applicationName)?"views/index.html":"/"+applicationName+"/views/index.html";
            response.sendRedirect(redirect);
            response.sendRedirect(contextPath+"/views/index.html");
        } catch (Exception ex){
            ex.printStackTrace();
        }
@@ -29,8 +27,7 @@
    @RequestMapping("/login")
    public void login(HttpServletResponse response) {
        try{
            String redirect = Cools.isEmpty(applicationName)?"/views/login.html":"/"+applicationName+"/views/login.html";
            response.sendRedirect(redirect);
            response.sendRedirect(contextPath+"/views/login.html");
        } catch (Exception ex){
            ex.printStackTrace();
        }
@@ -39,8 +36,16 @@
    @RequestMapping("/pda")
    public void pda(HttpServletResponse response) {
        try{
            String redirect = Cools.isEmpty(applicationName)?"/views/pda/login.html":"/"+applicationName+"/views/pda/login.html";
            response.sendRedirect(redirect);
            response.sendRedirect(contextPath+"/views/pda/login.html");
        } catch (Exception ex){
            ex.printStackTrace();
        }
    }

    @RequestMapping("/pda/ce")
    public void pdaCe(HttpServletResponse response) {
        try{
            response.sendRedirect(contextPath+"/views/pdaCe/login.html");
        } catch (Exception ex){
            ex.printStackTrace();
        }