diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java index 8ddd810..218b4fb 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthPermissionDao.java @@ -43,14 +43,6 @@ public interface SchisandraAuthPermissionDao extends BaseMapper entities); - /** - * 修改数据 - * - * @param schisandraAuthPermission 实例对象 - * @return 影响行数 - */ - int update(SchisandraAuthPermission schisandraAuthPermission); - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 影响行数 - */ - int deleteById(Long id); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java index 4584a3b..87e66eb 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/dao/SchisandraAuthRoleDao.java @@ -43,13 +43,6 @@ public interface SchisandraAuthRoleDao extends BaseMapper { */ long count(SchisandraAuthRole schisandraAuthRole); - /** - * 新增数据 - * - * @param schisandraAuthRole 实例对象 - * @return 影响行数 - */ - int insert(SchisandraAuthRole schisandraAuthRole); /** * 批量新增数据(MyBatis原生foreach方法) @@ -68,21 +61,8 @@ public interface SchisandraAuthRoleDao extends BaseMapper { */ int insertOrUpdateBatch(@Param("entities") List entities); - /** - * 修改数据 - * - * @param schisandraAuthRole 实例对象 - * @return 影响行数 - */ - int update(SchisandraAuthRole schisandraAuthRole); - /** - * 通过主键删除数据 - * - * @param id 主键 - * @return 影响行数 - */ - int deleteById(Long id); + } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthRolePermission.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthRolePermission.java index de7ff2d..575a0f8 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthRolePermission.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/entity/SchisandraAuthRolePermission.java @@ -64,7 +64,7 @@ public class SchisandraAuthRolePermission implements Serializable { /** * */ - @Column("is_deleted") + @Column(value = "is_deleted",isLogicDelete = true) private Integer isDeleted; } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java index 25a5634..993c5ce 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthPermissionServiceImpl.java @@ -1,12 +1,12 @@ package com.schisandra.auth.infra.basic.service.impl; -import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; import com.schisandra.auth.infra.basic.dao.SchisandraAuthPermissionDao; +import com.schisandra.auth.infra.basic.entity.SchisandraAuthPermission; import com.schisandra.auth.infra.basic.service.SchisandraAuthPermissionService; -import org.springframework.stereotype.Service; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml index 6cd8adb..8d5eca4 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthPermissionDao.xml @@ -128,11 +128,6 @@ - - - insert into schisandra_auth_permission(`name`,parent_id,`type`,menu_url,`status`,`show`,icon,permission_key,created_by,created_time,update_by,update_time,is_deleted) - values (#{name},#{parentId},#{type},#{menuUrl},#{status},#{show},#{icon},#{permissionKey},#{createdBy},#{createdTime},#{updateBy},#{updateTime},#{isDeleted}) - insert into @@ -157,59 +152,6 @@ values(update_time)is_deleted = values(is_deleted) - - - update schisandra_auth_permission - - - `name` = #{name}, - - - parent_id = #{parentId}, - - - `type` = #{type}, - - - menu_url = #{menuUrl}, - - - `status` = #{status}, - - - `show` = #{show}, - - - icon = #{icon}, - - - permission_key = #{permissionKey}, - - - created_by = #{createdBy}, - - - created_time = #{createdTime}, - - - update_by = #{updateBy}, - - - update_time = #{updateTime}, - - - is_deleted = #{isDeleted}, - - - where id = #{id} - - - - - delete - from schisandra_auth_permission - where id = #{id} - diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml index 064e4fc..3222bfd 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/resources/mapper/SchisandraAuthRoleDao.xml @@ -86,11 +86,6 @@ - - - insert into schisandra_auth_role(role_name,role_key,created_by,created_time,update_by,update_time,is_deleted) - values (#{roleName},#{roleKey},#{createdBy},#{createdTime},#{updateBy},#{updateTime},#{isDeleted}) - insert into schisandra_auth_role(role_name,role_key,created_by,created_time,update_by,update_time,is_deleted) @@ -112,41 +107,6 @@ values(is_deleted) - - - update schisandra_auth_role - - - role_name = #{roleName}, - - - role_key = #{roleKey}, - - - created_by = #{createdBy}, - - - created_time = #{createdTime}, - - - update_by = #{updateBy}, - - - update_time = #{updateTime}, - - - is_deleted = #{isDeleted}, - - - where id = #{id} - - - - - delete - from schisandra_auth_role - where id = #{id} - diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml index eb170ab..940e170 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/application.yml @@ -89,7 +89,7 @@ mybatis-flex: deleted-value-of-logic-delete: 1 logic-delete-column: is_deleted mapper-locations: - - "classpath*:/mapper/**/*.xml" + - "classpath*:/mapper/*.xml" # 前端地址 web: diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml index 2431c13..b1009ef 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-starter/src/main/resources/bootstrap.yml @@ -1,8 +1,6 @@ spring: application: - name: schisandra-cloud-storage-auth-dev - profiles: - active: dev + name: schisandra-cloud-storage-auth cloud: nacos: config: diff --git a/schisandra-cloud-storage-gateway/src/main/resources/application.yml b/schisandra-cloud-storage-gateway/src/main/resources/application.yml index 6753f2e..bd0f4fa 100644 --- a/schisandra-cloud-storage-gateway/src/main/resources/application.yml +++ b/schisandra-cloud-storage-gateway/src/main/resources/application.yml @@ -5,19 +5,19 @@ spring: gateway: routes: - id: oss - uri: lb://schisandra-cloud-storage-oss-dev + uri: lb://schisandra-cloud-storage-oss predicates: - Path=/oss/** filters: - StripPrefix=1 - id: auth - uri: lb://schisandra-cloud-storage-auth-dev + uri: lb://schisandra-cloud-storage-auth predicates: - Path=/auth/** filters: - StripPrefix=1 - id: system - uri: lb://schisandra-cloud-storage-system-dev + uri: lb://schisandra-cloud-storage-system predicates: - Path=/system/** filters: diff --git a/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml index ccdc14f..810bdd8 100644 --- a/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-gateway/src/main/resources/bootstrap.yml @@ -1,8 +1,6 @@ spring: application: - name: schisandra-cloud-storage-gateway-dev - profiles: - active: dev + name: schisandra-cloud-storage-gateway cloud: nacos: config: diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/resources/bootstrap.yml index 5c4c820..02f871b 100644 --- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-starter/src/main/resources/bootstrap.yml @@ -1,8 +1,6 @@ spring: application: - name: schisandra-cloud-storage-oss-dev - profiles: - active: dev + name: schisandra-cloud-storage-oss cloud: nacos: config: diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java index 30f6ae1..e03d804 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-api/src/main/java/com/schisandra/system/api/SchisandraSystemFeignService.java @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -@FeignClient("schisandra-cloud-storage-system-dev") +@FeignClient("schisandra-cloud-storage-system") public interface SchisandraSystemFeignService { @PostMapping(value = "/system/getConfigByKey") Result getConfigByKey(@RequestParam(value = "key") String key); diff --git a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml index 8122638..ba99b69 100644 --- a/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml +++ b/schisandra-cloud-storage-system/schisandra-cloud-storage-system-starter/src/main/resources/bootstrap.yml @@ -1,8 +1,6 @@ spring: application: - name: schisandra-cloud-storage-system-dev - profiles: - active: dev + name: schisandra-cloud-storage-system cloud: nacos: config: