controller/src/main/java/com/koobietech/eas/controller/EasDepartmentController.java

@@ -16,19 +16,11 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "部门模块")
 @RequestMapping("/department")
-//系统部门控制器
 public class EasDepartmentController {
 
     @Resource
     EasDepartmentService easDepartmentService;
 
-<<<<<<< HEAD
-    //查询部门
-    @GetMapping("/query")
-    public JsonResult query(@RequestParam Long id) {
-        PageData ret = easDepartmentService.query(id);
-        return JsonResult.data(ret);
-=======
 
     @PostMapping("/query")
     @Operation(summary = "查询部门" ,  description = "根据参数查询基本信息")
@@ -37,10 +29,8 @@ public class EasDepartmentController {
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easDepartmentService.query(department);
         return JsonPageResult.data(ret);
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
     }
 
-    //添加部门
     @PostMapping("/add")
     @Operation(summary = "添加部门" ,  description = "添加部门信息")
     public JsonResult add(@RequestBody EasSysDepartment department) {
@@ -52,15 +42,9 @@ public class EasDepartmentController {
     }
 
 
-<<<<<<< HEAD
-    //删除部门
-    @DeleteMapping("/delete")
-    public JsonResult delete(@RequestParam Long id) {
-=======
     @DeleteMapping("/delete/{id}")
     @Operation(summary = "删除部门" ,  description = "删除部门根据ID")
     public JsonResult delete(@PathVariable(name="id") Long id) {
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
         Boolean ret = easDepartmentService.delete(id);
         if (ret) {
             return JsonResult.ok();
@@ -68,7 +52,7 @@ public class EasDepartmentController {
         return JsonResult.fail();
     }
 
-    //修改部门
+
     @PutMapping("/update")
     @Operation(summary = "更新部门" ,  description = "更新部门信息根据ID")
     public JsonResult update(@RequestBody EasSysDepartment department) {

controller/src/main/java/com/koobietech/eas/controller/EasPermissionController.java

@@ -16,39 +16,11 @@ import javax.annotation.Resource;
 @RestController
 @Tag(name = "权限模块")
 @RequestMapping("/permission")
-//系统权限控制器
 public class EasPermissionController {
 
     @Resource
     EasPermissionService easPermissionService;
 
-<<<<<<< HEAD
-    //首页
-    @GetMapping("/home")
-    public String home(){
-        return "home";
-    }
-
-
-    //排课信息
-    @GetMapping("/lesson")
-    public String lesson(){
-        return "lesson";
-    }
-
-
-    //排课表下载
-    @GetMapping("/lesson-download")
-    public String download(){
-        return "lesson-download";
-    }
-
-    //查询权限
-    @GetMapping("/query")
-    public JsonResult query(@RequestParam Integer id){
-        PageData ret = easPermissionService.query(id);
-        return JsonResult.data(ret);
-=======
     @PostMapping("/query")
     @Operation(summary = "查询权限" ,  description = "根据参数查询基本权限表信息")
     public JsonPageResult query(@RequestBody(required = false) EasSysPermission permission,
@@ -56,10 +28,8 @@ public class EasPermissionController {
         PageHelper.startPage(pageNum, pageSize);
         PageData ret = easPermissionService.query(permission);
         return JsonPageResult.data(ret);
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
     }
 
-    //添加权限
     @PostMapping("/add")
     @Operation(summary = "添加权限" ,  description = "录入权限表基本信息")
     public JsonResult add(@RequestBody EasSysPermission permission){
@@ -70,7 +40,6 @@ public class EasPermissionController {
         return JsonResult.fail();
     }
 
-    //删除权限
     @DeleteMapping("/delete")
     @Operation(summary = "删除权限" ,  description = "删除权限表数据根据ID")
     public JsonResult delete(@RequestParam Integer id){
@@ -81,7 +50,6 @@ public class EasPermissionController {
         return JsonResult.fail();
     }
 
-    //修改权限
     @PutMapping("/update")
     @Operation(summary = "更新权限" ,  description = "根据ID 更新权限表信息")
     public JsonResult update(@RequestBody EasSysPermission permission){

controller/src/main/resources/application-dev.yaml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8080
 spring:
   datasource:
     url: jdbc:mysql://mysql8-compose:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false

controller/src/main/resources/application-local.yaml

@@ -0,0 +1,31 @@
+server:
+  port: 8081
+spring:
+  datasource:
+    url: jdbc:mysql://127.0.0.1:3306/eas?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai&useSSL=true&tinyInt1isBit=false
+    username: root
+    password: 1234
+    driver-class-name: com.mysql.cj.jdbc.Driver
+  redis:
+    host: localhost
+    database: 9
+    password:
+    port: 26379
+  security:
+    user:
+      name: admin
+      password: 123456
+springdoc:
+  version: v0.0.1
+  api-docs:
+    enabled: true
+  swagger-ui:
+    enabled: true
+knife4j:
+  enable: true
+  setting:
+    language: zh_cn
+logging:
+  level:
+    com.koobietech.eas.*: TRACE
+

controller/src/main/resources/application.yaml

@@ -2,7 +2,7 @@ server:
   port: 8080
 spring:
   profiles:
-    active: dev
+    active: local
   main:
     allow-circular-references: true
   servlet:
@@ -29,8 +29,7 @@ knife4j:
 security:
   url:
     ignored:
-      - /permission/**
-      - /department/**
+      - /**
 eas:
   jwt-secret-key: 123456
   jwt-expires-date: 1

service/pom.xml

@@ -29,12 +29,7 @@
         <dependency>
             <groupId>com.koobietech.eas</groupId>
             <artifactId>mbg</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.koobietech.eas</groupId>
-            <artifactId>common</artifactId>
-            <version>${project.version}</version>
+            <version>0.0.1-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

service/src/main/java/com/koobietech/eas/service/EasDepartmentService.java

@@ -3,19 +3,11 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysDepartment;
 
-//系统部门服务器
+
 public interface EasDepartmentService {
 
-    //修改部门
     Boolean update(EasSysDepartment department);
-    //添加部门
     Boolean add(EasSysDepartment department);
-    //删除部门
     Boolean delete(Long id);
-<<<<<<< HEAD
-    //查询部门
-    PageData query(Long id);
-=======
     PageData query(EasSysDepartment department);
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
 }

service/src/main/java/com/koobietech/eas/service/EasPermissionService.java

@@ -3,19 +3,10 @@ package com.koobietech.eas.service;
 import com.koobietech.eas.common.result.PageData;
 import com.koobietech.eas.mbg.model.EasSysPermission;
 
-//系统权限服务器
 public interface EasPermissionService {
 
-    //修改权限
     Boolean update(EasSysPermission record);
-    //添加权限
     Boolean add(EasSysPermission record);
-    //删除权限
     Boolean delete(Integer id);
-<<<<<<< HEAD
-    //查询权限
-    PageData query(Integer id);
-=======
     PageData query(EasSysPermission permission);
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
 }

service/src/main/java/com/koobietech/eas/service/impl/EasDepartmentServiceImpl.java

@@ -15,21 +15,18 @@ import java.util.Objects;
 
 
 @Service
-//系统部门服务器实现
 public class EasDepartmentServiceImpl implements EasDepartmentService {
 
     @Resource
     EasSysDepartmentMapper easSysDepartmentMapper;
 
     @Override
-    //修改部门
     public Boolean update(EasSysDepartment department) {
         department.setModifyTime(new Date());
         return easSysDepartmentMapper.updateByPrimaryKey(department) == 1;
     }
 
     @Override
-    //添加部门
     public Boolean add(EasSysDepartment department) {
         department.setCreateTime(new Date());
         department.setModifyTime(new Date());
@@ -37,19 +34,12 @@ public class EasDepartmentServiceImpl implements EasDepartmentService {
     }
 
     @Override
-    //删除部门
     public Boolean delete(Long id) {
         return easSysDepartmentMapper.deleteByPrimaryKey(id) == 1;
     }
 
     @Override
-<<<<<<< HEAD
-    //查询部门
-    public PageData query(Long id) {
-
-=======
     public PageData query(EasSysDepartment department) {
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
 
         EasSysDepartmentExample departmentExample = new EasSysDepartmentExample();
         EasSysDepartmentExample.Criteria criteria = departmentExample.createCriteria();

service/src/main/java/com/koobietech/eas/service/impl/EasPermissionServiceImpl.java

@@ -14,20 +14,17 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-//系统权限服务器实现
 public class EasPermissionServiceImpl implements EasPermissionService {
 
     @Resource
     EasSysPermissionMapper easSysPermissionMapper;
 
-    //修改权限
     @Override
     public Boolean update(EasSysPermission permission) {
         permission.setModifyTime(new Date());
         return easSysPermissionMapper.updateByPrimaryKey(permission) == 1;
     }
 
-    //添加权限
     @Override
     public Boolean add(EasSysPermission permission) {
         permission.setCreateTime(new Date());
@@ -35,13 +32,11 @@ public class EasPermissionServiceImpl implements EasPermissionService {
         return easSysPermissionMapper.insert(permission) == 1;
     }
 
-    //删除权限
     @Override
     public Boolean delete(Integer id) {
         return easSysPermissionMapper.deleteByPrimaryKey(id) == 1;
     }
 
-    //查询权限
     @Override
     public PageData query(EasSysPermission permission) {
         EasSysPermissionExample easSysPermissionExample = new EasSysPermissionExample();
@@ -64,12 +59,8 @@ public class EasPermissionServiceImpl implements EasPermissionService {
             }
         }
         List<EasSysPermission> easSysPermissions = easSysPermissionMapper.selectByExample(easSysPermissionExample);
-<<<<<<< HEAD
-        PageData ret = new PageData( );
-=======
         long l = easSysPermissionMapper.countByExample(easSysPermissionExample);
         PageData ret = new PageData();
->>>>>>> fd6a0c13e043958d38aa978c1bcfe6a4ad87561b
         ret.setData(easSysPermissions);
         ret.setTotal(l);
         return ret;