Просмотр исходного кода

修改生成配置文件、App版本更新等功能

VEAR 2 лет назад
Родитель
Сommit
6c78b054e7

+ 1 - 1
src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -28,7 +28,7 @@ import org.springblade.core.tool.utils.DateUtil;
 public class CommonUtil {
 
 	public static String genTimeID(){
-		return DateUtil.format(DateUtil.now(),DateUtil.PATTERN_DATETIME_MINI + "SSS") + RandomUtil.randomNumbers(8);
+		return DateUtil.format(DateUtil.now(),DateUtil.PATTERN_DATETIME_MINI + "SSS") + RandomUtil.randomNumbers(3);
 	}
 
 }

+ 3 - 3
src/main/java/org/springblade/modules/api/controller/Api08Controller.java

@@ -66,7 +66,7 @@ public class Api08Controller extends BladeController {
 	private final BladeRedis bladeRedis;
 
 	@GetMapping("/payments-list")
-	@ApiOperationSupport(order = 10)
+	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "查询支付方式")
 	public R<List<Payments>> paymentsList() {
 		List<Payments> list =  bladeRedis.get(CacheBizConstant.CACHE_DEFAULT_PAYMENTS);
@@ -81,7 +81,7 @@ public class Api08Controller extends BladeController {
 	}
 
 	@GetMapping("/ads-list")
-	@ApiOperationSupport(order = 9)
+	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "查询轮播数据", notes = "传入类型和条数,类型为字典项ads_type,1应用首页,2商城首页,3推荐品牌,4抢购专区,5新品推荐,6人气推荐")
 	public R<List<Ads>> adsList(@ApiParam(value = "类型", required = true)  @RequestParam Integer type,
 								@ApiParam(value = "条数,默认条数由系统配置", required = false)  @RequestParam(required = false) Integer limit) {
@@ -94,11 +94,11 @@ public class Api08Controller extends BladeController {
 	@SneakyThrows
 	@PostMapping("/common/send-validate")
 	@ApiOperation(value = "短信发送", notes = "传入手机号")
+	@ApiOperationSupport(order = 3)
 	public R sendValidate(@RequestParam String phone) {
 		Map<String, String> params = SmsUtil.getValidateParams();
 		SmsCode smsCode = smsBuilder.noAuthTemplate().sendValidate(new SmsData(params).setKey(PARAM_KEY), phone);
 		return smsCode.isSuccess() ? R.data(smsCode, SEND_SUCCESS) : R.fail(SEND_FAIL);
 	}
 
-
 }

+ 1 - 1
src/main/resources/application-prod.yml

@@ -83,7 +83,7 @@ alipay:
     # 商户支付宝账号
     payee-user-id: 2088341967443472
     # 回调域名
-    domain: https://wine.gzzzyd.com
+    domain: http://47.109.28.56
     app-cert-path: /usr/local/liquor/alipay/appCertPublicKey_2021003125657245.crt
     ali-pay-cert-path: /usr/local/liquor/alipay/alipayCertPublicKey_RSA2.crt
     ali-pay-root-cert-path: /usr/local/liquor/alipay/alipayRootCert.crt

+ 6 - 0
src/main/resources/application.yml

@@ -13,6 +13,12 @@ server:
     direct-buffers: true
 
 spring:
+  http:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 20MB
+      max-request-size: 30MB
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
     #driver-class-name: org.postgresql.Driver