init from phab

src/main/java/com/uas/cloud/mall/admin/config/InterceptorConfig.java

@@ -1,20 +0,0 @@
-package com.uas.cloud.mall.admin.config;
-
-import com.uas.cloud.mall.admin.interceptor.LoginInterceptor;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * 拦截器配置
- * @author liuam
- * @version 2018/4/19 0019 下午 13:45 创建文件
- */
-@Configuration
-public class InterceptorConfig extends WebMvcConfigurerAdapter {
-    @Override
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new LoginInterceptor()).addPathPatterns("/**");
-        super.addInterceptors(registry);
-    }
-}

src/main/java/com/uas/cloud/mall/admin/interceptor/LoginInterceptor.java

@@ -1,49 +0,0 @@
-package com.uas.cloud.mall.admin.interceptor;
-
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-/**
- * 拦截所有请求，若用户没有登录，则转发到登录页面
- * @author liuam
- * @version 2018/4/19 0019 下午 13:39 创建文件
- */
-public class LoginInterceptor implements HandlerInterceptor {
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        String uri = request.getRequestURI();
-        // 可以公开访问的地址
-        String[] strings = {"login", "logout", "dologin"};
-
-        // 放行
-        for (String string : strings) {
-            if (uri.indexOf(string) >=0 ) {
-                return true;
-            }
-        }
-
-        HttpSession session = request.getSession();
-        Object attribute = session.getAttribute("user");
-        if(attribute!=null){
-            return true;
-        }
-        //不满足条件，返回到登录页面
-        response.sendRedirect("/login");;
-        return false;
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-
-    }
-}

src/main/java/com/uas/cloud/mall/admin/service/DfsServiceRibbon.java

@@ -58,7 +58,7 @@ public class DfsServiceRibbon {
 
         HttpEntity<LinkedMultiValueMap<String, Object>> requestEntity = new HttpEntity<> (parts, headers);
 
-        ResponseEntity<String> responseEntity = restTemplate.postForEntity(urlConfig.getUploadFileUrl(), requestEntity, String.class);
+        ResponseEntity<String> responseEntity = restTemplate.postForEntity("http://10.10.100.200:9999/file/upload", requestEntity, String.class);
         return responseEntity.getBody();
     }
 

src/main/java/com/uas/cloud/mall/admin/service/LoginService.java

@@ -1,31 +0,0 @@
-package com.uas.cloud.mall.admin.service;
-
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author liuam
- * @version 2018/4/19 0019 下午 14:01 创建文件
- */
-@Service
-public class LoginService {
-
-    private Map<String, String> users = new HashMap();
-
-    public LoginService() {
-        // 登录账号
-        users.put("admin", "admin123***");
-    }
-
-    public String findUser(String userName, String password) {
-        if (!users.containsKey(userName)) {
-            return null;
-        }
-        if (users.get(userName).equals(password)) {
-            return userName;
-        }
-        return null;
-    }
-}

src/main/java/com/uas/cloud/mall/admin/web/LoginAndLogoutController.java

@@ -1,47 +0,0 @@
-package com.uas.cloud.mall.admin.web;
-
-import com.uas.cloud.mall.admin.service.LoginService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import javax.servlet.http.HttpSession;
-import java.util.Map;
-
-/**
- * 登录、登出
- * @author liuam
- * @version 2018/4/19 0019 下午 13:56 创建文件
- *
- */
-@Controller
-public class LoginAndLogoutController {
-
-    @Autowired
-    private LoginService loginService;
-
-    @RequestMapping(value = "/dologin", method = RequestMethod.POST)
-    public String dologin(String userName, String password, HttpSession session, Map<String, String> model) {
-        String user = loginService.findUser(userName, password);
-        if (StringUtils.isEmpty(user)) {
-            model.put("message", "用户名或密码错误");
-            return "login";
-        }
-        session.setAttribute("user", user);
-        return "redirect:/";
-    }
-
-    @RequestMapping(value = "/login", method = RequestMethod.GET)
-    public String login() {
-        return "login";
-    }
-
-    @RequestMapping(value = "/logout", method = RequestMethod.GET)
-    public String logout(HttpSession session) {
-        session.removeAttribute("user");
-        return "redirect:/login";
-    }
-
-}

src/main/resources/static/js/floor.js

@@ -87,9 +87,8 @@ $(function () {
             },
             done: function(e, data) {
                 var path = data.result;
-                var data = eval('(' + path + ')');
-                $('input[name=pictureUrl]').val(data.path);
-                $('.x-picture-preview').show().find('img').attr('src', data.path);
+                $('input[name=pictureUrl]').val(path);
+                $('.x-picture-preview').show().find('img').attr('src', path);
             }
         },
         init: function () {

src/main/resources/templates/login.html

@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org">
-<head>
-    <meta charset="UTF-8"/>
-    <title>商城后台管理系统登录页面</title>
-    <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
-    <script crossorigin="anonymous" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-    <link crossorigin="anonymous" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" rel="stylesheet"/>
-    <style type="text/css">
-        div#login-form {
-            margin: 120px auto;
-            width: 300px;
-        }
-    </style>
-</head>
-<body>
-
-
-    <div class="container">
-        <div id="login-form">
-            <h2 style="text-align: center;">商城后台管理系统</h2>
-            <form action="/dologin" class="form-horizontal" method="post">
-                <div class="form-group">
-                    <label class="sr-only" for="userName">Email address</label>
-                    <input class="form-control" id="userName" name="userName" placeholder="账号" type="text"/>
-                </div>
-                <div class="form-group">
-                    <label class="sr-only" for="password">Password</label>
-                    <input class="form-control" id="password" name="password" placeholder="密码" type="password"/>
-                </div>
-                <div class="form-group">
-                    <button class="btn btn-primary form-control" type="submit">登录</button>
-                </div>
-                <div class="form-group">
-                    <span th:text="${message}"></span>
-                </div>
-            </form>
-        </div>
-    </div>
-</body>
-</html>

src/main/resources/templates/tpls/nav.html

@@ -15,7 +15,6 @@
                 <li><a href="#">设置</a></li>
                 <li><a href="#">个人主页</a></li>
                 <li><a href="#">帮助</a></li>
-                <li><a href="/logout">退出</a></li>
             </ul>
             <form class="navbar-form navbar-right">
                 <input type="text" class="form-control" placeholder="搜索..." />