Просмотр исходного кода

Merge branch 'test' of jishutao/jitao-server into prod

anderx лет назад: 5
Родитель
Сommit
42efb84e80

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -3,7 +3,7 @@ jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.username=dev
 #jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft20200901?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
 jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'

+ 2 - 13
src/main/webapp/WEB-INF/views/common.html

@@ -540,16 +540,7 @@
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">
-		<!-- <script src="https://s22.cnzz.com/z_stat.php?id=1274334487&web_id=1274334487" language="JavaScript"></script>
-		<script>
-			var _hmt = _hmt || [];
-			(function() {
-				var hm = document.createElement("script");
-				hm.src = "https://hm.baidu.com/hm.js?f3add4ca3570adee0a450bd9a7fe9ffb";
-				var s = document.getElementsByTagName("script")[0];
-				s.parentNode.insertBefore(hm, s);
-			})();
-		</script> -->
+
 		  
 		<script th:inline="javascript">
 			/*<![CDATA[*/
@@ -614,9 +605,7 @@
 		
 		</script>
 		<th:block th:replace="${scripts}" />
-		<!-- <script language="javascript" src="https://put.zoosnet.net/JS/LsJS.aspx?siteid=PUT70876498&float=1&lng=cn"></script> -->
-		<!-- <script type="text/javascript"> var _bdhmProtocol = (("https:" == document.location.protocol) ? " https://" : " http://"); document.write(unescape("%3Cscript src='" + _bdhmProtocol + "hm.baidu.com/h.js%3F401c0b887285c9a12de0593a09ffa28e' type='text/javascript'%3E%3C/script%3E")) </script> -->
-	</th:block>
+		</th:block>
 
 </body>
 </html>

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/technologyTrading/shopList.html