样式修改

src/main/resources/application-dev.properties

 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/plugins/**/**.xml
 mybatis.configuration.map-underscore-to-camel-case=true
@@ -47,11 +47,11 @@ spring.data.web.pageable.default-page-size=10
 spring.data.web.pageable.max-page-size=100
 weixin.micro.appid=wx96ce27826f39cdb3
 weixin.micro.secret=11bfc4902e7c992b57a2cdcfeded623f
-geexek.user.url=https://test.geexek.com.cn/
-geexek.cmpt.url=https://testtimerbackend.geexek.cn/
+geexek.user.url=https://www.geexek.com/
+geexek.cmpt.url=https://timerbackend.geexek.com/
 
 geexek.shamus.url=http://shamus.geexek.com.cn/
-timer.url=http://testtimer.geexek.cn/
+timer.url=http://timer.geexek.com/
 server.url=http://testzs.geexek.com.cn/
 server.url.https=http://localhost:9090/
 ###redis
@@ -98,7 +98,7 @@ spring.cloud.sentinel.skip-keys=cmptId
 spring.cloud.sentinel.exclude-urls=/static/**,**.css,**.js
 
 ## nacos 地址
-spring.cloud.sentinel.datasource.ds.nacos.server-addr=192.168.1.105:8848
+spring.cloud.sentinel.datasource.ds.nacos.server-addr=192.168.1.114:8848
 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=dev

src/main/resources/application-test.properties

@@ -53,8 +53,7 @@ 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=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

src/main/resources/bootstrap.yml

@@ -4,11 +4,11 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: http://192.168.1.108:8848
+        server-addr: http://192.168.1.114:8848
         file-extension: properties
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
-      server-addr: http://192.168.1.108:8848
+      server-addr: http://192.168.1.114:8848
       discovery:
         group: dev
         namespace: 187c2f4d-80c2-4a67-b4e5-319d5c9151d1
@@ -27,20 +27,6 @@ spring:
         group: test
         namespace: adbadd76-45e9-4214-9ffc-1aadfb1c5039
 ---
-spring:
-  profiles: beta
-  cloud:
-    nacos:
-      config:
-        server-addr: https://nacos.geexek.com
-        file-extension: properties
-        group: production
-        namespace: 1bc7c9a2-3cd3-4223-bf3d-17c10a8a501b
-      server-addr: https://nacos.geexek.com
-      discovery:
-        group: production
-        namespace: 1bc7c9a2-3cd3-4223-bf3d-17c10a8a501b
----
 spring:
   profiles: production
   cloud:

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

@@ -30,7 +30,7 @@
     <!-- 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">

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

@@ -17,16 +17,16 @@
     <!-- 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.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>

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

@@ -30,15 +30,15 @@
 
     <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">
     <script type="text/javascript" charset="utf-8" src="${ctxStatic}/layer/layer.js"></script>
     <link rel="stylesheet" href="${ctxStatic}/layer/skin/layer.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/index.css">
-    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/index.css?v=<%=System.currentTimeMillis()%>">
+    <link rel="stylesheet" href="${ctxStatic}/cmpt/setting.css?v=<%=System.currentTimeMillis()%>">
     <title>视觉管理</title>
     <style>
         .input_cxcolor {

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

@@ -15,14 +15,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/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()%>"/>

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

@@ -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/scoreSetting.jsp

@@ -17,13 +17,13 @@
     <!-- 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?v=<%=System.currentTimeMillis()%>"/>

src/main/webapp/WEB-INF/views/cmpt/score_review.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()%>"/>
     <link rel="stylesheet" href="${ctxStatic}/cmpt/score_review.css"/>
     <script src="${ctxStatic}/My97DatePicker/WdatePicker.js" type="text/javascript"></script>
     <script src="${ctxStatic}/newdermon/vendor/jquery/jquery.min.js"></script>

src/main/webapp/static/cmpt/score_review.css

@@ -39,7 +39,7 @@
     margin: 0px 5px;
 }
 .flex-vt select{
-    width: 175px;
+    width: 215px;
     background: rgba(247,247,247,1);
     padding-left: 15px;
     height: 46px;