diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 042973b..5e67ac4 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -168,6 +168,18 @@ + + + src/main/java + + **/*.xml + + true + + + src/main/resources + + org.springframework.boot diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java index c65ccaf..6d2a60e 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/stock/goods/repo/model/StockGoodsProperty.java @@ -33,7 +33,7 @@ public class StockGoodsProperty implements Serializable { /** * 属性code */ - @TableId(value = "property_code", type = IdType.INPUT) + @TableField(value = "property_code") private String propertyCode; /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysRoleMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysRoleMapper.xml index 9b462e4..9a7fc1c 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysRoleMapper.xml +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysRoleMapper.xml @@ -2,7 +2,7 @@ - select * from sys_role a where a.delete_flag='0' and exists(select 1 from sys_user_role b where a.role_id=b.role_id and b.user_id=#{userId} and b.tenant_id=#{tenantId} ) diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysTenantMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysTenantMapper.xml deleted file mode 100644 index eaff5fa..0000000 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysTenantMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysUserMapper.xml b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysUserMapper.xml index 2346e58..e15d758 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysUserMapper.xml +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/sys/admin/repo/mapping/ISysUserMapper.xml @@ -2,7 +2,7 @@ - select user_id,username,name,u.phone,email_address,enable,locked,account_expired,pwd_expired,u.dept_id,d.dept_name, (select group_concat(t.tenant_name) from sys_tenant t,sys_user_tenant ut where ut.user_id=u.user_id and t.tenant_id=ut.tenant_id) as tenant_names from sys_user u left join sys_dept d on u.dept_id=d.dept_id diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/mapper/WechatCpAccountMapper.java b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/mapper/WechatCpAccountMapper.java index 97c02be..afaedab 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/mapper/WechatCpAccountMapper.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/mapper/WechatCpAccountMapper.java @@ -2,6 +2,7 @@ package cn.xluobo.business.wechat.cp.repo.mapper; import cn.xluobo.business.wechat.cp.repo.model.WechatCpAccount; import com.baomidou.mybatisplus.annotation.SqlParser; +import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @author zhangby * @since 2024-01-23 06:59:58 */ +@Mapper public interface WechatCpAccountMapper extends com.baomidou.mybatisplus.core.mapper.BaseMapper { @SqlParser(filter = true) diff --git a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpContactFollow.java b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpContactFollow.java index adcd812..8ec0858 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpContactFollow.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/business/wechat/cp/repo/model/WechatCpContactFollow.java @@ -35,7 +35,7 @@ public class WechatCpContactFollow implements Serializable { /** * 添加了此外部联系人的企业成员userid */ - @TableId(value = "cp_user_id", type = IdType.INPUT) + @TableField(value = "cp_user_id") private String cpUserId; /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/config/mybatis/MybatisConfiguration.java b/ruoyi-admin/src/main/java/cn/xluobo/config/mybatis/MybatisConfiguration.java index 692fa98..78b8d02 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/config/mybatis/MybatisConfiguration.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/config/mybatis/MybatisConfiguration.java @@ -20,7 +20,7 @@ import java.util.List; @EnableTransactionManagement @Configuration @AutoConfigureAfter(DataSourceAutoConfiguration.class) -@MapperScan(value = {"cn.xluobo.*.*.*.repo.mapper"}) +//@MapperScan(value = {"cn.xluobo.*.*.*.repo.mapper"}) public class MybatisConfiguration { /** diff --git a/ruoyi-admin/src/main/java/cn/xluobo/config/wechat/cp/WechatCpConfiguration.java b/ruoyi-admin/src/main/java/cn/xluobo/config/wechat/cp/WechatCpConfiguration.java index 246946f..7f4f8dd 100644 --- a/ruoyi-admin/src/main/java/cn/xluobo/config/wechat/cp/WechatCpConfiguration.java +++ b/ruoyi-admin/src/main/java/cn/xluobo/config/wechat/cp/WechatCpConfiguration.java @@ -23,7 +23,7 @@ import java.util.Optional; import java.util.stream.Collectors; -@Configuration +//@Configuration public class WechatCpConfiguration { @Autowired diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 10f88dd..b0d8aaa 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -127,7 +127,7 @@ mybatis-plus: # 搜索指定包别名 typeAliasesPackage: com.cyl.**.domain, com.ruoyi.common.core.domain.entity, com.ruoyi.**.domain # 配置mapper的扫描，找到所有的mapper.xml映射文件 - mapperLocations: classpath*:mapper/**/*Mapper.xml + mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:cn/xluobo/business/**/**/repo/mapping/**.xml # 加载全局的配置文件 configLocation: classpath:mybatis/mybatis-config.xml global-config: diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java index 39d260f..1e815b6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/ApplicationConfig.java @@ -17,7 +17,7 @@ import java.util.TimeZone; // 表示通过aop框架暴露该代理对象,AopContext能够访问 @EnableAspectJAutoProxy(exposeProxy = true) // 指定要扫描的Mapper类的包的路径 -@MapperScan({"com.ruoyi.**.mapper", "com.fjp.**.mapper", "com.cyl.**.mapper"}) +@MapperScan({"com.ruoyi.**.mapper", "com.fjp.**.mapper", "com.cyl.**.mapper","cn.xluobo.*.*.*.repo.mapper"}) public class ApplicationConfig { /** diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java index 5263b54..e963575 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/controller/H5CommonController.java @@ -11,7 +11,7 @@ import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.redis.RedisService; import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.common.utils.OssUtils; +//import com.ruoyi.common.utils.OssUtils; import com.ruoyi.system.service.ISysConfigService; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; @@ -27,8 +27,8 @@ import java.util.stream.Collectors; @RequestMapping public class H5CommonController { - @Autowired - private OssUtils ossUtils; +// @Autowired +// private OssUtils ossUtils; @Autowired private AddressMapper addressMapper; @Autowired @@ -97,8 +97,8 @@ public class H5CommonController { @PostMapping("/h5/file/upload") public AjaxResult uploadFile(MultipartFile file) { - String url = ossUtils.uploadOneFile(file); - return AjaxResult.successData(url); +// String url = ossUtils.uploadOneFile(file); + return AjaxResult.successData(null); } @GetMapping("/no-auth/config/get")