test111

app/config/app.js

@@ -8,16 +8,17 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 //移动端商城API
-let domain = 'http://your Front API domain'
+let domain = 'http://192.168.2.123:8084'
 
 module.exports = {
 	// 请求域名 格式： https://您的域名
 	HTTP_REQUEST_URL:domain,
-	
+	// h5商城地址
+	HTTP_H5_URL:'https://app',
 	// #ifdef MP
-		HTTP_REQUEST_URL: domain,
+	HTTP_REQUEST_URL: domain,
 	// #endif
-	HTTP_ADMIN_URL:'http://your h5 domain', //PC后台的API请求地址，上传图片用,影响h5上传头像
+	HTTP_ADMIN_URL:'http://127.0.0.1:8080', //PC后台的API请求地址，上传图片用,影响h5上传头像
 	// #ifdef H5
 		//H5接口是浏览器地址
 		// HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host,
@@ -25,6 +26,7 @@ module.exports = {
 		HTTP_REQUEST_URL:domain,
 	// #endif
 
+
 	HEADER:{
 		'content-type': 'application/json'
 	},

app/pages/columnGoods/HotNewGoods/index.vue

@@ -110,7 +110,7 @@ export default {
 };
 </script>
 <style lang="scss">
-	/deep/ .empty-box{
+	::v-deep .empty-box{
 		background-color: #f5f5f5;
 	} 
 	.swiper,swiper,swiper-item,.slide-image{

crmeb/crmeb-admin/src/main/resources/application-beta.yml

@@ -31,12 +31,12 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb
+    username: root
-    password: 111111
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    #password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 3 #默认数据库
     jedis:

crmeb/crmeb-admin/src/main/resources/application-dev.yml

@@ -25,12 +25,12 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb
+    username: root
-    password: 111111
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    #password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 10 #默认数据库
     jedis:

crmeb/crmeb-admin/src/main/resources/application-prod.yml

@@ -25,12 +25,12 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb
+    username: root
-    password: 1111111
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    #password: 111111
     timeout: 10000 # 连接超时时间（毫秒）
     database: 15 #默认数据库
     jedis:

crmeb/crmeb-admin/src/main/resources/application.yml

@@ -39,13 +39,13 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb
+    username: root
-    password: 111111
+    password: z2003m10L15
 
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    #password: 111111
     timeout: 30000 # 连接超时时间（毫秒）
     database: 15  #默认数据库
     jedis:

crmeb/crmeb-front/src/main/java/com/zbkj/front/controller/IndexController.java

@@ -64,7 +64,7 @@ public class IndexController {
     }
 
     /**
-     * 热门搜索
+     * 热门搜索zzzzzzzvvvv
      */
     @ApiOperation(value = "热门搜索")
     @RequestMapping(value = "/search/keyword", method = RequestMethod.GET)
@@ -72,6 +72,24 @@ public class IndexController {
         return CommonResult.success(indexService.hotKeywords());
     }
 
+    /**
+     * 热门搜索zzzzzzzvvvv
+     */
+    @ApiOperation(value = "热门搜索")
+    @RequestMapping(value = "/search/keyword1", method = RequestMethod.GET)
+    public CommonResult<List<HashMap<String, Object>>> hotKeywords11() {
+        return CommonResult.success(indexService.hotKeywords());
+    }
+
+    /**
+     * 热门搜索zzzzzzzvvvv
+     */
+    @ApiOperation(value = "热门搜索")
+    @RequestMapping(value = "/search/keyword2", method = RequestMethod.GET)
+    public CommonResult<List<HashMap<String, Object>>> hotKeywords22() {
+        return CommonResult.success(indexService.hotKeywords());
+    }
+
     /**
      * 分享配置
      */

crmeb/crmeb-front/src/main/resources/application-beta.yml

@@ -15,11 +15,11 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb_java_beta?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
     username: root
-    password: 123456
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password:
     timeout: 10000 # 连接超时时间（毫秒）
     database: 3 #默认数据库
     jedis:

crmeb/crmeb-front/src/main/resources/application-dev.yml

@@ -15,11 +15,11 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb_java_dev?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
     username: root
-    password: 123456
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password:
     timeout: 10000 # 连接超时时间（毫秒）
     database: 10 #默认数据库
     jedis:

crmeb/crmeb-front/src/main/resources/application-prod.yml

@@ -15,11 +15,11 @@ spring:
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb_java?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
     username: root
-    password: 123456
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 123456
+    password:
     timeout: 10000 # 连接超时时间（毫秒）
     database: 15 #默认数据库
     jedis:

crmeb/crmeb-front/src/main/resources/application.yml

@@ -4,7 +4,7 @@ crmeb:
 
 # 配置端口
 server:
-  port: 8081
+  port: 8084
   servlet:
     context-path: /         # 访问path
   tomcat:
@@ -34,12 +34,12 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://127.0.0.1:3306/crmeb?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimeZone=GMT+8
-    username: crmeb
+    username: root
-    password: 111111
+    password: z2003m10L15
   redis:
     host: 127.0.0.1 #地址
     port: 6379 #端口
-    password: 111111
+    password:
     timeout: 30000 # 连接超时时间（毫秒）
     database: 3  #默认数据库
     jedis: