Merge branch 'feature/resource' of https://gitea.qinmian.online/CY/mcwl-ai into preview

# Conflicts:
#	mcwl-admin/src/main/resources/application.yml

mcwl-admin/pom.xml

@@ -67,6 +67,12 @@
             <artifactId>mcwl-myInvitation</artifactId>
             <version>3.8.8</version>
         </dependency>
+        <!-- 公共模块-->
+        <dependency>
+            <groupId>com.mcwl</groupId>
+            <artifactId>mcwl-common</artifactId>
+            <version>3.8.8</version>
+        </dependency>
         <!-- 资源中心模块-->
         <dependency>
             <groupId>com.mcwl</groupId>

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java

@@ -1,16 +1,11 @@
 package com.mcwl.web.controller.resource;
-
+import com.mcwl.common.annotation.Anonymous;
-
-
 import com.mcwl.common.core.controller.BaseController;
+import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.page.TableDataInfo;
-
-
-
 import com.mcwl.resource.domain.MallProduct;
 import com.mcwl.resource.service.MallProductService;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
 
@@ -22,6 +17,7 @@ import java.util.List;
  * @Description 商品
  * @Date：2024/12/31 10:48
  */
+
 @RestController
 @RequestMapping("/MallProduct")
 public class MallProductController extends BaseController {
@@ -34,6 +30,56 @@ public class MallProductController extends BaseController {
     }
 
 
+    /**
+     * 查询商品列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(MallProduct sysJob)
+    {
+        startPage();
+        List<MallProduct> list = mallProductRuleInfoService.selectMallProductList(sysJob);
+        return getDataTable(list);
+    }
 
 
+    /**
+     * 获取详细信息
+     */
+    @GetMapping(value = "/{jobId}")
+    public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
+    {
+        return success(mallProductRuleInfoService.selectMallProductById(jobId));
+    }
+
+    /**
+     * 新增
+     */
+    @PostMapping("/add")
+    public AjaxResult add(@RequestBody MallProduct mallProduct)
+    {
+        mallProduct.setCreateBy(getUsername());
+        return toAjax(mallProductRuleInfoService.insertMallProduct(mallProduct));
+    }
+
+    /**
+     * 修改
+     */
+    @PutMapping("/upda")
+    public AjaxResult edit(@RequestBody MallProduct mallProduct)
+    {
+        mallProduct.setUpdateBy(getUsername());
+        return toAjax(mallProductRuleInfoService.updateMallProduct(mallProduct));
+    }
+
+
+    /**
+     * 删除定
+     */
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@RequestBody Long[] ids)
+    {
+        mallProductRuleInfoService.deleteMallProductByIds(ids);
+        return success();
+    }
+
 }

mcwl-admin/src/main/resources/application.yml

@@ -121,8 +121,6 @@ mybatis-plus:
     # 关闭日志记录 (可单纯使用 p6spy 分析) org.apache.ibatis.logging.nologging.NoLoggingImpl
     # 默认日志输出 org.apache.ibatis.logging.slf4j.Slf4jImpl
     logImpl: org.apache.ibatis.logging.slf4j.Slf4jImpl
-    # 枚举处理器
-    default-enum-type-handler: com.baomidou.mybatisplus.core.handlers.MybatisEnumTypeHandler
   global-config:
     # 是否打印 Logo banner
     banner: false

mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java

@@ -20,6 +20,7 @@ public class BaseEntity implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** 搜索值 */
+    @TableField(exist = false)
     @JsonIgnore
     @TableField(exist = false)
     private String searchValue;
@@ -42,6 +43,7 @@ public class BaseEntity implements Serializable
     private String remark;
 
     /** 请求参数 */
+    @TableField(exist = false)
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     @TableField(exist = false)
     private Map<String, Object> params;

mcwl-common/src/main/java/com/mcwl/common/domain/response/ResponseEnum.java

@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-package com.mcwl.common.domain.response;
-
-
-import com.mcwl.common.i18n.I18nMessage;
-
-/**
- * @author FrozenWatermelon
- * @date 2020/7/9
- */
-public enum ResponseEnum {
-
-    /**
-     * ok
-     */
-    OK("00000", "ok"),
-
-    /**
-     * 用于直接显示提示用户的错误，内容由输入内容决定
-     */
-    SHOW_FAIL("A00001", ""),
-
-    /**
-     * 用于直接显示提示系统的成功，内容由输入内容决定
-     */
-    SHOW_SUCCESS("A00002", ""),
-
-    /**
-     * 未授权
-     */
-    UNAUTHORIZED("A00004", "Unauthorized"),
-
-    /**
-     * 服务器出了点小差
-     */
-    EXCEPTION("A00005", "服务器出了点小差"),
-
-    /**
-     * TempUid异常
-     * 一般不会出现这个异常，出现这个异常会有两种已知可能
-     * 1. 一种是旧的tempUid
-     * 2. 一种是同域名的localstorage 有个也叫tempUid的存储覆盖了（有的人测试环境和正式环境放在同一个域名不同子目录下）
-     * 如果前端看到返回了这个异常，为了让用户能够顺利登录，需要重新获取一遍code，重新获取tempUid
-     */
-    TEMP_UID_ERROR("A00012", "TempUid Error"),
-
-    /**
-     * 接口不存在
-     */
-    NOT_FOUND("A00013", "接口不存在"),
-
-    /**
-     * 方法参数没有校验，内容由输入内容决定
-     */
-    METHOD_ARGUMENT_NOT_VALID("A00014", "方法参数没有校验"),
-
-    /**
-     * 支付密码错误
-     */
-    PAY_PASSWORD_ERROR("A00015", I18nMessage.getMessage("yami.user.pay.password.error")),
-
-
-    SCANCODE_PAY_ERROR("A00016", "扫描支付发生错误"),
-
-
-    NEW_USER_NO_INVITOR_ERROR("A00017", "新注册用户必须填写邀请码"),
-
-    NEW_USER_INVITOR_ERROR("A00018", "邀请码错误"),
-
-    /**
-     * 01开头代表商品
-     * 商品已下架，返回特殊的状态码，用于渲染商品下架的页面
-     */
-//    SPU_NOT_EXIST("A01000", "商品不存在"),
-
-    /**
-     * 02开头代表购物车
-     */
-//    SHOP_CART_NOT_EXIST("A02000", "商品已下架"),
-
-    /**
-     * 03开头代表订单
-     */
-    API_ORDER_NOT_EXIST("A03000", "订单不存在"),
-    ORDER_BUSY("A03001", "订单繁忙，请稍后再试"),
-
-    /**
-     * 订单不支持该配送方式
-     */
-    ORDER_DELIVERY_NOT_SUPPORTED("A03001", "The delivery method is not supported"),
-
-    /**
-     * 请勿重复提交订单，
-     * 1.当前端遇到该异常时，说明前端防多次点击没做好
-     * 2.提示用户 订单已发生改变，请勿重复下单
-     */
-    REPEAT_ORDER("A03002", "订单已过期，请重新下单"),
-
-    /**
-     * 优惠券不能共用
-     */
-    COUPON_CANNOT_USE_TOGETHER("A03003", "优惠券不能共用"),
-
-    /**
-     * 代金券金额超过了订单金额
-     */
-    COUPON_OF_RMRT_GT_ORDER("A03004", "代金券金额超过了订单金额"),
-
-    /**
-     * 库存不足，body会具体返回那个skuid的库存不足，后台通过skuId知道哪个商品库存不足，前端不需要判断
-     */
-    NOT_STOCK("A03010", "not stock"),
-
-    /**
-     * 该社交账号被其他用户绑定了，如果返回这个状态码，前端应该提示用户解绑已经绑定的账号重新绑定
-     */
-    SOCIAL_ACCOUNT_BIND_BY_OTHER("A04002", "social account bind by other"),
-
-    /**
-     * 存在未完成订单不能注销
-     */
-    DESTROY_USER_FAIL("A05000", "您的账户当前有未完成的订单，请待所有订单完成后再注销账户"),
-
-    /**
-     * 用户收货地址超过配送范围
-     */
-    DELIVERY_OVER("A07001", ""),
-    /**
-     * 账号重复
-     */
-    ACCOUNT_REPEAT("P01001", "账号已经被使用"),
-    ACCOUNT_NOT_EXIT("P01002", "账号不存在"),
-    ACCOUNT_NOT_ROLE("P01003", "账号不存在角色"),
-    ACCOUNT_STATUS_ERROR("P01004", "账号被锁"),
-    ACCOUNT_NOT_AREA("P01005", "账号没绑定经营地区"),
-    ACCOUNT_CREATE_ERROR("P01006", "账号创建失败"),
-    ACCOUNT_NO_MENU("P01007", "账号无菜单权限"),
-    PUSH_ID_NO_ACCOUNT("P01008", "该id无账号"),
-    ACCOUNT_ERROR("P01009", "账号权限错误"),
-    QUERY_TYPE_ERROR("P01010", "分页查询用户类型有误"),
-    // P02 钱包类
-    PUSH_USER_WALLET_NOT_EXIST("P02001", "用户钱包不存在"),
-    ORDER_NOT_EXIST("P02002", "订单不存在"),
-    NOT_SCANCODE_ORDER("P02003", "订单不是扫码下单"),
-    NOT_PAY_ORDER("P02004", "订单为未支付完成"),
-    ACTUAL_PAY_LITTLE_ORDER("P02005", "订单支付金额小于1元，不进行分成"),
-    NOT_BIND_ORDER("P02006", "订单商家未被推客绑定，不进行分成"),
-    PUSH_ERR("P02007", "分成失败"),
-    ACCOUNT_WX_BIND("P02101","改用户已经绑定openid" ),
-    WX_APPID_SECRET_ERR("P02102","获取配置的appid错误" ),
-    WITHDRAW_EXCESS_ERROR("P02005", "提现金额超出可提现额度"),
-    SHOP_BANK_CARD_NOT_EXIST("P02006", "银行卡不存在"),
-    SHOP_BANK_CARD_STATE_ERROR("P02007", "申请提现银行卡状态错误"),
-
-    SHOP_BANK_ACCOUNT_ERROR("P02008", "注册新生账号异常"),
-    SHOP_BANK_BIND_CONFIRM("P02010", "请输入验证码绑定银行卡"),
-    /**
-     * C开头为公共部分
-     */
-    ACCESS_TOKEN_ERR("C01001", "获取access_token失败"),
-    TICKET_ERR("C01002", "获取ticket失败"),
-    GENERATE_URL_LINK_ERR("C01003", "创建URLLink失败"),
-    GET_WX_CODE_SESSION_ERR("C01004", "微信登录凭证校验败"),
-
-    DATA_EXISTS("C01009", "数据已存在"),
-    DATA_NOT_CHANGE_ABLE("C01010", "数据不可变更"),
-
-
-
-
-    /**
-     * 远程接口调用错误
-     */
-    RPC_CALL_EXCEPTION("A08001", ""),
-    /**
-     *
-     */
-    RPC_CALL_HTTP_EXCEPTION("A08002", ""),
-
-
-    BAIDU_MAP_CONVERT_ERROR("A08003","百度地图接口调用错误" ),
-
-    /**
-     * T 平台活动类
-     */
-    REPEAT_ACTIVITY_SUB_ITEM("T00001", "重复的活动子项目"),;
-
-
-
-    private final String code;
-
-    private final String msg;
-
-    public String value() {
-        return code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    ResponseEnum(String code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    @Override
-    public String toString() {
-        return "ResponseEnum{" + "code='" + code + '\'' + ", msg='" + msg + '\'' + "} " + super.toString();
-    }
-
-}

mcwl-common/src/main/java/com/mcwl/common/domain/response/ServerResponseEntity.java

@@ -1,215 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-package com.mcwl.common.domain.response;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.mcwl.common.config.serializer.SensitiveJsonSerializer;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-/**
- * 响应实体
- * @author mcwl
- */
-public class ServerResponseEntity<T> implements Serializable {
-
-    private static final Logger log = LoggerFactory.getLogger(ServerResponseEntity.class);
-
-    /**
-     * 状态码
-     */
-     @Schema(description = "状态码" ) private String code;
-
-    /**
-     * 信息
-     */
-     @Schema(description = "信息" ) private String msg;
-
-    /**
-     * 数据
-     */
-     @Schema(description = "数据" )
-     @JsonSerialize(using = SensitiveJsonSerializer.class)
-     private T data;
-
-    /**
-     * 版本
-     */
-    private String version;
-
-    /**
-     * 时间
-     */
-    private Long timestamp;
-
-    private String sign;
-
-    public String getSign() {
-        return sign;
-    }
-
-    public void setSign(String sign) {
-        this.sign = sign;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
-
-    public T getData() {
-        return data;
-    }
-
-    public ServerResponseEntity setData(T data) {
-        this.data = data;
-        return this;
-    }
-
-    public Long getTimestamp() {
-        return timestamp;
-    }
-
-    public void setTimestamp(Long timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public boolean isSuccess() {
-        return Objects.equals(ResponseEnum.OK.value(), this.code);
-    }
-    public boolean isFail() {
-        return !Objects.equals(ResponseEnum.OK.value(), this.code);
-    }
-
-    public ServerResponseEntity() {
-        // 版本号
-        this.version = "mall4j.v231204";
-    }
-
-    public static <T> ServerResponseEntity<T> success(T data) {
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setData(data);
-        serverResponseEntity.setCode(ResponseEnum.OK.value());
-        return serverResponseEntity;
-    }
-
-    public static <T> ServerResponseEntity<T> success() {
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setCode(ResponseEnum.OK.value());
-        serverResponseEntity.setMsg(ResponseEnum.OK.getMsg());
-        return serverResponseEntity;
-    }
-
-    public static <T> ServerResponseEntity<T> success(Integer code, T data) {
-        return success(String.valueOf(code), data);
-    }
-
-    public static <T> ServerResponseEntity<T> success(String code, T data) {
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setCode(code);
-        serverResponseEntity.setData(data);
-        return serverResponseEntity;
-    }
-
-    /**
-     * 前端显示失败消息
-     * @param msg 失败消息
-     * @return
-     */
-    public static <T> ServerResponseEntity<T> showFailMsg(String msg) {
-        log.error(msg);
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setMsg(msg);
-        serverResponseEntity.setCode(ResponseEnum.SHOW_FAIL.value());
-        return serverResponseEntity;
-    }
-
-    public static <T> ServerResponseEntity<T> fail(ResponseEnum responseEnum) {
-        log.error(responseEnum.toString());
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setMsg(responseEnum.getMsg());
-        serverResponseEntity.setCode(responseEnum.value());
-        return serverResponseEntity;
-    }
-
-    public static <T> ServerResponseEntity<T> fail(ResponseEnum responseEnum, T data) {
-        log.error(responseEnum.toString());
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setMsg(responseEnum.getMsg());
-        serverResponseEntity.setCode(responseEnum.value());
-        serverResponseEntity.setData(data);
-        return serverResponseEntity;
-    }
-
-    public static <T> ServerResponseEntity<T> fail(String code, String msg, T data) {
-        log.error(msg);
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setMsg(msg);
-        serverResponseEntity.setCode(code);
-        serverResponseEntity.setData(data);
-        return serverResponseEntity;
-    }
-
-    public static <T> ServerResponseEntity<T> fail(String code, String msg) {
-        return fail(code, msg, null);
-    }
-
-    public static <T> ServerResponseEntity<T> fail(Integer code, T data) {
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setCode(String.valueOf(code));
-        serverResponseEntity.setData(data);
-        return serverResponseEntity;
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> ServerResponseEntity<T> transform(ServerResponseEntity<?> oldServerResponseEntity) {
-        ServerResponseEntity<T> serverResponseEntity = new ServerResponseEntity<>();
-        serverResponseEntity.setMsg(oldServerResponseEntity.getMsg());
-        serverResponseEntity.setCode(oldServerResponseEntity.getCode());
-        serverResponseEntity.setData((T) oldServerResponseEntity.getData());
-        log.error(serverResponseEntity.toString());
-        return serverResponseEntity;
-    }
-
-    @Override
-    public String toString() {
-        return "ServerResponseEntity{" +
-                "code='" + code + '\'' +
-                ", msg='" + msg + '\'' +
-                ", data=" + data +
-                ", version='" + version + '\'' +
-                ", timestamp=" + timestamp +
-                ", sign='" + sign + '\'' +
-                '}';
-    }
-}

mcwl-common/src/main/java/com/mcwl/common/exception/YamiBizException.java

@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-package com.mcwl.common.exception;
-
-
-import com.mcwl.common.domain.response.ResponseEnum;
-import lombok.Getter;
-
-/**
- * 自定义异常
- * @author mcwl
- */
-@Getter
-public class YamiBizException extends RuntimeException{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = -4137688758944857209L;
-
-    /**
-     * http状态码
-     */
-    private String code;
-
-    /**
-     * @param responseEnum http状态码
-     */
-    public YamiBizException(ResponseEnum responseEnum) {
-        super(responseEnum.getMsg());
-        this.code = responseEnum.value();
-    }
-
-    /**
-     * @param responseEnum http状态码
-     */
-    public YamiBizException(ResponseEnum responseEnum, String msg) {
-        super(msg);
-        this.code = responseEnum.value();
-    }
-
-    public YamiBizException(String msg) {
-//        super(msg);
-        super(msg);
-        this.code = ResponseEnum.SHOW_FAIL.value();
-    }
-
-    public YamiBizException(String code,String msg) {
-//        super(msg);
-        super(msg);
-        this.code = code;
-    }
-}

mcwl-common/src/main/java/com/mcwl/common/exception/YamiShopBindException.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-package com.mcwl.common.exception;
-
-import com.mcwl.common.domain.response.ResponseEnum;
-import com.mcwl.common.domain.response.ServerResponseEntity;
-import com.mcwl.common.i18n.I18nMessage;
-import lombok.Getter;
-
-/**
- * 自定义异常
- * @author mcwl
- */
-@Getter
-public class YamiShopBindException extends RuntimeException{
-
-    /**
-     *
-     */
-    private static final long serialVersionUID = -4137688758944857209L;
-
-    /**
-     * http状态码
-     */
-    private String code;
-
-    private Object object;
-
-    private ServerResponseEntity<?> serverResponseEntity;
-
-    /**
-     * @param responseEnum http状态码
-     */
-    public YamiShopBindException(ResponseEnum responseEnum) {
-        super(responseEnum.getMsg());
-        this.code = responseEnum.value();
-    }
-
-    /**
-     * @param responseEnum http状态码
-     */
-    public YamiShopBindException(ResponseEnum responseEnum, String msg) {
-        super(I18nMessage.getMessage(msg));
-        this.code = responseEnum.value();
-    }
-
-    public YamiShopBindException(ServerResponseEntity<?> serverResponseEntity) {
-        this.serverResponseEntity = serverResponseEntity;
-    }
-
-    public YamiShopBindException(String msg) {
-//        super(msg);
-        super(I18nMessage.getMessage(msg));
-        this.code = ResponseEnum.SHOW_FAIL.value();
-    }
-
-    public YamiShopBindException(String msg, Object object) {
-        super(I18nMessage.getMessage(msg));
-        this.code = ResponseEnum.SHOW_FAIL.value();
-        this.object = object;
-    }
-
-    public YamiShopBindException(String code, String msg) {
-        super(I18nMessage.getMessage(msg));
-        this.code = code;
-    }
-}

mcwl-common/src/main/java/com/mcwl/common/i18n/I18nMessage.java

@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-package com.mcwl.common.i18n;
-
-
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.i18n.LocaleContextHolder;
-import org.springframework.context.support.MessageSourceAccessor;
-import org.springframework.context.support.ReloadableResourceBundleMessageSource;
-
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Objects;
-
-/**
- * 多语言国际化消息工具类
- * @author mcwl
- */
-@Slf4j
-public class I18nMessage {
-    private static MessageSourceAccessor accessor;
-
-//    private static final String BASE_FOLDE = "i18n";
-
-    private static final String BASE_NAME = "i18n/messages";
-
-    static{
-        ReloadableResourceBundleMessageSource reloadableResourceBundleMessageSource = new ReloadableResourceBundleMessageSource();
-        reloadableResourceBundleMessageSource.setBasenames(BASE_NAME);
-        reloadableResourceBundleMessageSource.setCacheSeconds(5);
-        reloadableResourceBundleMessageSource.setDefaultEncoding("UTF-8");
-        accessor = new MessageSourceAccessor(reloadableResourceBundleMessageSource);
-    }
-
-
-//    /**
-//     * 获取一条语言配置信息
-//     *
-//     * @param message 配置信息属性名,eg: api.response.code.user.signUp
-//     * @return
-//     */
-//    public static String getMessage(String message) {
-//        Locale locale = LocaleContextHolder.getLocale();
-//        return I18nMessage.accessor.getMessage(message,locale);
-//    }
-
-    /**
-     * 获取一条语言配置信息
-     *
-     * @param message 配置信息属性名,eg: api.response.code.user.signUp
-     * @return
-     */
-    public static String getMessage(String message) {
-        Locale locale = LocaleContextHolder.getLocale();
-        try {
-            return accessor.getMessage(message,locale);
-        }catch (Exception e){
-            return message;
-        }
-
-    }
-    /**
-     * 获取一条语言配置信息（后台管理）
-     *
-     * @return
-     * @throws IOException
-     */
-    public static Integer getLang() {
-        Locale locale = LocaleContextHolder.getLocale();
-        return LanguageEnum.valueOf(locale).getLang();
-    }
-
-    /**
-     * 获取一条语言配置信息(小程序、pc)
-     *
-     * @return
-     * @throws IOException
-     */
-    public static Integer getDbLang() {
-        Integer lang = getLang();
-        if (Objects.equals(lang, 0)) {
-            return LanguageEnum.LANGUAGE_ZH_CN.getLang();
-        }
-        return lang;
-    }
-
-//    /**
-//     * 获取文件夹下所有的国际化文件名
-//     *
-//     * @param folderName 文件名
-//     * @return
-//     * @throws IOException
-//     */
-//    private static String[] getAllBaseNames(final String folderName) throws IOException {
-//        URL url = Thread.currentThread().getContextClassLoader()
-//                .getResource(folderName);
-//        if (null == url) {
-//            throw new RuntimeException("无法获取资源文件路径");
-//        }
-//
-//        List<String> baseNames = new ArrayList<>();
-//        if (url.getProtocol().equalsIgnoreCase("file")) {
-//            // 文件夹形式,用File获取资源路径
-//            File file = new File(url.getFile());
-//            if (file.exists() && file.isDirectory()) {
-//                baseNames = Files.walk(file.toPath())
-//                        .filter(path -> path.toFile().isFile())
-//                        .map(Path::toString)
-//                        .map(path -> path.substring(path.indexOf(folderName)))
-//                        .map(I18nMessage::getI18FileName)
-//                        .distinct()
-//                        .collect(Collectors.toList());
-//            } else {
-//                log.error("指定的baseFile不存在或者不是文件夹");
-//            }
-//        }
-//        return baseNames.toArray(new String[0]);
-//    }
-//
-//    /**
-//     * 把普通文件名转换成国际化文件名
-//     *
-//     * @param filename
-//     * @return
-//     */
-//    private static String getI18FileName(String filename) {
-//        filename = filename.replace(".properties", "");
-////        for (int i = 0; i < 2; i++) {
-////            int index = filename.lastIndexOf("_");
-////            if (index != -1) {
-////                filename = filename.substring(0, index);
-////            }
-////        }
-//        return filename.replace("\\", "/");
-//    }
-
-}

mcwl-common/src/main/java/com/mcwl/common/utils/ImageUtil.java

@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-package com.mcwl.common.utils;
-
-import cn.hutool.core.util.StrUtil;
-import com.mcwl.common.exception.YamiShopBindException;
-
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URL;
-
-/**
- * 图片处理工具类
-
- */
-public class ImageUtil {
-    private static final String JPG =  "jpg";
-    private static final String JPEG = "jpeg";
-    /**
-     * 将图片转为二进制数组
-     * @param imgUrl
-     * @return
-     */
-    public static byte[] imgToBinary(String imgUrl) {
-        try {
-            BufferedImage bufferedImage = ImageIO.read(new URL(imgUrl));
-            ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            String suffix = imgUrlFileType(imgUrl);
-            //ImageIO无法写入jpeg文件 报Invalid argument to native writeImage，需重画
-            if(StrUtil.equals(suffix, JPG) || StrUtil.equals(suffix,JPEG)){
-                BufferedImage tag;
-                tag = new BufferedImage(bufferedImage.getWidth(), bufferedImage.getHeight(), BufferedImage.TYPE_INT_BGR);
-                Graphics g = tag.getGraphics();
-                g.drawImage(bufferedImage, 0, 0, null);
-                g.dispose();
-                bufferedImage = tag;
-            }
-            ImageIO.write(bufferedImage, suffix, baos);
-            byte[] bytes = baos.toByteArray();
-            return bytes;
-        } catch (IOException e) {
-            // 图片丢失，请重新上传图片
-            throw new YamiShopBindException("yami.img.lose");
-        }
-    }
-
-    /**
-     * @param imgUrl
-     * @return 文件得后缀，文件类型 jpg ,  png , ...
-     */
-    public static String imgUrlFileType(String imgUrl) {
-        if (StrUtil.isBlank(imgUrl)) {
-            return imgUrl;
-        }
-        imgUrl.trim();
-        String[] split = imgUrl.split("\\.");
-        String s = split[split.length - 1];
-        return s;
-    }
-
-    /**
-     * @param imgUrl
-     * @return 获取文件名称
-     */
-    public static String imgUrlFileName(String imgUrl) {
-        if (StrUtil.isBlank(imgUrl)) {
-            return imgUrl;
-        }
-        imgUrl.trim();
-        String[] split = imgUrl.split("/");
-        String s = split[split.length - 1];
-        return s;
-    }
-    /**
-     * @param imgUrl
-     * @return 获取文件名称 45d3631e97d8438d80f9db1369595b8c
-     */
-    public static String imgUrlFileNameNoSuffix(String imgUrl) {
-        if (StrUtil.isBlank(imgUrl)) {
-            return imgUrl;
-        }
-        imgUrl.trim();
-        String[] split = imgUrl.split("/");
-        String s = split[split.length - 1];
-        String[] split1 = s.split("\\.");
-        return split1[0];
-    }
-}

mcwl-framework/src/main/java/com/mcwl/framework/config/I18nConfig.java

@@ -1,43 +0,0 @@
-package com.mcwl.framework.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.LocaleResolver;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
-import org.springframework.web.servlet.i18n.SessionLocaleResolver;
-import com.mcwl.common.constant.Constants;
-
-/**
- * 资源文件配置加载
- *
- * @author mcwl
- */
-@Configuration
-public class I18nConfig implements WebMvcConfigurer
-{
-    @Bean
-    public LocaleResolver localeResolver()
-    {
-        SessionLocaleResolver slr = new SessionLocaleResolver();
-        // 默认语言
-        slr.setDefaultLocale(Constants.DEFAULT_LOCALE);
-        return slr;
-    }
-
-    @Bean
-    public LocaleChangeInterceptor localeChangeInterceptor()
-    {
-        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
-        // 参数名
-        lci.setParamName("lang");
-        return lci;
-    }
-
-    @Override
-    public void addInterceptors(InterceptorRegistry registry)
-    {
-        registry.addInterceptor(localeChangeInterceptor());
-    }
-}

mcwl-resource/src/main/java/com/mcwl/resource/domain/MallProduct.java

@@ -24,7 +24,6 @@ import java.math.BigDecimal;
 public class MallProduct extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-
     /**
      * ID
      */

mcwl-resource/src/main/java/com/mcwl/resource/mapper/MallProductMapper.java

@@ -3,6 +3,7 @@ package com.mcwl.resource.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mcwl.resource.domain.MallProduct;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @Author：ChenYan
@@ -14,4 +15,6 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface MallProductMapper extends BaseMapper<MallProduct> {
+    String selectMallProductById(@Param("mallProductId") Long mallProductId);
+
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/MallProductService.java

@@ -16,8 +16,16 @@ import java.util.List;
  */
 public interface MallProductService extends IService<MallProduct> {
 
+    List<MallProduct> selectMallProductList(MallProduct sysJob);
 
-    List<MallProduct> selectMallProductRuleInfoList(MallProduct mallProductRuleInfo);
+    String selectMallProductById(Long mallProductId);
 
 
+    int insertMallProduct(MallProduct mallProduct);
+
+    int updateMallProduct(MallProduct mallProduct);
+
+
+    void deleteMallProductByIds(Long[] ids);
+
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/MallProductServiceImpl.java

@@ -28,14 +28,34 @@ public class MallProductServiceImpl extends ServiceImpl<MallProductMapper,MallPr
     @Autowired
     private MallProductMapper postMapper;
 
+
     @Override
-    public List<MallProduct> selectMallProductRuleInfoList(MallProduct mallProduct) {
+    public List<MallProduct> selectMallProductList(MallProduct mallProduct) {
         QueryWrapper<MallProduct> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(MallProduct::getProductName, mallProduct.getProductName());
         queryWrapper.lambda().eq(MallProduct::getName, mallProduct.getName());
         queryWrapper.lambda().eq(MallProduct::getAmount, mallProduct.getAmount());
-        MallProduct mallProducts = postMapper.selectOne(queryWrapper);
+        return postMapper.selectList(queryWrapper);
-        return (List<MallProduct>) mallProducts;
+    }
+
+    @Override
+    public String selectMallProductById(Long mallProductId) {
+        return postMapper.selectMallProductById(mallProductId);
+    }
+
+    @Override
+    public int insertMallProduct(MallProduct mallProduct) {
+        return postMapper.insert(mallProduct);
+    }
+
+    @Override
+    public int updateMallProduct(MallProduct mallProduct) {
+        return postMapper.updateById(mallProduct);
+    }
+
+    @Override
+    public void deleteMallProductByIds(Long[] ids) {
+        postMapper.deleteBatchIds(ids);
     }
 
 

mcwl-resource/src/main/resources/mapper/resource/MallProductMapper.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mcwl.resource.mapper.MallProductMapper">
+
+
+    <select id="selectMallProductById" resultType="java.lang.String">
+        select id,
+               user_id,
+               product_id,
+               product_name,
+               detail,
+               model,
+               amount,
+               name,
+               zip_url,
+               url,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               remark,
+               del_flag
+        from mall_product where  product_id =#{mallProductId}
+    </select>
+</mapper>