24282 2 jaren geleden
bovenliggende
commit
1a56014d14

+ 10 - 1
hx-admin/src/main/resources/application-dev.yml

@@ -111,4 +111,13 @@ mail:
     abroadUrlPrefix:
 
 hx:
-    httpUrl: http://localhost:9898/
+    httpUrl: http://localhost:9898/
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期(默认30分钟)
+    expireTime: 2880

+ 9 - 0
hx-admin/src/main/resources/application-prod.yml

@@ -104,3 +104,12 @@ mail:
 
 hx:
     httpUrl: http://139.159.251.109:81/prod-api/
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期(默认30分钟)
+    expireTime: 240

+ 10 - 1
hx-admin/src/main/resources/application-test.yml

@@ -111,4 +111,13 @@ mail:
     abroadUrlPrefix:
 
 hx:
-    httpUrl: http://36.134.91.96:10006/test-api/
+    httpUrl: http://36.134.91.96:10006/test-api/
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期(默认30分钟)
+    expireTime: 2880

+ 0 - 9
hx-admin/src/main/resources/application.yml

@@ -131,15 +131,6 @@ spring:
             deleteAllow: true # 允许删除操作
             multiStatementAllow: true # 支持一次执行多条sql
 
-# token配置
-token:
-  # 令牌自定义标识
-  header: Authorization
-  # 令牌密钥
-  secret: abcdefghijklmnopqrstuvwxyz
-  # 令牌有效期(默认30分钟)
-  expireTime: 1440
-
 # MyBatis Plus配置
 mybatis-plus:
   # 搜索指定包别名

+ 4 - 2
hx-item/src/main/java/com/fjhx/item/service/product/impl/ProductInfoServiceImpl.java

@@ -501,8 +501,10 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         // 排除名称重复
         this.nameDuplication(ProductInfo::getName, productInfoDto.getName(), productInfoDto.getId(), "产品名称重复");
         // 排除不为空的自定义编码重复
-        long count = this.count(q -> q.ne(ProductInfo::getId,productInfoDto.getId())
-                .eq(ProductInfo::getCustomCode, productInfoDto.getCustomCode()).ne(ProductInfo::getCustomCode,""));
+        long count = this.count(q -> q
+                .ne(ProductInfo::getId, productInfoDto.getId())
+                .eq(ProductInfo::getCustomCode, productInfoDto.getCustomCode())
+                .ne(ProductInfo::getCustomCode, ""));
         if (count != 0) {
             throw new ServiceException("产品自定义编码重复");
         }