Merge branch 'master' of https://github.com/PhyQxx/HSLink

HSLink-app/util/request.js

@@ -1,7 +1,5 @@
-
-const baseUrl = 'http://106.53.113.158:8048';  		//服务器地址
-// const baseUrl = 'http://192.168.10.29:8048';  	//服务器地址
-// const baseUrl = 'http://127.0.0.1:8048'; 		//服务器地址
+const baseUrl = 'http://192.168.10.29:8048';  	 //服务器地址
+// const baseUrl = 'http://127.0.0.1:8048';      //服务器地址
 
 const get = (url, data) => {
     let httpDefaultOpts = {
@@ -120,4 +118,4 @@ export default {
 		get,
 		post,
 		httpTokenRequest
-}
+}

HSLink-back/src/main/resources/application.yml

@@ -12,13 +12,12 @@ logging:
 ##数据源
 spring:
   datasource:
-#    url: jdbc:mysql://127.0.0.1:3306/hslink?serverTimezone=Hongkong&useUnicode=true&characterEncoding=utf8
-    url: jdbc:mysql://106.53.113.158:3306/hslink?serverTimezone=Hongkong&useUnicode=true&characterEncoding=utf8
+    url: jdbc:mysql://127.0.0.1:3306/hslink?serverTimezone=Hongkong&useUnicode=true&characterEncoding=utf8
     username: root
-    password: Beater123
+    password: 123456
     db-name: hslink
     filters: log4j,wall,mergeStat
     driverClassName: com.mysql.cj.jdbc.Driver
 
 ##文件保存路径
-filePath: D:\office\phy\HSLink\HSLink-front\src\assets\file
+filePath: D:\office\phy\HSLink\HSLink-front\src\assets\file