FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop_master' into develop_1

Browse Source 
# Conflicts:
#	adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
This commit is contained in:
zzy
2021-07-30 17:15:36 +08:00
parent 30859dd3af 343913c799
commit 11b3e9f1c8
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-main/src/main/resources/application-dev.properties
+5 -5
View File
@@ -3,7 +3,7 @@
# 数据库配置 # 数据库配置
#============================================= #=============================================
spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false spring.datasource.url = jdbc:mysql://39.100.23.127:3306/foton_slrs_test2?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
#spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false #spring.datasource.url = jdbc:mysql://10.96.10.171/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
spring.datasource.username = root spring.datasource.username = root
spring.datasource.password = root spring.datasource.password = root
@@ -14,10 +14,10 @@ spring.application.name=FotonLAWSSystem
application.code=20200101 application.code=20200101
application.center=1 application.center=1
#============================================== #==============================================
#Eruept ##Eruept
eureka.client.allow-redirects=true #eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true #eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/
#============================================== #==============================================
# 邮箱配置1 # 邮箱配置1
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
+6
View File
@@ -82,6 +82,12 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
@Autowired @Autowired
ISarLawsInfoService sarLawsInfoEOService; ISarLawsInfoService sarLawsInfoEOService;
// @ApiOperation(value="SarStandardsInfoEO|反向标准操作")
// @GetMapping(value = "/reverseQueryStand")
// public void reverseQueryStand(@RequestParam(name="ids",required=true) String ids, String standName, String type) {
// this.sarStandardsInfoEOService.reverseQueryStand(Arrays.asList(ids.split(",")),standName,type);
// }
@ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询") @ApiOperation(value = "|SarStandardsInfoEO|自定义分页查询")
@GetMapping("/getSarStandardsInfoPage") @GetMapping("/getSarStandardsInfoPage")
//@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage") //@RequiresPermissions("lawss:sarStandardsInfo:getSarStandardsInfoPage")