wangjiang988 5 лет назад
Родитель
Сommit
ce11368fa6
2 измененных файлов с 9 добавлено и 5 удалено
  1. 5 3
      src/main/resources/application.yml
  2. 4 2
      src/main/resources/templates/home/common/common.html

+ 5 - 3
src/main/resources/application.yml

@@ -160,7 +160,8 @@ spring:
     #    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://192.168.1.115:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://222.92.16.3:33061/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://222.92.16.3:33061/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://10.44.104.42:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     #    url: jdbc:mysql://10.44.104.42:3306/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
-    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+#    url: jdbc:mysql://47.105.241.108:33060/service_platform?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
+    url: jdbc:mysql://47.105.241.108:33060/service_platform_42_backup?useUnicode=true&characterEncoding=utf-8&useSSL=true&autoReconnect=true&allowMultiQueries=true
     username: root
     username: root
     password: ${password}
     password: ${password}
   #redis
   #redis
@@ -185,14 +186,15 @@ password: WD7ZuG4T27mDBFRXye2IfZZgrDsmPCtkMDfj8fGss8Iz/4aF27TLznaZ2mUbU273q5spfM
 
 
 #上传文件配置信息
 #上传文件配置信息
 #文件仓库地址
 #文件仓库地址
-repositoryPath:  /opt/xinqu_pic
+#repositoryPath:  /opt/xinqu_pic
+repositoryPath:  /Users/chenqing/codeCache/uploads
 #新区接口地址
 #新区接口地址
 api_url: http://snd.ideatob.com/mp/api/
 api_url: http://snd.ideatob.com/mp/api/
 #apk文件存放地址
 #apk文件存放地址
 apk_url: E:\UPLOAD\
 apk_url: E:\UPLOAD\
 
 
 #访问路径
 #访问路径
-fileUrl: http://192.168.1.116:8001/uploads
+fileUrl: http://47.105.241.108/uploads
 
 
 #域名
 #域名
 service_name: 127.0.0.1
 service_name: 127.0.0.1

+ 4 - 2
src/main/resources/templates/home/common/common.html

@@ -58,8 +58,10 @@
         $(function () {
         $(function () {
             if (loginUserName) {
             if (loginUserName) {
                 // document.getElementsByClassName('.loginIcon')[0].src = loginUserName;
                 // document.getElementsByClassName('.loginIcon')[0].src = loginUserName;
-                document.getElementsByClassName('loginName')[0].innerText = loginUserName;
-                document.getElementById('login-link').style.display = 'none'
+                if (document.getElementsByClassName("loginName")[0] != undefined) {
+                    document.getElementsByClassName('loginName')[0].innerText = loginUserName;
+                    document.getElementById('login-link').style.display = 'none'
+                }
             } else {
             } else {
                 document.getElementsByClassName('toAdmin')[0].style.display = 'none'
                 document.getElementsByClassName('toAdmin')[0].style.display = 'none'
                 document.getElementsByClassName('loginIcon')[0].style.display = 'none'
                 document.getElementsByClassName('loginIcon')[0].style.display = 'none'