update reset.less

siaorg · May 20, 2019 · 785f135 · 785f135
1 parent 3af6748
commit 785f135
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/sia-task-config-display/src/common/styles/reset.less b/sia-task-config-display/src/common/styles/reset.less
@@ -40,7 +40,7 @@ input:focus { outline: none; }
   .scroll-bar::-webkit-scrollbar {width:10px; height:10px; background-color:transparent;} /*定义滚动条高宽及背景 高宽分别对应横竖滚动条的尺寸*/
   .scroll-bar::-webkit-scrollbar-track {background-color:#EDFFFD; border-radius:0px; -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,0.3);} /*定义滚动条轨道 内阴影+圆角*/
   .scroll-bar::-webkit-scrollbar-thumb {background-color:#CEE2E0; border-radius:0px; -webkit-box-shadow:inset 0 0 6px rgba(0,0,0,.3);} /*定义滑块 内阴影+圆角*/
-  
+
   // input、select、textarea校验成功之后的边框颜色
   .is-success .el-input__inner, .is-success .el-textarea__inner {
     border: 1px solid #60BECA;
@@ -68,7 +68,7 @@ input:focus { outline: none; }
   }
 
   .el-table {
-    
+
     th {
       display: table-cell!important;
     }
@@ -177,9 +177,9 @@ input:focus { outline: none; }
     border-color: #ADCDF7;
     color: #fff;
   }
-
 
-
+
+
   // 准备中状态按钮颜色
   .el-button.ready {
     background-color: #4A90E2;
@@ -305,6 +305,7 @@ input:focus { outline: none; }
   height: 40px;
   line-height: 40px;
   color: #000;
+  opacity: 0;
 }
 // .right.el-icon-arrow-right:before {
 //   content: "\E604"
@@ -442,7 +443,7 @@ input:focus { outline: none; }
           color: #5584FF;
         }
       }
-      .el-date-table td.end-date span, 
+      .el-date-table td.end-date span,
       .el-date-table td.start-date span,
       .el-date-table td.available.current span,
       .el-date-table td.in-range.start-date div span,

diff --git a/sia-task-config/src/main/java/com/sia/config/web/filter/SimpleCorsFilter.java b/sia-task-config/src/main/java/com/sia/config/web/filter/SimpleCorsFilter.java
@@ -47,9 +47,6 @@ public class SimpleCorsFilter implements Filter {
     private final static Logger LOGGER = LoggerFactory.getLogger(SimpleCorsFilter.class);
     private static final String METHOD_OPTIONS = "OPTIONS";
 
-//    @Value("${gantryUrl}")
-//    private String gantryUrl;
-
     @Override
     public void init(FilterConfig filterConfig) throws ServletException {
     }
@@ -73,11 +70,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo
             filterChain.doFilter(httpServletRequest, httpServletResponse);
         }
         else{
-//            if (!checkLogin(httpServletRequest)){
-//                ((HttpServletResponse) servletResponse).sendRedirect(gantryUrl);
-//            }else {
-                filterChain.doFilter(httpServletRequest, httpServletResponse);
-//            }
+            filterChain.doFilter(httpServletRequest, httpServletResponse);
         }
     }
 

diff --git a/sia-task-config/src/main/resources/application-open.yml b/sia-task-config/src/main/resources/application-open.yml
@@ -13,7 +13,7 @@ spring:
     datasource:
         name: test
         url: jdbc:mysql://127.0.0.1:3306/skyworld_task?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
-        username: root
+        username: ****
         password: ****
         # 使用druid数据源
         type: com.alibaba.druid.pool.DruidDataSource

diff --git a/sia-task-scheduler/src/main/resources/application-open.yml b/sia-task-scheduler/src/main/resources/application-open.yml
@@ -30,7 +30,7 @@ spring:
     datasource:
         name: test
         url: jdbc:mysql://127.0.0.1:3306/skyworld_task?useUnicode=true&characterEncoding=utf8
-        username: root
+        username: ****
         password: ****
         # 使用druid数据源
         type: com.alibaba.druid.pool.DruidDataSource