zhang song 6 лет назад
Родитель
Сommit
1fd64635f1

+ 3 - 6
pine-admin/src/main/java/com/pine/admin/modules/business/controller/SysLogController.java

@@ -26,7 +26,7 @@ import com.pine.admin.modules.business.service.SysLogService;
  * @email 771190883@qq.com
  * @email 771190883@qq.com
  * @date 2019-10-16 13:58:24
  * @date 2019-10-16 13:58:24
  */
  */
-@Api(value = "日志操作记录接口", tags = {"日志操作记录接口" })
+@Api(value = "日志操作记录接口", tags = {"日志操作记录接口"})
 @RestController
 @RestController
 @RequestMapping("business/SysLog")
 @RequestMapping("business/SysLog")
 public class SysLogController extends BaseController {
 public class SysLogController extends BaseController {
@@ -41,7 +41,6 @@ public class SysLogController extends BaseController {
     @ApiOperation(value = "获取所有日志操作记录数据", notes = "可以根据条件获取")
     @ApiOperation(value = "获取所有日志操作记录数据", notes = "可以根据条件获取")
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     @RequestMapping(value = "/all", method = RequestMethod.GET)
     public Result all(SysLog record) {
     public Result all(SysLog record) {
-
         List<SysLog> pp = sysLogService.getAllList(record);
         List<SysLog> pp = sysLogService.getAllList(record);
         return Result.success(true, pp);
         return Result.success(true, pp);
     }
     }
@@ -53,8 +52,7 @@ public class SysLogController extends BaseController {
     @ApiOperation(value = "获取日志操作记录数据", notes = "根据id来获取日志操作记录详细信息")
     @ApiOperation(value = "获取日志操作记录数据", notes = "根据id来获取日志操作记录详细信息")
     @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
     @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
     public Result getSysLogEntity(@PathVariable("id") String id) {
     public Result getSysLogEntity(@PathVariable("id") String id) {
-
-            SysLog data = sysLogService.getById(id);
+        SysLog data = sysLogService.getById(id);
         return Result.success(true, data);
         return Result.success(true, data);
     }
     }
 
 
@@ -64,8 +62,7 @@ public class SysLogController extends BaseController {
     @ApiOperation(value = "获取日志操作记录数据", notes = "根据条件获取")
     @ApiOperation(value = "获取日志操作记录数据", notes = "根据条件获取")
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     @RequestMapping(value = "/getOne", method = RequestMethod.GET)
     public Result getOne(SysLog record) {
     public Result getOne(SysLog record) {
-
-            SysLog data = sysLogService.getOne(record);
+        SysLog data = sysLogService.getOne(record);
         return Result.success(true, data);
         return Result.success(true, data);
     }
     }
 
 

+ 2 - 2
pine-admin/src/main/resources/application-dev.properties

@@ -50,8 +50,8 @@ spring.mail.properties.mail.smtp.auth=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.enable=true
 spring.mail.properties.mail.smtp.starttls.required=true
 spring.mail.properties.mail.smtp.starttls.required=true
 ### mysql config   ###
 ### mysql config   ###
-#spring.datasource.url=jdbc:mysql://47.100.127.59:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
-spring.datasource.url=jdbc:mysql://112.30.212.47:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
+spring.datasource.url=jdbc:mysql://47.100.127.59:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
+#spring.datasource.url=jdbc:mysql://112.30.212.47:3306/lecshop_v2?useUnicode=true&characterEncoding=utf8&useSSL=false
 spring.datasource.username=root
 spring.datasource.username=root
 spring.datasource.password=pl,okmijn
 spring.datasource.password=pl,okmijn
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver