发布

web/src/main/java/com/jpsoft/machinery/modules/open/CommodityApiController.java

@@ -107,4 +107,35 @@ public class CommodityApiController {
 
         return msgResult;
     }
+
+    @ApiOperation(value="商品列表")
+    @RequestMapping(value = "findChildrenListByCataloguesId",method = RequestMethod.POST)
+    public MessageResult<List<Commodity>> findChildrenListByCataloguesId(String cataloguesId){
+        MessageResult<List<Commodity>> msgResult = new MessageResult<>();
+
+        try {
+            Catalogues catalogues = cataloguesService.get(cataloguesId);
+            List<String> cataloguesIds = cataloguesService.findListBySortAll(catalogues.getSort() + "%");
+
+            List<Sort> sortListEx = new ArrayList<>();
+            sortListEx.add(new Sort("create_time", "asc"));
+            Map<String, Object> searchParamsEx = new HashMap<>();
+            if (cataloguesIds.size() > 0) {
+                searchParamsEx.put("cataloguesIds", cataloguesIds);
+            }
+
+            Page<Commodity> commodityPage = commodityService.pageSearch(searchParamsEx, 1, 1000, false, sortListEx);
+
+            msgResult.setResult(true);
+            msgResult.setCode(200);
+            msgResult.setData(commodityPage.getResult());
+        }
+        catch (Exception ex){
+            msgResult.setResult(false);
+            msgResult.setCode(400);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
 }

web/src/main/resources/application-production.yml

@@ -17,7 +17,7 @@ spring:
 logger:
   level: WARN
   # 这里填的是容器中地址，需要在容器启动时挂在服务器相应文件夹地址
-  dir: /usr/local/tomcat/api-logs
+  dir: /usr/local/apache-tomcat-9.0.56/webapps/machinery-server/Logs
 
 springfox:
   documentation:
@@ -25,9 +25,9 @@ springfox:
       v2:
         host: wsbmapi.xiaoxinda.com
 
-baidu:
-  ak: "ECKKpSyZRaFqtfSEV0TSyPZP"
-  sk: "fZSDklYCuAcDryMYGL37ed1I2LmAEDvu"
-
-wechat:
-  tokenUrl: "http://192.168.0.1:8080/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"
+#baidu:
+#  ak: "ECKKpSyZRaFqtfSEV0TSyPZP"
+#  sk: "fZSDklYCuAcDryMYGL37ed1I2LmAEDvu"
+#
+#wechat:
+#  tokenUrl: "http://192.168.0.1:8080/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"

web/src/main/resources/application-test.yml

@@ -5,9 +5,9 @@ server:
 
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://47.92.161.104:3306/heyi_machinery?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://47.101.158.176:3306/heyi_machinery?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
-    password: jpsoft2016
+    password: jpsoft2022
   devtools:
     restart:
       enabled: true

web/src/main/resources/application.yml

@@ -56,7 +56,7 @@ spring:
     restart:
       enabled: true
   profiles:
-    active: "@active.profile@"
+    active: dev
   redis:
     # Redis数据库索引（默认为0）
     database: 5
@@ -105,13 +105,13 @@ pagehelper:
   supportMethodsArguments: true
   params: count=countSql
 
-wechat:
-#  appId: wx0b3c41a903053808
-#  appSecret: 43557bd62f77b0c3d6670e991872f0e7
-  appId: wx0c81770a72543e27
-  appSecret: ea8c0d18eae536e3ec16333864e71252
-  tokenUrl: "http://ykt.xiaoxinda.com/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"
-  backNoticeTemplateId: "Ya2TByTerPfIxfqMwfFq2G-BMsuyWZOslk-g5cHSWfs"
+#wechat:
+##  appId: wx0b3c41a903053808
+##  appSecret: 43557bd62f77b0c3d6670e991872f0e7
+#  appId: wx0c81770a72543e27
+#  appSecret: ea8c0d18eae536e3ec16333864e71252
+#  tokenUrl: "http://ykt.xiaoxinda.com/weixin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET"
+#  backNoticeTemplateId: "Ya2TByTerPfIxfqMwfFq2G-BMsuyWZOslk-g5cHSWfs"
 oss:
   accessKeyId: "LTAIXIyrXmjgOXQa"
   accessKeySecret: "B0RS3zHLct8OKKIDu2HREaVx6RXgWL"
@@ -120,6 +120,6 @@ oss:
   urlPrefix: "http://${oss.bucketName}.oss-cn-hangzhou.aliyuncs.com"
   objectPre: "upload"
 
-baidu:
-  ak: "a4NPmmzmwDki15P0nn5YKATa"
-  sk: "aqW0IzB4kAlRU3lG4erdi00Gv9rsQESb"
+#baidu:
+#  ak: "a4NPmmzmwDki15P0nn5YKATa"
+#  sk: "aqW0IzB4kAlRU3lG4erdi00Gv9rsQESb"