Merge branch 'v-1.10.1'

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/generate/AutoGenerate.java

README.md

@@ -21,3 +21,8 @@
     ALTER TABLE `4dkankan_v4`.`t_user_increment` 
     ADD COLUMN `subscription_order` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '自动订阅订单号' AFTER `agent_id`;
 ~~~~
+
+###**1.10.1** 
+~~~~
+添加系统设置接口
+~~~~

src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -39,7 +39,8 @@ public class WebAppConfig implements WebMvcConfigurer {
 						"/**/laser/**",
 						"/**/vaild/cameras/**",
 						"/**/hot/shop/**",
-						"/**/getIncrementType/**"
+						"/**/getIncrementType/**",
+						"/**/system/**"
 				);
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")

src/main/java/com/fdkankan/ucenter/controller/api/UcenterSystemController.java

@@ -0,0 +1,39 @@
+package com.fdkankan.ucenter.controller.api;
+
+
+import com.fdkankan.ucenter.common.BaseController;
+import com.fdkankan.ucenter.common.ResultData;
+import com.fdkankan.ucenter.entity.UcenterSystem;
+import com.fdkankan.ucenter.service.IUcenterSystemService;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-09
+ */
+@RestController
+@RequestMapping("/ucenter/system")
+public class UcenterSystemController extends BaseController {
+
+    @Autowired
+    IUcenterSystemService ucenterSystemService;
+
+
+    @GetMapping("/getInfo")
+    public ResultData getInfo(@RequestParam(required = false,defaultValue = "zh") String lang){
+        return ResultData.ok(ucenterSystemService.getByLang(lang));
+    }
+
+    @PostMapping("/saveOrUpdate")
+    public ResultData saveOrUpdate(@RequestBody UcenterSystem param){
+        ucenterSystemService.saveByLang(param);
+        return ResultData.ok();
+    }
+}
+

src/main/java/com/fdkankan/ucenter/entity/UcenterSystem.java

@@ -0,0 +1,50 @@
+package com.fdkankan.ucenter.entity;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+import com.fdkankan.ucenter.typehandle.*;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-09
+ */
+@Getter
+@Setter
+@TableName(value = "t_ucenter_system",autoResultMap = true)
+public class UcenterSystem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("lang")
+    private String lang;
+
+    @TableField(typeHandler = JsonObjTypeHandler.class)
+    private JSONObject content;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/ucenter/mapper/IUcenterSystemMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.fdkankan.ucenter.entity.UcenterSystem;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-09
+ */
+@Mapper
+public interface IUcenterSystemMapper extends BaseMapper<UcenterSystem> {
+
+}

src/main/java/com/fdkankan/ucenter/service/IUcenterSystemService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.ucenter.service;
+
+import com.fdkankan.ucenter.entity.UcenterSystem;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-09
+ */
+public interface IUcenterSystemService extends IService<UcenterSystem> {
+
+    UcenterSystem getByLang(String lang);
+
+    void saveByLang(UcenterSystem param);
+}

src/main/java/com/fdkankan/ucenter/service/impl/UcenterSystemServiceImpl.java

@@ -0,0 +1,39 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.ucenter.common.constants.ResultCode;
+import com.fdkankan.ucenter.entity.UcenterSystem;
+import com.fdkankan.ucenter.mapper.IUcenterSystemMapper;
+import com.fdkankan.ucenter.service.IUcenterSystemService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-09
+ */
+@Service
+public class UcenterSystemServiceImpl extends ServiceImpl<IUcenterSystemMapper, UcenterSystem> implements IUcenterSystemService {
+
+    @Override
+    public UcenterSystem getByLang(String lang) {
+        LambdaQueryWrapper<UcenterSystem> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(UcenterSystem::getLang,lang);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public void saveByLang(UcenterSystem param) {
+        UcenterSystem ucenterSystem = getByLang(param.getLang());
+        if(ucenterSystem != null){
+            param.setId(ucenterSystem.getId());
+        }
+        this.saveOrUpdate(param);
+    }
+}

src/main/java/com/fdkankan/ucenter/typehandle/JsonObjTypeHandler.java

@@ -0,0 +1,54 @@
+package com.fdkankan.ucenter.typehandle;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.type.BaseTypeHandler;
+import org.apache.ibatis.type.JdbcType;
+import org.apache.ibatis.type.MappedJdbcTypes;
+import org.apache.ibatis.type.MappedTypes;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+/**
+ *  存储到数据库, 将JSON数组对象转换成字符串;
+ *  从数据库获取数据, 将字符串转为JSON数组对象.
+ */
+@MappedTypes({JSONObject.class})
+@MappedJdbcTypes({JdbcType.VARCHAR})
+public class JsonObjTypeHandler extends BaseTypeHandler<JSONObject> {
+    @Override
+    public void setNonNullParameter(PreparedStatement ps, int i, JSONObject parameter,
+                                    JdbcType jdbcType) throws SQLException {
+        ps.setString(i, JSONObject.toJSONString(parameter));
+    }
+    @Override
+    public JSONObject getNullableResult(ResultSet rs, String columnName)
+            throws SQLException {
+        return JSONObject.parseObject(rs.getString(columnName));
+    }
+    @Override
+    public JSONObject getNullableResult(ResultSet rs, int columnIndex) throws SQLException {
+        return parseArray(rs.getString(columnIndex));
+    }
+    @Override
+    public JSONObject getNullableResult(CallableStatement cs, int columnIndex)
+            throws SQLException {
+        return parseArray(cs.getString(columnIndex));
+    }
+
+    public static JSONObject parseArray(String content) {
+        if(StringUtils.isBlank(content)){
+            return new JSONObject();
+        }
+        try {
+            return JSONObject.parseObject(content);
+        } catch (Exception e) {
+            return new JSONObject();
+        }
+    }
+
+}
+

src/main/resources/mapper/ucenter/UcenterSystemMapper.xml

@@ -0,0 +1,5 @@
+<?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.fdkankan.ucenter.mapper.IUcenterSystemMapper">
+
+</mapper>