소스 검색

WebService 调整为vuejs 组件式开发

wuxw7 7 년 전
부모
커밋
c6e72eba33
100개의 변경된 파일0개의 추가작업 그리고 2421개의 파일을 삭제
  1. 0 118
      ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java
  2. 0 59
      ConsoleService/src/main/java/com/java110/console/rest/LoginRest.java
  3. 0 32
      ConsoleService/src/main/resources/data/list.json
  4. 0 86
      ConsoleService/src/main/resources/data/list_template.json
  5. 0 11
      ConsoleService/src/main/resources/data/login.json
  6. 0 17
      ConsoleService/src/main/resources/html/footer.html
  7. 0 94
      ConsoleService/src/main/resources/html/header.html
  8. 0 33
      ConsoleService/src/main/resources/html/import.html
  9. 0 394
      ConsoleService/src/main/resources/html/index.html
  10. 0 87
      ConsoleService/src/main/resources/html/list_template.html
  11. 0 86
      ConsoleService/src/main/resources/html/list_template_cache.html
  12. 0 133
      ConsoleService/src/main/resources/html/login.html
  13. 0 49
      ConsoleService/src/main/resources/html/menu.html
  14. 0 8
      ConsoleService/src/main/resources/html/notify.html
  15. 0 9
      ConsoleService/src/main/resources/html/page_header.html
  16. 0 75
      ConsoleService/src/main/resources/html/test.html
  17. 0 1
      ConsoleService/src/main/resources/static/assets/css/ace-ie.min.css
  18. 0 1
      ConsoleService/src/main/resources/static/assets/css/ace-part2.min.css
  19. 0 1
      ConsoleService/src/main/resources/static/assets/css/ace-rtl.min.css
  20. 0 1
      ConsoleService/src/main/resources/static/assets/css/ace-skins.min.css
  21. 0 1
      ConsoleService/src/main/resources/static/assets/css/ace.min.css
  22. 0 9
      ConsoleService/src/main/resources/static/assets/css/bootstrap-colorpicker.min.css
  23. 0 7
      ConsoleService/src/main/resources/static/assets/css/bootstrap-datepicker3.min.css
  24. 0 5
      ConsoleService/src/main/resources/static/assets/css/bootstrap-datetimepicker.min.css
  25. 0 1
      ConsoleService/src/main/resources/static/assets/css/bootstrap-duallistbox.min.css
  26. 0 12
      ConsoleService/src/main/resources/static/assets/css/bootstrap-editable.min.css
  27. 0 1
      ConsoleService/src/main/resources/static/assets/css/bootstrap-multiselect.min.css
  28. 0 10
      ConsoleService/src/main/resources/static/assets/css/bootstrap-timepicker.min.css
  29. 0 5
      ConsoleService/src/main/resources/static/assets/css/bootstrap.min.css
  30. 0 11
      ConsoleService/src/main/resources/static/assets/css/chosen.min.css
  31. 0 1
      ConsoleService/src/main/resources/static/assets/css/colorbox.min.css
  32. 0 1
      ConsoleService/src/main/resources/static/assets/css/daterangepicker.min.css
  33. 0 1
      ConsoleService/src/main/resources/static/assets/css/dropzone.min.css
  34. 0 4
      ConsoleService/src/main/resources/static/assets/css/font-awesome.min.css
  35. 0 12
      ConsoleService/src/main/resources/static/assets/css/fonts.googleapis.com.css
  36. 0 5
      ConsoleService/src/main/resources/static/assets/css/fullcalendar.min.css
  37. BIN
      ConsoleService/src/main/resources/static/assets/css/images/meteorshower2.jpg
  38. BIN
      ConsoleService/src/main/resources/static/assets/css/images/pattern.jpg
  39. 0 4
      ConsoleService/src/main/resources/static/assets/css/jquery-ui.custom.min.css
  40. 0 4
      ConsoleService/src/main/resources/static/assets/css/jquery-ui.min.css
  41. 0 1
      ConsoleService/src/main/resources/static/assets/css/jquery.gritter.min.css
  42. 0 1
      ConsoleService/src/main/resources/static/assets/css/prettify.min.css
  43. 0 1
      ConsoleService/src/main/resources/static/assets/css/select2.min.css
  44. 0 1
      ConsoleService/src/main/resources/static/assets/css/ui.jqgrid.min.css
  45. 0 4
      ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/css/font-awesome.min.css
  46. BIN
      ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.eot
  47. 0 655
      ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.svg
  48. BIN
      ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf
  49. BIN
      ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.woff
  50. BIN
      ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2
  51. BIN
      ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.eot
  52. 0 288
      ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.svg
  53. BIN
      ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.ttf
  54. BIN
      ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.woff
  55. BIN
      ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.woff2
  56. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/avatar.png
  57. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/avatar1.png
  58. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/avatar2.png
  59. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/avatar3.png
  60. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/avatar4.png
  61. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/avatar5.png
  62. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/profile-pic.jpg
  63. BIN
      ConsoleService/src/main/resources/static/assets/images/avatars/user.jpg
  64. BIN
      ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/alpha-horizontal.png
  65. BIN
      ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/alpha.png
  66. BIN
      ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/hue-horizontal.png
  67. BIN
      ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/hue.png
  68. BIN
      ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/saturation.png
  69. BIN
      ConsoleService/src/main/resources/static/assets/images/email/email1.png
  70. BIN
      ConsoleService/src/main/resources/static/assets/images/email/email2.png
  71. BIN
      ConsoleService/src/main/resources/static/assets/images/email/email3.png
  72. BIN
      ConsoleService/src/main/resources/static/assets/images/email/email4.png
  73. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/image-1.jpg
  74. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/image-2.jpg
  75. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/image-3.jpg
  76. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/image-4.jpg
  77. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/image-5.jpg
  78. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/image-6.jpg
  79. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/thumb-1.jpg
  80. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/thumb-2.jpg
  81. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/thumb-3.jpg
  82. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/thumb-4.jpg
  83. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/thumb-5.jpg
  84. BIN
      ConsoleService/src/main/resources/static/assets/images/gallery/thumb-6.jpg
  85. BIN
      ConsoleService/src/main/resources/static/assets/images/placeholder/165x90.png
  86. BIN
      ConsoleService/src/main/resources/static/assets/images/placeholder/255x150.png
  87. BIN
      ConsoleService/src/main/resources/static/assets/images/placeholder/530x270.png
  88. BIN
      ConsoleService/src/main/resources/static/assets/images/placeholder/550x280.png
  89. 0 4
      ConsoleService/src/main/resources/static/assets/js/ace-editable.min.js
  90. 0 5
      ConsoleService/src/main/resources/static/assets/js/ace-elements.min.js
  91. 0 1
      ConsoleService/src/main/resources/static/assets/js/ace-extra.min.js
  92. 0 5
      ConsoleService/src/main/resources/static/assets/js/ace.min.js
  93. 0 6
      ConsoleService/src/main/resources/static/assets/js/autosize.min.js
  94. 0 6
      ConsoleService/src/main/resources/static/assets/js/bootbox.js
  95. 0 11
      ConsoleService/src/main/resources/static/assets/js/bootstrap-colorpicker.min.js
  96. 0 9
      ConsoleService/src/main/resources/static/assets/js/bootstrap-datepicker.min.js
  97. 0 9
      ConsoleService/src/main/resources/static/assets/js/bootstrap-datetimepicker.min.js
  98. 0 6
      ConsoleService/src/main/resources/static/assets/js/bootstrap-editable.min.js
  99. 0 19
      ConsoleService/src/main/resources/static/assets/js/bootstrap-markdown.min.js
  100. 0 0
      ConsoleService/src/main/resources/static/assets/js/bootstrap-multiselect.min.js

+ 0 - 118
ConsoleService/src/main/java/com/java110/console/rest/ConsoleRest.java

@@ -1,118 +0,0 @@
-package com.java110.console.rest;
-
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.core.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.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/8.
- */
-
-@RestController
-public class ConsoleRest extends BaseController {
-
-    @Autowired
-    private IConsoleServiceSMO consoleServiceSMOImpl;
-
-    @RequestMapping(path = "/console/queryTemplateCol",method = RequestMethod.POST)
-    public String queryTemplateCol(HttpServletRequest request){
-        PageData pd = null;
-        try {
-            pd = this.getPageData(request);
-            // 判断用户是否登录
-            checkLogin(pd);
-            consoleServiceSMOImpl.getTemplateCol(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){
-            logger.error("异常信息:",e);
-            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
-        }
-
-        return pd.getResJson().toJSONString();
-    }
-
-
-    /**
-     * 获取模板数据
-     * @param request
-     * @return
-     */
-    @RequestMapping(path = "/console/queryTemplateData",method = RequestMethod.GET)
-    public  String  queryTemplateData(HttpServletRequest request){
-        PageData pd = null;
-        try {
-            pd = this.getPageData(request);
-            // 判断用户是否登录
-            checkLogin(pd);
-            consoleServiceSMOImpl.getTemplateData(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){
-            logger.error("异常信息:",e);
-            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
-        }
-
-        return pd.getResJson().toJSONString();
-    }
-
-
-    @RequestMapping(path = "/console/flushCache",method = RequestMethod.POST)
-    public String flushCache(HttpServletRequest request){
-        PageData pd = null;
-        try {
-            pd = this.getPageData(request);
-            // 判断用户是否登录
-            checkLogin(pd);
-            consoleServiceSMOImpl.flushCache(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){
-            logger.error("异常信息:",e);
-            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
-        }
-
-        return pd.getResJson().toJSONString();
-    }
-
-    /**
-     * 编辑模板数据
-     * @param request
-     * @return
-     */
-    @RequestMapping(path = "/console/editTemplateData",method = RequestMethod.POST)
-    public  String  editTemplateData(HttpServletRequest request){
-        PageData pd = null;
-        try {
-            pd = this.getPageData(request);
-            // 判断用户是否登录
-            checkLogin(pd);
-            consoleServiceSMOImpl.editTemplateData(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){
-            logger.error("异常信息:",e);
-            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
-        }
-
-        return pd.getResJson().toJSONString();
-    }
-
-}

+ 0 - 59
ConsoleService/src/main/java/com/java110/console/rest/LoginRest.java

@@ -1,59 +0,0 @@
-package com.java110.console.rest;
-
-import com.java110.common.constant.ResponseConstant;
-import com.java110.common.exception.SMOException;
-import com.java110.core.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.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/7.
- */
-@RestController
-public class LoginRest extends BaseController {
-
-
-    @Autowired
-    private IConsoleServiceSMO consoleServiceSMOImpl;
-    /**
-     * 登录
-     * 协议:
-     * {"meta":{"method":"login","requestTime":"20180506013211"},"param":{"userCode":"123","userPwd":"123","pageSign":""}}}
-     }
-     *
-     * @param request
-     * @return
-     */
-    @RequestMapping(path = "/loginRest/login",method = RequestMethod.POST)
-    public String login(HttpServletRequest request) {
-        PageData pd = null;
-        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){
-            logger.error("异常信息:",e);
-            return DataTransactionFactory.pageResponseJson(pd,ResponseConstant.RESULT_CODE_ERROR,"请求参数出错 ",null);
-        }
-
-        return pd.getResJson().toJSONString();
-    }
-
-    public IConsoleServiceSMO getConsoleServiceSMOImpl() {
-        return consoleServiceSMOImpl;
-    }
-
-    public void setConsoleServiceSMOImpl(IConsoleServiceSMO consoleServiceSMOImpl) {
-        this.consoleServiceSMOImpl = consoleServiceSMOImpl;
-    }
-}

+ 0 - 32
ConsoleService/src/main/resources/data/list.json

@@ -1,32 +0,0 @@
-{
-
-  "total": 100,
-
-  "page": 2,
-
-  "records": 10,
-
-  "rows" : [
-
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"},
-    {"id":"1","name":"Desktop Computer","note":"note","stock":"Yes","ship":"FedEx", "sdate":"2007-12-03"}
-
-  ]
-
-}

+ 0 - 86
ConsoleService/src/main/resources/data/list_template.json

@@ -1,86 +0,0 @@
-{
-  "meta": {
-    "code": "0000",
-    "message": "成功",
-    "responseTime": "20180508192009",
-    "transactionId": "112093847"
-  },
-  "data": {
-    "template": [{
-      "colName": "AppId",
-      "colModel": {
-        "name": "id",
-        "index": "id",
-        "width": 60,
-        "sorttype": "int",
-        "editable": "true",
-        "editoptions": {"size" : "10"}
-      }
-    }, {
-      "colName": "日期",
-      "colModel": {
-        "name": "sdate",
-        "index": "sdate",
-        "width": "90",
-        "editable": "true",
-        "sorttype": "date",
-        "unformat": "pickDate"
-      }
-    },
-      {
-        "colName": "名称",
-        "colModel": {
-          "name": "name",
-          "index": "name",
-          "width": "150",
-          "editable": "true",
-          "editoptions": {
-            "size": "20",
-            "maxlength": "30"
-          }
-        }
-      },
-      {
-        "colName": "状态",
-        "colModel": {
-          "name": "stock",
-          "index": "stock",
-          "width": "70",
-          "editable": "true",
-          "edittype": "checkbox",
-          "editoptions": {
-            "value": "Yes:No"
-          },
-          "unformat": "aceSwitch"
-        }
-      },
-      {
-        "colName": "备注1",
-        "colModel": {
-          "name": "note",
-          "index": "note",
-          "width": "150",
-          "sortable": "false",
-          "editable": "true",
-          "edittype": "textarea",
-          "editoptions": {
-            "rows": "2",
-            "cols": "10"
-          }
-        }
-      },
-      {
-        "colName": "",
-        "colModel": {
-          "name": "do",
-          "index": "",
-          "width": "40",
-          "fixed": "true",
-          "sortable": "false",
-          "resize": "false",
-          "formatter": "function(cellvalue, options, rowObject){\n var temp =\"<div style='margin-left:8px;'><div title='详情记录' style='float:left;cursor:pointer;' class='ui-pg-div' id='jEditButton_3' onclick='detail(\"+rowObject+\")' onmouseover='jQuery(this).addClass('ui-state-hover');' onmouseout='jQuery(this).removeClass('ui-state-hover');'><span class='ui-icon fa-search-plus'/></div></div>\";\n return temp; \n}"
-        }
-      }
-    ]
-  }
-}

+ 0 - 11
ConsoleService/src/main/resources/data/login.json

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

+ 0 - 17
ConsoleService/src/main/resources/html/footer.html

@@ -1,17 +0,0 @@
-<div class="footer">
-    <div class="footer-inner">
-        <div class="footer-content">
-						<span class="bigger-120">
-							<span class="blue bolder">控制中心系统</span>
-							java110团队开发&copy; 2013-2018
-						</span>
-
-            &nbsp; &nbsp;
-            <span class="action-buttons">
-							<a href="#">
-								<i class="ace-icon fa fa-twitter-square light-blue bigger-150"></i>
-							</a>
-						</span>
-        </div>
-    </div>
-</div>

+ 0 - 94
ConsoleService/src/main/resources/html/header.html

@@ -1,94 +0,0 @@
-<div id="navbar" class="navbar navbar-default          ace-save-state">
-    <div class="navbar-container ace-save-state" id="navbar-container">
-        <button type="button" class="navbar-toggle menu-toggler pull-left" id="menu-toggler" data-target="#sidebar">
-            <span class="sr-only">Toggle sidebar</span>
-
-            <span class="icon-bar"></span>
-
-            <span class="icon-bar"></span>
-
-            <span class="icon-bar"></span>
-        </button>
-
-        <div class="navbar-header pull-left">
-            <a href="index.html" class="navbar-brand">
-                <small>
-                    <i class="fa fa-leaf"></i>
-                    控制中心系统
-                </small>
-            </a>
-        </div>
-
-        <div class="navbar-buttons navbar-header pull-right" role="navigation">
-            <ul class="nav ace-nav">
-                <li class="grey dropdown-modal">
-                    <a data-toggle="dropdown" class="dropdown-toggle" href="#">
-                        <i class="ace-icon fa fa-tasks"></i>
-                        <span class="badge badge-grey">4</span>
-                    </a>
-
-                    <ul class="dropdown-menu-right dropdown-navbar dropdown-menu dropdown-caret dropdown-close">
-                        <li class="dropdown-header">
-                            <i class="ace-icon fa fa-check"></i>
-                            4个任务
-                        </li>
-
-                        <li class="dropdown-content">
-                            <ul class="dropdown-menu dropdown-navbar">
-                                <li>
-                                    <a href="#">
-                                        <div class="clearfix">
-                                            <span class="pull-left">Software Update</span>
-                                            <span class="pull-right">65%</span>
-                                        </div>
-
-                                        <div class="progress progress-mini">
-                                            <div style="width:65%" class="progress-bar"></div>
-                                        </div>
-                                    </a>
-                                </li>
-                            </ul>
-                        </li>
-                    </ul>
-                </li>
-
-                <li class="light-blue dropdown-modal">
-                    <a data-toggle="dropdown" href="#" class="dropdown-toggle">
-                        <img class="nav-user-photo" src="../assets/images/avatars/user.jpg" alt="Jason's Photo" />
-                        <span class="user-info">
-									<small>欢迎,</small>
-									学文
-								</span>
-
-                        <i class="ace-icon fa fa-caret-down"></i>
-                    </a>
-
-                    <ul class="user-menu dropdown-menu-right dropdown-menu dropdown-yellow dropdown-caret dropdown-close">
-                        <li>
-                            <a href="#">
-                                <i class="ace-icon fa fa-cog"></i>
-                                修改密码
-                            </a>
-                        </li>
-
-                        <li>
-                            <a href="profile.html">
-                                <i class="ace-icon fa fa-user"></i>
-                                个人中心
-                            </a>
-                        </li>
-
-                        <li class="divider"></li>
-
-                        <li>
-                            <a href="#">
-                                <i class="ace-icon fa fa-power-off"></i>
-                                退出
-                            </a>
-                        </li>
-                    </ul>
-                </li>
-            </ul>
-        </div>
-    </div><!-- /.navbar-container -->
-</div>

+ 0 - 33
ConsoleService/src/main/resources/html/import.html

@@ -1,33 +0,0 @@
-<!-- bootstrap & fontawesome -->
-<link rel="stylesheet" href="../assets/css/bootstrap.min.css" />
-<link rel="stylesheet" href="../assets/font-awesome/4.5.0/css/font-awesome.min.css" />
-
-<!-- page specific plugin styles -->
-
-<!-- text fonts -->
-<link rel="stylesheet" href="../assets/css/fonts.googleapis.com.css" />
-
-<!-- ace styles -->
-<link rel="stylesheet" href="../assets/css/ace.min.css" class="ace-main-stylesheet" id="main-ace-style" />
-
-<!--[if lte IE 9]>
-<link rel="stylesheet" href="../assets/css/ace-part2.min.css" class="ace-main-stylesheet" />
-<![endif]-->
-<link rel="stylesheet" href="../assets/css/ace-skins.min.css" />
-<link rel="stylesheet" href="../assets/css/ace-rtl.min.css" />
-
-<!--[if lte IE 9]>
-<link rel="stylesheet" href="../assets/css/ace-ie.min.css" />
-<![endif]-->
-
-<!-- inline styles related to this page -->
-
-<!-- ace settings handler -->
-<script src="../assets/js/ace-extra.min.js"></script>
-
-<!-- HTML5shiv and Respond.js for IE8 to support HTML5 elements and media queries -->
-
-<!--[if lte IE 8]>
-<script src="../assets/js/html5shiv.min.js"></script>
-<script src="../assets/js/respond.min.js"></script>
-<![endif]-->

+ 0 - 394
ConsoleService/src/main/resources/html/index.html

@@ -1,394 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta charset="utf-8" />
-    <title>控制中心系统</title>
-
-    <meta name="description" content="overview &amp; stats" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
-
-    <#include "import.html">
-</head>
-
-<body class="no-skin">
-<#include "header.html">
-
-<div class="main-container ace-save-state" id="main-container">
-    <script type="text/javascript">
-				try{ace.settings.loadState('main-container')}catch(e){}
-			</script>
-
-    <#include "menu.html">
-
-    <div class="main-content">
-        <div class="main-content-inner">
-
-            <div class="page-content">
-                <#include "page_header.html">
-
-                <div class="row">
-                    <div class="col-xs-12">
-                        <!-- PAGE CONTENT BEGINS -->
-                        <#include "notify.html">
-
-                        <div class="row">
-                            <div class="space-6"></div>
-
-                            <div class="vspace-12-sm"></div>
-
-                            <div class="col-sm-6">
-                                <div class="widget-box">
-                                    <div class="widget-header widget-header-flat widget-header-small">
-                                        <h5 class="widget-title">
-                                            <i class="ace-icon fa fa-signal"></i>
-                                            中心服务占有量(总量:200)
-                                        </h5>
-
-                                        <div class="widget-toolbar no-border">
-                                            <div class="inline dropdown-hover">
-                                                <button class="btn btn-minier btn-primary">
-                                                    今日
-                                                    <i class="ace-icon fa fa-angle-down icon-on-right bigger-110"></i>
-                                                </button>
-
-                                                <ul class="dropdown-menu dropdown-menu-right dropdown-125 dropdown-lighter dropdown-close dropdown-caret">
-                                                    <li class="active">
-                                                        <a href="#" class="blue">
-                                                            <i class="ace-icon fa fa-caret-right bigger-110">&nbsp;</i>
-                                                            本周
-                                                        </a>
-                                                    </li>
-
-                                                    <li>
-                                                        <a href="#">
-                                                            <i class="ace-icon fa fa-caret-right bigger-110 invisible">&nbsp;</i>
-                                                            本月
-                                                        </a>
-                                                    </li>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="widget-body">
-                                        <div class="widget-main">
-                                            <div id="piechart-placeholder"></div>
-                                            <div class="clearfix">
-                                            </div>
-                                        </div><!-- /.widget-main -->
-                                    </div><!-- /.widget-body -->
-                                </div><!-- /.widget-box -->
-                            </div><!-- /.col -->
-
-                            <div class="col-sm-6">
-                                <div class="widget-box">
-                                    <div class="widget-header widget-header-flat widget-header-small">
-                                        <h5 class="widget-title">
-                                            <i class="ace-icon fa fa-signal"></i>
-                                            用户服务占有量(总量:200)
-                                        </h5>
-
-                                        <div class="widget-toolbar no-border">
-                                            <div class="inline dropdown-hover">
-                                                <button class="btn btn-minier btn-primary">
-                                                    今日
-                                                    <i class="ace-icon fa fa-angle-down icon-on-right bigger-110"></i>
-                                                </button>
-
-                                                <ul class="dropdown-menu dropdown-menu-right dropdown-125 dropdown-lighter dropdown-close dropdown-caret">
-                                                    <li class="active">
-                                                        <a href="#" class="blue">
-                                                            <i class="ace-icon fa fa-caret-right bigger-110">&nbsp;</i>
-                                                            本周
-                                                        </a>
-                                                    </li>
-
-                                                    <li>
-                                                        <a href="#">
-                                                            <i class="ace-icon fa fa-caret-right bigger-110 invisible">&nbsp;</i>
-                                                            本月
-                                                        </a>
-                                                    </li>
-                                                </ul>
-                                            </div>
-                                        </div>
-                                    </div>
-
-                                    <div class="widget-body">
-                                        <div class="widget-main">
-                                            <div id="piechart-placeholder1"></div>
-                                            <div class="clearfix">
-                                            </div>
-                                        </div><!-- /.widget-main -->
-                                    </div><!-- /.widget-body -->
-                                </div><!-- /.widget-box -->
-                            </div><!-- /.col -->
-                        </div><!-- /.row -->
-
-                        <div class="hr hr32 hr-dotted"></div>
-                        <!-- PAGE CONTENT ENDS -->
-                    </div><!-- /.col -->
-                </div><!-- /.row -->
-            </div><!-- /.page-content -->
-        </div>
-    </div><!-- /.main-content -->
-
-    <#include "footer.html">
-
-</div><!-- /.main-container -->
-
-<!-- basic scripts -->
-
-<!--[if !IE]> -->
-<script src="../assets/js/jquery-2.1.4.min.js"></script>
-
-<!-- <![endif]-->
-
-<!--[if IE]>
-<script src="../assets/js/jquery-1.11.3.min.js"></script>
-<![endif]-->
-<script type="text/javascript">
-			if('ontouchstart' in document.documentElement) document.write("<script src='../assets/js/jquery.mobile.custom.min.js'>"+"<"+"/script>");
-		</script>
-<script src="../assets/js/bootstrap.min.js"></script>
-
-<!-- page specific plugin scripts -->
-
-<!--[if lte IE 8]>
-<script src="../assets/js/excanvas.min.js"></script>
-<![endif]-->
-<script src="../assets/js/jquery-ui.custom.min.js"></script>
-<script src="../assets/js/jquery.ui.touch-punch.min.js"></script>
-<script src="../assets/js/jquery.easypiechart.min.js"></script>
-<script src="../assets/js/jquery.sparkline.index.min.js"></script>
-<script src="../assets/js/jquery.flot.min.js"></script>
-<script src="../assets/js/jquery.flot.pie.min.js"></script>
-<script src="../assets/js/jquery.flot.resize.min.js"></script>
-
-<!-- ace scripts -->
-<script src="../assets/js/ace-elements.min.js"></script>
-<script src="../assets/js/ace.min.js"></script>
-
-<!-- inline scripts related to this page -->
-<script type="text/javascript">
-			jQuery(function($) {
-				$('.easy-pie-chart.percentage').each(function(){
-					var $box = $(this).closest('.infobox');
-					var barColor = $(this).data('color') || (!$box.hasClass('infobox-dark') ? $box.css('color') : 'rgba(255,255,255,0.95)');
-					var trackColor = barColor == 'rgba(255,255,255,0.95)' ? 'rgba(255,255,255,0.25)' : '#E2E2E2';
-					var size = parseInt($(this).data('size')) || 50;
-					$(this).easyPieChart({
-						barColor: barColor,
-						trackColor: trackColor,
-						scaleColor: false,
-						lineCap: 'butt',
-						lineWidth: parseInt(size/10),
-						animate: ace.vars['old_ie'] ? false : 1000,
-						size: size
-					});
-				})
-
-				$('.sparkline').each(function(){
-					var $box = $(this).closest('.infobox');
-					var barColor = !$box.hasClass('infobox-dark') ? $box.css('color') : '#FFF';
-					$(this).sparkline('html',
-									 {
-										tagValuesAttribute:'data-values',
-										type: 'bar',
-										barColor: barColor ,
-										chartRangeMin:$(this).data('min') || 0
-									 });
-				});
-
-
-			  //flot chart resize plugin, somehow manipulates default browser resize event to optimize it!
-			  //but sometimes it brings up errors with normal resize event handlers
-			  $.resize.throttleWindow = false;
-
-			  var placeholder = $('#piechart-placeholder').css({'width':'90%' , 'min-height':'150px'});
-			  var placeholder1 = $('#piechart-placeholder1').css({'width':'90%' , 'min-height':'150px'});
-			  var data = [
-				{ label: "social networks",  data: 38.7, color: "#68BC31"},
-				{ label: "search engines",  data: 24.5, color: "#2091CF"},
-				{ label: "ad campaigns",  data: 8.2, color: "#AF4E96"},
-				{ label: "direct traffic",  data: 18.6, color: "#DA5430"},
-				{ label: "other",  data: 10, color: "#FEE074"}
-			  ]
-			  function drawPieChart(placeholder, data, position) {
-			 	  $.plot(placeholder, data, {
-					series: {
-						pie: {
-							show: true,
-							tilt:0.8,
-							highlight: {
-								opacity: 0.25
-							},
-							stroke: {
-								color: '#fff',
-								width: 2
-							},
-							startAngle: 2
-						}
-					},
-					legend: {
-						show: true,
-						position: position || "ne",
-						labelBoxBorderColor: null,
-						margin:[-30,15]
-					}
-					,
-					grid: {
-						hoverable: true,
-						clickable: true
-					}
-				 })
-			 }
-			 drawPieChart(placeholder, data);
-            drawPieChart(placeholder1, data);
-			 /**
-			 we saved the drawing function and the data to redraw with different position later when switching to RTL mode dynamically
-			 so that's not needed actually.
-			 */
-			 placeholder.data('chart', data);
-			 placeholder.data('draw', drawPieChart);
-
-
-			  //pie chart tooltip example
-			  var $tooltip = $("<div class='tooltip top in'><div class='tooltip-inner'></div></div>").hide().appendTo('body');
-			  var previousPoint = null;
-
-			  placeholder.on('plothover', function (event, pos, item) {
-				if(item) {
-					if (previousPoint != item.seriesIndex) {
-						previousPoint = item.seriesIndex;
-						var tip = item.series['label'] + " : " + item.series['percent']+'%';
-						$tooltip.show().children(0).text(tip);
-					}
-					$tooltip.css({top:pos.pageY + 10, left:pos.pageX + 10});
-				} else {
-					$tooltip.hide();
-					previousPoint = null;
-				}
-
-			 });
-
-				/////////////////////////////////////
-				$(document).one('ajaxloadstart.page', function(e) {
-					$tooltip.remove();
-				});
-
-
-
-
-				var d1 = [];
-				for (var i = 0; i < Math.PI * 2; i += 0.5) {
-					d1.push([i, Math.sin(i)]);
-				}
-
-				var d2 = [];
-				for (var i = 0; i < Math.PI * 2; i += 0.5) {
-					d2.push([i, Math.cos(i)]);
-				}
-
-				var d3 = [];
-				for (var i = 0; i < Math.PI * 2; i += 0.2) {
-					d3.push([i, Math.tan(i)]);
-				}
-
-
-				var sales_charts = $('#sales-charts').css({'width':'100%' , 'height':'220px'});
-				$.plot("#sales-charts", [
-					{ label: "Domains", data: d1 },
-					{ label: "Hosting", data: d2 },
-					{ label: "Services", data: d3 }
-				], {
-					hoverable: true,
-					shadowSize: 0,
-					series: {
-						lines: { show: true },
-						points: { show: true }
-					},
-					xaxis: {
-						tickLength: 0
-					},
-					yaxis: {
-						ticks: 10,
-						min: -2,
-						max: 2,
-						tickDecimals: 3
-					},
-					grid: {
-						backgroundColor: { colors: [ "#fff", "#fff" ] },
-						borderWidth: 1,
-						borderColor:'#555'
-					}
-				});
-
-
-				$('#recent-box [data-rel="tooltip"]').tooltip({placement: tooltip_placement});
-				function tooltip_placement(context, source) {
-					var $source = $(source);
-					var $parent = $source.closest('.tab-content')
-					var off1 = $parent.offset();
-					var w1 = $parent.width();
-
-					var off2 = $source.offset();
-					//var w2 = $source.width();
-
-					if( parseInt(off2.left) < parseInt(off1.left) + parseInt(w1 / 2) ) return 'right';
-					return 'left';
-				}
-
-
-				$('.dialogs,.comments').ace_scroll({
-					size: 300
-			    });
-
-
-				//Android's default browser somehow is confused when tapping on label which will lead to dragging the task
-				//so disable dragging when clicking on label
-				var agent = navigator.userAgent.toLowerCase();
-				if(ace.vars['touch'] && ace.vars['android']) {
-				  $('#tasks').on('touchstart', function(e){
-					var li = $(e.target).closest('#tasks li');
-					if(li.length == 0)return;
-					var label = li.find('label.inline').get(0);
-					if(label == e.target || $.contains(label, e.target)) e.stopImmediatePropagation() ;
-				  });
-				}
-
-				$('#tasks').sortable({
-					opacity:0.8,
-					revert:true,
-					forceHelperSize:true,
-					placeholder: 'draggable-placeholder',
-					forcePlaceholderSize:true,
-					tolerance:'pointer',
-					stop: function( event, ui ) {
-						//just for Chrome!!!! so that dropdowns on items don't appear below other items after being moved
-						$(ui.item).css('z-index', 'auto');
-					}
-					}
-				);
-				$('#tasks').disableSelection();
-				$('#tasks input:checkbox').removeAttr('checked').on('click', function(){
-					if(this.checked) $(this).closest('li').addClass('selected');
-					else $(this).closest('li').removeClass('selected');
-				});
-
-
-				//show the dropdowns on top or bottom depending on window height and menu position
-				$('#task-tab .dropdown-hover').on('mouseenter', function(e) {
-					var offset = $(this).offset();
-
-					var $w = $(window)
-					if (offset.top > $w.scrollTop() + $w.innerHeight() - 100)
-						$(this).addClass('dropup');
-					else $(this).removeClass('dropup');
-				});
-
-			})
-		</script>
-</body>
-</html>

+ 0 - 87
ConsoleService/src/main/resources/html/list_template.html

@@ -1,87 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta charset="utf-8" />
-    <title>${templateName} - java110</title>
-
-    <meta name="description" content="Dynamic tables and grids using jqGrid plugin" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
-
-    <!-- page specific plugin styles -->
-    <link rel="stylesheet" href="../assets/css/jquery-ui.min.css" />
-    <link rel="stylesheet" href="../assets/css/bootstrap-datepicker3.min.css" />
-    <link rel="stylesheet" href="../assets/css/ui.jqgrid.min.css" />
-
-    <#include "import.html">
-</head>
-
-<body class="no-skin">
-<#include "header.html">
-
-<div class="main-container ace-save-state" id="main-container">
-    <script type="text/javascript">
-				try{ace.settings.loadState('main-container')}catch(e){}
-			</script>
-
-    <#include "menu.html">
-
-    <div class="main-content">
-        <div class="main-content-inner">
-
-            <div class="page-content">
-
-                <#include "page_header.html">
-
-                <div class="row">
-                    <div class="col-xs-12">
-                        <#include "notify.html">
-
-                            <input type="hidden" id="templateCode" name="templateCode" value="${templateCode}"/>
-
-                        <table id="grid-table"></table>
-
-                        <div id="grid-pager"></div>
-
-                        <!-- PAGE CONTENT ENDS -->
-                    </div><!-- /.col -->
-                </div><!-- /.row -->
-            </div><!-- /.page-content -->
-        </div>
-    </div><!-- /.main-content -->
-
-        <#include "footer.html">
-
-    <a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
-        <i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
-    </a>
-</div><!-- /.main-container -->
-
-<!-- basic scripts -->
-
-<!--[if !IE]> -->
-<script src="../assets/js/jquery-2.1.4.min.js"></script>
-
-<!-- <![endif]-->
-
-<!--[if IE]>
-<script src="../assets/js/jquery-1.11.3.min.js"></script>
-<![endif]-->
-<script type="text/javascript">
-			if('ontouchstart' in document.documentElement) document.write("<script src='../assets/js/jquery.mobile.custom.min.js'>"+"<"+"/script>");
-		</script>
-<script src="../assets/js/bootstrap.min.js"></script>
-
-<!-- page specific plugin scripts -->
-<script src="../assets/js/bootstrap-datepicker.min.js"></script>
-<script src="../assets/js/jquery.jqGrid.min.js"></script>
-<script src="../assets/js/grid.locale-cn.js"></script>
-
-<!-- ace scripts -->
-<script src="../assets/js/ace-elements.min.js"></script>
-<script src="../assets/js/ace.min.js"></script>
-    <script src="../javascript/java110_req_data.js"></script>
-<!-- inline scripts related to this page -->
-    <script src="../javascript/java110_list_template.js"></script>
-</body>
-</html>

+ 0 - 86
ConsoleService/src/main/resources/html/list_template_cache.html

@@ -1,86 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <meta charset="utf-8" />
-    <title>${templateName} - java110</title>
-
-    <meta name="description" content="Dynamic tables and grids using jqGrid plugin" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
-
-    <!-- page specific plugin styles -->
-    <link rel="stylesheet" href="../assets/css/jquery-ui.min.css" />
-    <link rel="stylesheet" href="../assets/css/bootstrap-datepicker3.min.css" />
-    <link rel="stylesheet" href="../assets/css/ui.jqgrid.min.css" />
-
-    <#include "import.html">
-</head>
-
-<body class="no-skin">
-<#include "header.html">
-
-<div class="main-container ace-save-state" id="main-container">
-    <script type="text/javascript">
-				try{ace.settings.loadState('main-container')}catch(e){}
-			</script>
-
-    <#include "menu.html">
-
-    <div class="main-content">
-        <div class="main-content-inner">
-
-            <div class="page-content">
-
-                <#include "page_header.html">
-
-                <div class="row">
-                    <div class="col-xs-12">
-                        <#include "notify.html">
-
-                            <input type="hidden" id="templateCode" name="templateCode" value="${templateCode}"/>
-
-                        <table id="grid-table"></table>
-
-                        <!-- PAGE CONTENT ENDS -->
-                    </div><!-- /.col -->
-                </div><!-- /.row -->
-            </div><!-- /.page-content -->
-        </div>
-    </div><!-- /.main-content -->
-
-        <#include "footer.html">
-
-    <a href="#" id="btn-scroll-up" class="btn-scroll-up btn btn-sm btn-inverse">
-        <i class="ace-icon fa fa-angle-double-up icon-only bigger-110"></i>
-    </a>
-</div><!-- /.main-container -->
-
-<!-- basic scripts -->
-
-<!--[if !IE]> -->
-<script src="../assets/js/jquery-2.1.4.min.js"></script>
-
-<!-- <![endif]-->
-
-<!--[if IE]>
-<script src="../assets/js/jquery-1.11.3.min.js"></script>
-<![endif]-->
-<script type="text/javascript">
-			if('ontouchstart' in document.documentElement) document.write("<script src='../assets/js/jquery.mobile.custom.min.js'>"+"<"+"/script>");
-		</script>
-<script src="../assets/js/bootstrap.min.js"></script>
-
-<!-- page specific plugin scripts -->
-<script src="../assets/js/bootstrap-datepicker.min.js"></script>
-<script src="../assets/js/jquery.jqGrid.min.js"></script>
-<script src="../assets/js/grid.locale-cn.js"></script>
-
-<!-- ace scripts -->
-<script src="../assets/js/ace-elements.min.js"></script>
-<script src="../assets/js/ace.min.js"></script>
-    <script src="../javascript/java110_req_data.js"></script>
-<!-- inline scripts related to this page -->
-    <script src="../javascript/java110_list_template_cache.js"></script>
-    <script src="../javascript/java110_list_template.js"></script>
-</body>
-</html>

+ 0 - 133
ConsoleService/src/main/resources/html/login.html

@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-	<head>
-		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-		<meta charset="utf-8" />
-		<title>登录-java110</title>
-
-		<meta name="description" content="User login page" />
-		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
-
-		<!-- bootstrap & fontawesome -->
-		<link rel="stylesheet" href="../assets/css/bootstrap.min.css" />
-		<link rel="stylesheet" href="../assets/font-awesome/4.5.0/css/font-awesome.min.css" />
-
-		<!-- text fonts -->
-		<link rel="stylesheet" href="../assets/css/fonts.googleapis.com.css" />
-
-		<!-- ace styles -->
-		<link rel="stylesheet" href="../assets/css/ace.min.css" />
-
-		<!--[if lte IE 9]>
-			<link rel="stylesheet" href="../assets/css/ace-part2.min.css" />
-		<![endif]-->
-		<link rel="stylesheet" href="../assets/css/ace-rtl.min.css" />
-
-		<!--[if lte IE 9]>
-		  <link rel="stylesheet" href="../assets/css/ace-ie.min.css" />
-		<![endif]-->
-
-		<!-- HTML5shiv and Respond.js for IE8 to support HTML5 elements and media queries -->
-
-		<!--[if lte IE 8]>
-		<script src="../assets/js/html5shiv.min.js"></script>
-		<script src="../assets/js/respond.min.js"></script>
-		<![endif]-->
-	</head>
-
-	<body class="login-layout light-login">
-		<div class="main-container">
-			<div class="main-content">
-				<div class="row">
-					<div class="col-sm-10 col-sm-offset-1">
-						<div class="login-container" style="margin-top: 100px;">
-							<div class="center">
-								<h1>
-									<i class="ace-icon fa fa-leaf green"></i>
-									<span class="red">控制中心</span>
-									<span class="grey" id="id-text2">登录</span>
-								</h1>
-								<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">
-								<div id="login-box" class="login-box visible widget-box no-border">
-									<div class="widget-body">
-										<div class="widget-main">
-											<h4 class="header blue lighter bigger">
-												<i class="ace-icon fa fa-coffee green"></i>
-												请登录
-											</h4>
-
-											<div class="space-6"></div>
-
-											<form>
-												<fieldset>
-													<label class="block clearfix">
-														<span class="block input-icon input-icon-right">
-															<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" 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" onclick="auth()">
-															<i class="ace-icon fa fa-key"></i>
-															<span class="bigger-110">登录</span>
-														</button>
-													</div>
-
-													<div class="space-4"></div>
-
-												</fieldset>
-											</form>
-
-											<div class="space-6"></div>
-
-
-										</div><!-- /.widget-main -->
-
-									</div><!-- /.widget-body -->
-								</div><!-- /.login-box -->
-							</div><!-- /.position-relative -->
-						</div>
-					</div><!-- /.col -->
-				</div><!-- /.row -->
-			</div><!-- /.main-content -->
-		</div><!-- /.main-container -->
-
-		<!-- basic scripts -->
-
-		<!--[if !IE]> -->
-		<script src="../assets/js/jquery-2.1.4.min.js"></script>
-
-		<!-- <![endif]-->
-
-		<!--[if IE]>
-<script src="../assets/js/jquery-1.11.3.min.js"></script>
-<![endif]-->
-		<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>
-
-
-	</body>
-</html>

+ 0 - 49
ConsoleService/src/main/resources/html/menu.html

@@ -1,49 +0,0 @@
-<div id="sidebar" class="sidebar                  responsive                    ace-save-state">
-    <script type="text/javascript">
-					try{ace.settings.loadState('sidebar')}catch(e){}
-				</script>
-
-    <!-- /.sidebar-shortcuts -->
-
-    <ul class="nav nav-list">
-        <li class="active">
-            <a href="/">
-                <i class="menu-icon fa fa-tachometer"></i>
-                <span class="menu-text"> 我的菜单 </span>
-            </a>
-
-            <b class="arrow"></b>
-        </li>
-        <#list menus as menu>
-        <li class="">
-            <a href="#" class="dropdown-toggle">
-                <i class="menu-icon fa fa-desktop"></i>
-                <span class="menu-text">
-								${menu.name}
-							</span>
-
-                <b class="arrow fa fa-angle-down"></b>
-            </a>
-
-            <b class="arrow"></b>
-
-            <ul class="submenu">
-                <#list menu.subMenus as subMenu>
-                <li class="">
-                    <a href="${subMenu.url}">
-                        <i class="menu-icon fa fa-caret-right"></i>
-                        ${subMenu.name}
-                    </a>
-
-                    <b class="arrow"></b>
-                </li>
-                </#list>
-            </ul>
-        </li>
-        </#list>
-    </ul><!-- /.nav-list -->
-
-    <div class="sidebar-toggle sidebar-collapse" id="sidebar-collapse">
-        <span id="sidebar-toggle-icon" class="ace-icon fa fa-angle-double-left ace-save-state" data-icon1="ace-icon fa fa-angle-double-left" data-icon2="ace-icon fa fa-angle-double-right"></span>
-    </div>
-</div>

+ 0 - 8
ConsoleService/src/main/resources/html/notify.html

@@ -1,8 +0,0 @@
-<div class="alert alert-block alert-success">
-    <button type="button" class="close" data-dismiss="alert">
-        <i class="ace-icon fa fa-times"></i>
-    </button>
-
-    <i class="ace-icon fa fa-check green"></i>
-    这里是一条通知信息
-</div>

+ 0 - 9
ConsoleService/src/main/resources/html/page_header.html

@@ -1,9 +0,0 @@
-<div class="page-header">
-    <h1>
-        ${templateName}
-        <small>
-            <i class="ace-icon fa fa-angle-double-right"></i>
-            简介 &amp; 说明
-        </small>
-    </h1>
-</div><!-- /.page-header -->

+ 0 - 75
ConsoleService/src/main/resources/html/test.html

@@ -1,75 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-    <link rel="stylesheet" href="../static/assets/css/bootstrap.min.css" />
-    <!-- page specific plugin styles -->
-    <link rel="stylesheet" href="../static/assets/css/jquery-ui.min.css" />
-    <link rel="stylesheet" href="../static/assets/css/bootstrap-datepicker3.min.css" />
-    <link rel="stylesheet" href="../static/assets/css/ui.jqgrid.min.css" />
-
-
-    <link rel="stylesheet" href="../static/assets/css/ace.min.css" class="ace-main-stylesheet" id="main-ace-style" />
-
-    <link rel="stylesheet" href="../static/assets/css/ace-skins.min.css" />
-    <link rel="stylesheet" href="../static/assets/css/ace-rtl.min.css" />
-    <link rel="stylesheet" href="../static/assets/css/fonts.googleapis.com.css" />
-    <link rel="stylesheet" href="../static/assets/font-awesome/4.5.0/css/font-awesome.min.css" />
-</head>
-<body>
-
-<table id="grid-table"></table>
-
-<div id="grid-pager"></div>
-
-<button class="btn btn-blue" id="bedata">新增</button>
-
-
-<script src="../static/assets/js/jquery-2.1.4.min.js"></script>
-<script src="../static/assets/js/jquery.jqGrid.min.js"></script>
-<script src="../static/assets/js/grid.locale-cn.js"></script>
-<script src="../static/javascript/java110_req_data.js"></script>
-
-
-<!-- inline scripts related to this page -->
-<script type="text/javascript">
-
-       $(function(){
-  pageInit();
-});
-function pageInit(){
-  jQuery("#grid-table").jqGrid(
-      {
-        url : '../data/list.json',
-        datatype : "json",
-        colNames : [ 'Inv No', 'Date', 'Client', 'Amount', 'Tax','Total', 'Closed', 'Ship via', 'Notes' ],
-        colModel : [
-                    {name : 'id',index : 'id',width : 55,editable : "true",editoptions : {readonly : true,size : 10}},
-                    {name : 'invdate',index : 'invdate',width : 80,editable : true,editoptions : {size : 10}},
-                    {name : 'name',index : 'name',width : 90,editable : true,editoptions : {size : 25}},
-                    {name : 'amount',index : 'amount',width : 60,align : "right",editable : true,editoptions : {size : 10}},
-                    {name : 'tax',index : 'tax',width : 60,align : "right",editable : true,editoptions : {size : 10}},
-                    {name : 'total',index : 'total',width : 60,align : "right",editable : true,editoptions : {size : 10}},
-                    {name : 'closed',index : 'closed',width : 55,align : 'center',editable : true,edittype : "checkbox",editoptions : {value : "Yes:No"}},
-                    {name : 'ship_via',index : 'ship_via',width : 70,editable : true,edittype : "select",editoptions : {value : "FE:FedEx;TN:TNT"}},
-                    {name : 'note',index : 'note',width : 100,sortable : false,editable : true,edittype : "textarea",editoptions : {rows : "2",cols : "20"}}
-                  ],
-        rowNum : 10,
-        rowList : [ 10, 20, 30 ],
-        pager : '#pagered',
-        sortname : 'id',
-        viewrecords : true,
-        sortorder : "desc",
-        caption : "Search Example",
-        editurl : "/RowEditing"
-      });
-  $("#bedata").click(function() {
-    jQuery("#grid-table").jqGrid('editGridRow', "new", {
-      reloadAfterSubmit : false
-    });
-  });
-}
-		</script>
-</body>
-</html>

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/ace-ie.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/ace-part2.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/ace-rtl.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/ace-skins.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/ace.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 9
ConsoleService/src/main/resources/static/assets/css/bootstrap-colorpicker.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 7
ConsoleService/src/main/resources/static/assets/css/bootstrap-datepicker3.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 5
ConsoleService/src/main/resources/static/assets/css/bootstrap-datetimepicker.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/bootstrap-duallistbox.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 12
ConsoleService/src/main/resources/static/assets/css/bootstrap-editable.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/bootstrap-multiselect.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 10
ConsoleService/src/main/resources/static/assets/css/bootstrap-timepicker.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 5
ConsoleService/src/main/resources/static/assets/css/bootstrap.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 11
ConsoleService/src/main/resources/static/assets/css/chosen.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/colorbox.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/daterangepicker.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/dropzone.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 4
ConsoleService/src/main/resources/static/assets/css/font-awesome.min.css


+ 0 - 12
ConsoleService/src/main/resources/static/assets/css/fonts.googleapis.com.css

@@ -1,12 +0,0 @@
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 300;
-  src: local('Open Sans Light'), local('OpenSans-Light'), url(http://fonts.gstatic.com/s/opensans/v13/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff) format('woff');
-}
-@font-face {
-  font-family: 'Open Sans';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Open Sans'), local('OpenSans'), url(http://fonts.gstatic.com/s/opensans/v13/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff');
-}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 5
ConsoleService/src/main/resources/static/assets/css/fullcalendar.min.css


BIN
ConsoleService/src/main/resources/static/assets/css/images/meteorshower2.jpg


BIN
ConsoleService/src/main/resources/static/assets/css/images/pattern.jpg


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 4
ConsoleService/src/main/resources/static/assets/css/jquery-ui.custom.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 4
ConsoleService/src/main/resources/static/assets/css/jquery-ui.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/jquery.gritter.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/prettify.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/select2.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/css/ui.jqgrid.min.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 4
ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/css/font-awesome.min.css


BIN
ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.eot


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 655
ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.svg


BIN
ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.ttf


BIN
ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.woff


BIN
ConsoleService/src/main/resources/static/assets/font-awesome/4.5.0/fonts/fontawesome-webfont.woff2


BIN
ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.eot


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 288
ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.svg


BIN
ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.ttf


BIN
ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.woff


BIN
ConsoleService/src/main/resources/static/assets/fonts/glyphicons-halflings-regular.woff2


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/avatar.png


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/avatar1.png


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/avatar2.png


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/avatar3.png


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/avatar4.png


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/avatar5.png


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/profile-pic.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/avatars/user.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/alpha-horizontal.png


BIN
ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/alpha.png


BIN
ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/hue-horizontal.png


BIN
ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/hue.png


BIN
ConsoleService/src/main/resources/static/assets/images/bootstrap-colorpicker/saturation.png


BIN
ConsoleService/src/main/resources/static/assets/images/email/email1.png


BIN
ConsoleService/src/main/resources/static/assets/images/email/email2.png


BIN
ConsoleService/src/main/resources/static/assets/images/email/email3.png


BIN
ConsoleService/src/main/resources/static/assets/images/email/email4.png


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/image-1.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/image-2.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/image-3.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/image-4.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/image-5.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/image-6.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/thumb-1.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/thumb-2.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/thumb-3.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/thumb-4.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/thumb-5.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/gallery/thumb-6.jpg


BIN
ConsoleService/src/main/resources/static/assets/images/placeholder/165x90.png


BIN
ConsoleService/src/main/resources/static/assets/images/placeholder/255x150.png


BIN
ConsoleService/src/main/resources/static/assets/images/placeholder/530x270.png


BIN
ConsoleService/src/main/resources/static/assets/images/placeholder/550x280.png


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 4
ConsoleService/src/main/resources/static/assets/js/ace-editable.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 5
ConsoleService/src/main/resources/static/assets/js/ace-elements.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 1
ConsoleService/src/main/resources/static/assets/js/ace-extra.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 5
ConsoleService/src/main/resources/static/assets/js/ace.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 6
ConsoleService/src/main/resources/static/assets/js/autosize.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 6
ConsoleService/src/main/resources/static/assets/js/bootbox.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 11
ConsoleService/src/main/resources/static/assets/js/bootstrap-colorpicker.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 9
ConsoleService/src/main/resources/static/assets/js/bootstrap-datepicker.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 9
ConsoleService/src/main/resources/static/assets/js/bootstrap-datetimepicker.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 6
ConsoleService/src/main/resources/static/assets/js/bootstrap-editable.min.js


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 19
ConsoleService/src/main/resources/static/assets/js/bootstrap-markdown.min.js


+ 0 - 0
ConsoleService/src/main/resources/static/assets/js/bootstrap-multiselect.min.js


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.