Startseite Erkunden Hilfe
Registrieren Anmelden
ccj
/
muban
1
0
Fork 0
Dateien Issues 0 Pull-Requests 0 Wiki
Quellcode durchsuchen

gx

ccj vor 3 Jahren
Ursprung
83bbe38bf2
Commit
363a627843
6 geänderte Dateien mit 14 neuen und 22 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 2 2
      unimall-admin/config/dev.env.js
  2. 3 3
      unimall-admin/config/prod.env.js
  3. 1 1
      unimall-admin/index.html
  4. 2 13
      unimall-admin/src/views/login/index.vue
  5. 3 0
      unimall-launcher/src/main/java/com/iotechn/unimall/launcher/utils/BrowserData.java
  6. 3 3
      unimall-launcher/src/main/resources/application.properties

+ 2 - 2
unimall-admin/config/dev.env.js
Datei anzeigen 

@@ -1,6 +1,6 @@
 
 module.exports = {
 
 	NODE_ENV: '"development"',
 
   ENV_CONFIG: '"dev"',
 
-    HOST: '"http://localhost:8081"',
 
-    BASE_API: '"http://localhost:8081/m.api"'
 
+    HOST: '"http://localhost:8082"',
 
+    BASE_API: '"http://localhost:8082/m.api"'
 
 }

+ 3 - 3
unimall-admin/config/prod.env.js
Datei anzeigen 

@@ -1,6 +1,6 @@
 
 module.exports = {
 
 	NODE_ENV: '"production"',
 
-	ENV_CONFIG: '"prod"',
 
-    HOST: '"https://fresh.easycampus.cn"',
 
-  	BASE_API: '"https://fresh.easycampus.cn/m.api"'
 
+  	ENV_CONFIG: '"prod"',
 
+    HOST: '"http://101.227.51.94:8081"',
 
+    BASE_API: '"http://101.227.51.94:8081/m.api"'
 
 }

+ 1 - 1
unimall-admin/index.html
Datei anzeigen 

@@ -5,7 +5,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
 
     <meta name="renderer" content="webkit">
 
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
 
-    <title>驽驹科技 - unimall - 后台管理</title>
 
+    <title>电商后台管理</title>
 
   </head>
 
   <body>
 
     <script src=<%= BASE_URL %>/tinymce4.7.5/tinymce.min.js></script>

+ 2 - 13
unimall-admin/src/views/login/index.vue
Datei anzeigen 

@@ -11,12 +11,12 @@
 
           class="img"
 
           src="@/assets/avatar.png"
 
           alt="">
 
-        <p class="title">Unimall 开源商城后台登录</p>
 
+        <p class="title">电商后台登录</p>
 
       </div>
 
       <div class="login-border">
 
         <div class="login-main">
 
           <h4 class="login-title">
 
-            登录 Unimall
 
+            登录
 
           </h4>
 
           <el-form
 
             ref="loginForm"
 
@@ -82,17 +82,6 @@
 
             </el-form-item>
 
           </el-form>
 
 
-          <div class="login-menu">
 
-            <a
 
-              href="#"
 
-              @click.stop="activeName='user'">驽驹官网</a>
 
-            <a
 
-              href="#"
 
-              @click.stop="activeName='code'">客服</a>
 
-            <a
 
-              href="#"
 
-              @click.stop="activeName='third'">Test</a>
 
-          </div>
 
         </div>
 
 
       </div>

+ 3 - 0
unimall-launcher/src/main/java/com/iotechn/unimall/launcher/utils/BrowserData.java
Datei anzeigen 

@@ -106,6 +106,9 @@ public class BrowserData {
 
 		try {
 
 			HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys);
 
 			JSONObject data = ((JSONObject) JSONObject.toJSON(response.getEntity())).getJSONObject("data");
 
+			if(data == null || data.isEmpty()){
 
+				return "浏览器插件";
 
+			}
 
 			return data.getString("country") + "." + data.getString("region") + "." + data.getString("city");
 
 		} catch (Exception e) {
 
 			e.printStackTrace();

+ 3 - 3
unimall-launcher/src/main/resources/application.properties
Datei anzeigen 

@@ -8,9 +8,9 @@ logging.level.root=info
 
 ###MySql (MySqlConfiguration)
 
 ########################################################
 
 spring.druid.driverClassName=com.mysql.jdbc.Driver
 
-spring.druid.url=jdbc:mysql://106.14.75.12/shop?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
 
-spring.druid.username=root
 
-spring.druid.password=Ccj841968545
 
+spring.druid.url=jdbc:mysql://101.227.51.94/shop?createDatabaseIfNotExist=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&useSSL=false
 
+spring.druid.username=aye
 
+spring.druid.password=387545
 
 spring.druid.maxActive=30
 
 spring.druid.minIdle=5
 
 spring.druid.maxWait=10000