样式修改

src/main/java/com/dlbridge/jadp/config/filter/SpringCommonFilter.java

@@ -16,6 +16,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.stereotype.Service;
 import org.springframework.util.AntPathMatcher;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.method.HandlerMethod;

src/main/java/com/dlbridge/jadp/config/sentinel/RestfulUrlCleaner.java

@@ -2,12 +2,14 @@ package com.dlbridge.jadp.config.sentinel;
 
 
 import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner;
+import lombok.extern.log4j.Log4j2;
 
 import java.util.HashSet;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+@Log4j2
 public class RestfulUrlCleaner implements UrlCleaner {
 
 
@@ -67,6 +69,7 @@ public class RestfulUrlCleaner implements UrlCleaner {
                 replacedUrl.append(original[i]);
             }
         }
+        log.info("【sentinel】 \t\n 替换之前："+originUrl+"\n  替换后的URL:"+replacedUrl.toString());
         return replacedUrl.toString();
     }
 

src/main/java/com/dlbridge/jadp/config/sentinel/SentinelAutoConfiguration.java

 package com.dlbridge.jadp.config.sentinel;
 
 import com.alibaba.cloud.sentinel.SentinelProperties;
-import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner;
 import com.dlbridge.jadp.config.filter.SpringCommonFilter;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
@@ -15,7 +13,10 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import javax.servlet.Filter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 import static com.dlbridge.jadp.config.filter.SpringCommonFilter.HTTP_METHOD_SPECIFY;
 
@@ -24,11 +25,6 @@ import static com.dlbridge.jadp.config.filter.SpringCommonFilter.HTTP_METHOD_SPE
 @EnableConfigurationProperties(SentinelProperties.class)
 public class SentinelAutoConfiguration {
 
-    /**
-     * spring.cloud.sentinel.pathvariable.skip.list
-     */
-    @Value("${spring.cloud.sentinel.skip-keys}")
-    private String SKIP_LIST_KEY;
 
     /**
      *  spring.cloud.sentinel.excludeUrls
@@ -64,13 +60,5 @@ public class SentinelAutoConfiguration {
         return new SpringCommonFilter();
     }
 
-    @Bean
-    @ConditionalOnMissingBean
-    public UrlCleaner urlCleaner(ApplicationContext applicationContext) {
-        String[] skipList = SKIP_LIST_KEY.split(",");
-        Set<String> skipSet = new HashSet<>();
-        skipSet.addAll(Arrays.asList(skipList));
-        return new RestfulUrlCleaner(skipSet);
-    }
 
 }
\ No newline at end of file

src/main/java/com/dlbridge/jadp/config/sentinel/SentinelConfig.java

+package com.dlbridge.jadp.config.sentinel;
+
+import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlCleaner;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+@Configuration
+@RefreshScope
+public class SentinelConfig {
+
+    /**
+     * spring.cloud.sentinel.pathvariable.skip.list
+     */
+    @Value("${spring.cloud.sentinel.skip-keys}")
+    private String SKIP_LIST_KEY;
+
+
+    @Bean
+    @ConditionalOnMissingBean
+    public UrlCleaner urlCleaner(ApplicationContext applicationContext) {
+        String[] skipList = SKIP_LIST_KEY.split(",");
+        Set<String> skipSet = new HashSet<>();
+        skipSet.addAll(Arrays.asList(skipList));
+        return new RestfulUrlCleaner(skipSet);
+    }
+}

src/main/java/com/dlbridge/jadp/plugins/cmpt/web/RoadController.java

@@ -45,10 +45,12 @@ public class RoadController {
         Cmpt cmpt = cmptService.queryCmptBycmptId(cmptId);
         mv.addObject("cmpt", cmpt);
         List<Road> list = roadService.queryRoads(cmptId);
-        for (Road road : list) {
-            log.info("RoadController getName:" + road.getName() + " getRoadId：" + road.getRoadId() + " getFileName:" + road.getFileName());
+        if(list != null){
+            for (Road road : list) {
+                log.info("RoadController getName:" + road.getName() + " getRoadId：" + road.getRoadId() + " getFileName:" + road.getFileName());
+            }
         }
-        log.info(list);
+
         mv.addObject("list", list);
         mv.setViewName("cmpt/road");
         return mv;

src/main/resources/application-production.properties

@@ -2,7 +2,7 @@ spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.password=mysql_master_geexek_408
 spring.datasource.username=mysql_master
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://rm-bp15ojs1ys1eur32zwo.mysql.rds.aliyuncs.com:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://rm-bp15ojs1ys1eur32z.mysql.rds.aliyuncs.com:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
 
 mybatis.typeAliasesPackage=com.dlbridge.jadp.plugins
 mybatis.mapperLocations=classpath:com/dlbridge/jadp/**/**.xml
@@ -27,7 +27,7 @@ spring.mvc.view.suffix=.jsp
 spring.freemarker.template-loader-path=classpath:/templates
 spring.resources.static-locations=/static/
 spring.mvc.static-path-pattern=/**
-security.basic.enabled=false  
+security.basic.enabled=false
 management.security.enabled=false
 ##scheduler
 spring.task.scheduler.pool=10
@@ -54,19 +54,12 @@ spring.redis.cluster.nodes=10.29.114.167:7001,10.29.114.167:7002,10.29.114.167:7
 spring.servlet.multipart.max-file-size=10Mb
 spring.servlet.multipart.enabled=true
 spring.servlet.multipart.max-request-size=50Mb
-eureka.client.register-with-eureka=true
-eureka.client.fetch-registry=true
 spring.application.name=micro-gksite
-eureka.client.service-url.defaultZone=http://10.29.116.151:8020/eureka/
-eureka.client.instance.instance-id=micro-gksite
-eureka.instance.hostname=micro-gksite
 ribbon.eureka.enable=true
-eureka.instance.lease-renewal-interval-in-seconds=2
-eureka.instance.lease-expiration-duration-in-seconds=5
 #feign调用连接超时时间
 feign.client.config.default.connect-timeout=2000
 #feign调用读取超时时间
-feign.client.config.default.readTimeout=2000 
+feign.client.config.default.readTimeout=2000
 #feign调用的log 等级
 feign.client.config.default.loggerLevel=basic
 feign.okhttp.enabled=true
@@ -87,4 +80,26 @@ spring.sleuth.sampler.probability=0.1
 spring.zipkin.sender.type=web
 swagger.enable=false
 
-base.url=https://zs.geexek.com/
\ No newline at end of file
+base.url=https://zs.geexek.com/
+
+
+spring.cloud.nacos.server-addr=https://nacos.geexek.com
+spring.cloud.nacos.discovery.group=production
+#spring.cloud.sentinel.servlet.blockPage=test
+
+spring.cloud.sentinel.transport.dashboard=http://172.16.214.237:8848
+spring.cloud.sentinel.transport.port=8719
+spring.cloud.sentinel.eager=true
+spring.cloud.sentinel.filter.enabled=false
+spring.cloud.sentinel.skip-keys=cmptId
+spring.cloud.sentinel.exclude-urls=/static/**,**.css,**.js
+
+## nacos 地址
+spring.cloud.sentinel.datasource.ds.nacos.server-addr=https://nacos.geexek.com
+spring.cloud.sentinel.datasource.ds.nacos.dataId=micro-gksite-sentinel
+spring.cloud.sentinel.datasource.ds.nacos.data-type=json
+spring.cloud.sentinel.datasource.ds.nacos.groupId=production
+#spring.cloud.sentinel.datasource.ds1.nacos.namespace=fad8a39-a3e7-49a1-ae96-0f7aaf39136b
+#
+## 规则类型
+spring.cloud.sentinel.datasource.ds.nacos.rule-type=flow

src/main/resources/application-test.properties

+#spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
+#spring.datasource.password=geexekNewPass4!
+#spring.datasource.username=geexek
+#spring.datasource.driver-class-name=com.mysql.jdbc.Driver
+#spring.datasource.url=jdbc:mysql://47.111.166.211:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.password=geexekNewPass4!
-spring.datasource.username=geexek
+spring.datasource.password=mysql_master_geexek_408
+spring.datasource.username=mysql_master
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-spring.datasource.url=jdbc:mysql://47.111.166.211:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false
+spring.datasource.url=jdbc:mysql://rm-bp15ojs1ys1eur32zwo.mysql.rds.aliyuncs.com:3306/gksite?autoReconnect=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+
 mybatis.typeAliasesPackage=com.dlbridge.jadp.plugins
 mybatis.mapperLocations=classpath:com/dlbridge/jadp/**/**.xml
 mybatis.configuration.map-underscore-to-camel-case=true
@@ -42,11 +49,12 @@ pagehelper.supportMethodsArguments=true
 pagehelper.params=count=countSql 
 weixin.micro.appid=wx96ce27826f39cdb3
 weixin.micro.secret=11bfc4902e7c992b57a2cdcfeded623f
-geexek.user.url=https://test.geexek.com.cn/
-geexek.cmpt.url=https://testtimerbackend.geexek.cn/
-geexek.shamus.url=http://shamus.geexek.com.cn/
-timer.url=http://testtimer.geexek.cn/
-server.url=http://testzs.geexek.com.cn/
+geexek.user.url=https://www.geexek.com/
+geexek.cmpt.url=http://timerbackend.geexek.com/
+geexek.shamus.url=http://shamus.geexek.com/
+timer.url=http://testtimer.geexek.com/
+server.url=http://testzs.geexek.com.cn\
+  /
 server.url.https=https://testzs.geexek.com.cn/
 spring.redis.cluster.max-redirects=3
 spring.redis.cluster.nodes=172.16.214.235:7001,172.16.214.235:7002,172.16.214.235:7003
@@ -76,16 +84,15 @@ logging.level.com.dlbridge.feign.NewsService=debug
 logging.level.org.springframework.cloud.openfeign=debug
 spring.zipkin.base-url=http://zipkin.geexke.com.cn
 spring.zipkin.sender.type=web
-spring.sleuth.sampler.probability=0.1 
+spring.sleuth.sampler.probability=0.1
 swagger.enable=true
 
 
 
 spring.cloud.nacos.server-addr=http://nacos.geexek.com.cn
 spring.cloud.nacos.discovery.group=test
-#spring.cloud.sentinel.servlet.blockPage=test
 
-spring.cloud.sentinel.transport.dashboard=http://sentinel.geexek.com.cn
+spring.cloud.sentinel.transport.dashboard=http://172.16.214.237:8848
 spring.cloud.sentinel.transport.port=8719
 spring.cloud.sentinel.eager=true
 spring.cloud.sentinel.filter.enabled=false
@@ -97,7 +104,6 @@ spring.cloud.sentinel.datasource.ds.nacos.server-addr=http://nacos.geexek.com.cn
 spring.cloud.sentinel.datasource.ds.nacos.dataId=micro-gksite-sentinel
 spring.cloud.sentinel.datasource.ds.nacos.data-type=json
 spring.cloud.sentinel.datasource.ds.nacos.groupId=test
-#spring.cloud.sentinel.datasource.ds1.nacos.namespace=fad8a39-a3e7-49a1-ae96-0f7aaf39136b
 #
 ## 规则类型
 spring.cloud.sentinel.datasource.ds.nacos.rule-type=flow

src/main/resources/bootstrap.yml

@@ -4,11 +4,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: http://192.168.1.105:8848
+        server-addr: http://192.168.1.108:8848
         file-extension: properties
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
-      server-addr: http://192.168.1.105:8848
+      server-addr: http://192.168.1.108:8848
       discovery:
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
@@ -28,29 +28,29 @@ spring:
         namespace: adbadd76-45e9-4214-9ffc-1aadfb1c5039
 ---
 spring:
-  profiles: bata
+  profiles: beta
   cloud:
     nacos:
       config:
-        server-addr: http://nacos.geexek.com.cn
+        server-addr: https://nacos.geexek.com
         file-extension: properties
-        group: test
-        namespace: adbadd76-45e9-4214-9ffc-1aadfb1c5039
-      server-addr: http://nacos.geexek.com.cn
+        group: production
+        namespace: 1bc7c9a2-3cd3-4223-bf3d-17c10a8a501b
+      server-addr: https://nacos.geexek.com
       discovery:
-        group: test
-        namespace: adbadd76-45e9-4214-9ffc-1aadfb1c5039
+        group: production
+        namespace: 1bc7c9a2-3cd3-4223-bf3d-17c10a8a501b
 ---
 spring:
   profiles: production
   cloud:
     nacos:
       config:
-        server-addr: http://nacos.geexek.com
+        server-addr: https://nacos.geexek.com
         file-extension: properties
         group: production
-        namespace: 73e0758d-52b9-4fcc-90ef-139495455c25
-      server-addr: http://nacos.geexek.com
+        namespace: 1bc7c9a2-3cd3-4223-bf3d-17c10a8a501b
+      server-addr: https://nacos.geexek.com
       discovery:
         group: production
-        namespace: 73e0758d-52b9-4fcc-90ef-139495455c25
\ No newline at end of file
+        namespace: 1bc7c9a2-3cd3-4223-bf3d-17c10a8a501b
\ No newline at end of file

src/main/webapp/WEB-INF/views/cmpt/autoscore.jsp

@@ -15,19 +15,19 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>

src/main/webapp/WEB-INF/views/cmpt/banner.jsp

@@ -14,19 +14,19 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script src="${ctxStatic}/newdermon/js/jquery-ui.js"></script>
     <script type="text/javascript" src="${ctxStatic}/leaflet/leaflet.js"></script>

src/main/webapp/WEB-INF/views/cmpt/cert.jsp

@@ -14,19 +14,19 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script src="${ctxStatic}/newdermon/js/jquery-ui.js"></script>
     <script type="text/javascript" src="${ctxStatic}/leaflet/leaflet.js"></script>

src/main/webapp/WEB-INF/views/cmpt/cmptManual.jsp

@@ -20,9 +20,9 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
 
@@ -30,8 +30,8 @@
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>
     <link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
     <title>赛事手册</title>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/cmptManual.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/cmptManual.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
 </head>
 <style>
     .tip-txt {

src/main/webapp/WEB-INF/views/cmpt/cmptNameList.jsp

@@ -23,15 +23,15 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/cmptNameList.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/cmptNameList.css?v=<%=System.currentTimeMillis()%>">
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
 
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>

src/main/webapp/WEB-INF/views/cmpt/cmptSetting.jsp

@@ -28,15 +28,15 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
 
 
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>

src/main/webapp/WEB-INF/views/cmpt/customer.jsp

@@ -15,7 +15,7 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
@@ -27,7 +27,7 @@
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>

src/main/webapp/WEB-INF/views/cmpt/equipment.jsp

@@ -14,17 +14,17 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/equipment.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/equipment-new.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/equipment.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/equipment-new.css?v=<%=System.currentTimeMillis()%>">
 
     <link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>

src/main/webapp/WEB-INF/views/cmpt/photo.jsp

@@ -14,14 +14,14 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
 
 
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>

src/main/webapp/WEB-INF/views/cmpt/road.jsp

@@ -14,7 +14,7 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
@@ -22,11 +22,11 @@
     <link rel="shortcut icon" href="img/favicon.ico">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" src="${ctxStatic}/leaflet/leaflet.js"></script>
     <script type="text/javascript" src="${ctxStatic}/leaflet/label.js"></script>

src/main/webapp/WEB-INF/views/cmpt/route.jsp

@@ -14,15 +14,15 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
 
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>

src/main/webapp/WEB-INF/views/cmpt/score.jsp

@@ -15,19 +15,19 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script src="${ctxStatic}/newdermon/js/jquery-ui.js"></script>

src/main/webapp/WEB-INF/views/cmpt/scoreSetting.jsp

@@ -15,7 +15,7 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
@@ -26,8 +26,8 @@
     <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css?v=<%=System.currentTimeMillis()%>"/>
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/road-new.css?v=<%=System.currentTimeMillis()%>"/>
     <script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>

src/main/webapp/WEB-INF/views/cmpt/statistic.jsp

@@ -15,15 +15,15 @@
     <!-- Google fonts - Poppins -->
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/font-css.css">
     <!-- theme stylesheet-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css" id="theme-stylesheet">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/style.default.css?v=<%=System.currentTimeMillis()%>" id="theme-stylesheet">
     <!-- Custom stylesheet - for your changes-->
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/newdermon/css/juery-ui-1.12.css">
     <!-- Favicon-->
     <link rel="shortcut icon" href="img/favicon.ico">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css">
-    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/custom.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/newdermon/css/main.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet.css?v=<%=System.currentTimeMillis()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/leaflet/css/leaflet_label.css"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/road.css"/>

src/main/webapp/WEB-INF/views/common/menu.jsp

@@ -59,13 +59,16 @@
         width: 32px;
         height: 34px;
         display: inline-block;
-        background: url(/static/images/manage/xingxiang.png) no-repeat center;
+        background: url(/static/images/manage/iconset_grey.png) no-repeat center;
         background-size: 50%;
         position: absolute;
         left: 45px;
         top: 6px;
     }
-
+    .active .icon-xingxiang{
+        background: url(/static/images/manage/iconset_red.png) no-repeat center;
+        background-size: 50%;
+    }
     .icon-function{
         width: 32px;
         height: 32px;