diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java b/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java deleted file mode 100644 index 4ca741db..00000000 --- a/framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -package cn.lili.modules.connect.entity; - -import cn.lili.mybatis.BaseEntity; -import cn.lili.modules.connect.entity.enums.ConnectConfigEnum; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author Chopper - */ -@Data -@TableName("li_connect_config") -@ApiModel(value = "联合登陆配置") -@NoArgsConstructor -public class ConnectConfig extends BaseEntity { - - private static final long serialVersionUID = 1L; - - /** - * @see cn.lili.modules.connect.entity.enums.ConnectConfigEnum - */ - @ApiModelProperty(value = "配置key") - private String configKey; - - - @ApiModelProperty(value = "配置") - private String configValue; - - public ConnectConfig(String configKey) { - this.configKey = configKey; - ConnectConfigEnum configEnum = ConnectConfigEnum.valueOf(configKey); - String[] formItems = configEnum.getForm().split(","); - Map config = new HashMap<>(formItems.length); - for (int i = 0; i < formItems.length; i++) { - config.put(formItems[i], ""); - } - this.configValue = config.toString(); - } -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/connect/mapper/ConnectConfigMapper.java b/framework/src/main/java/cn/lili/modules/connect/mapper/ConnectConfigMapper.java deleted file mode 100644 index 0ecf2a12..00000000 --- a/framework/src/main/java/cn/lili/modules/connect/mapper/ConnectConfigMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package cn.lili.modules.connect.mapper; - -import cn.lili.modules.connect.entity.ConnectConfig; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -/** - * 联合登陆配置数据处理层 - * - * @author Chopper - */ -public interface ConnectConfigMapper extends BaseMapper { - -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java b/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java deleted file mode 100644 index 2ba02d37..00000000 --- a/framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java +++ /dev/null @@ -1,38 +0,0 @@ -package cn.lili.modules.connect.service; - -import cn.lili.modules.connect.entity.ConnectConfig; -import cn.lili.modules.connect.entity.vo.ConnectConfigForm; -import com.baomidou.mybatisplus.extension.service.IService; - -import java.util.List; - -/** - * 联合登陆配置接口 - * - * @author Chopper - */ -public interface ConnectConfigService extends IService { - - /** - * 获取所有配置项目 - * - * @return - */ - List listForms(); - - /** - * 获取配置详情 - * - * @param key 配置关键字 - * @return 配置参数 - */ - ConnectConfig getConfig(String key); - - /** - * 保存配置 - * - * @param connectConfig 联合登录配置 - * @return 联合登录配置 - */ - ConnectConfig saveConfig(ConnectConfig connectConfig); -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java deleted file mode 100644 index 8fbd22d3..00000000 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java +++ /dev/null @@ -1,56 +0,0 @@ -package cn.lili.modules.connect.serviceimpl; - -import cn.lili.modules.connect.entity.ConnectConfig; -import cn.lili.modules.connect.entity.enums.ConnectConfigEnum; -import cn.lili.modules.connect.entity.vo.ConnectConfigForm; -import cn.lili.modules.connect.mapper.ConnectConfigMapper; -import cn.lili.modules.connect.service.ConnectConfigService; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.ArrayList; -import java.util.List; - -/** - * 联合登陆配置接口实现 - * - * @author Chopper - */ -@Service -@Transactional(rollbackFor = Exception.class) -public class ConnectConfigServiceImpl extends ServiceImpl implements ConnectConfigService { - - @Override - public List listForms() { - - List formList = new ArrayList<>(); - for (int i = 0; i < ConnectConfigEnum.values().length; i++) { - ConnectConfigEnum enums = ConnectConfigEnum.values()[i]; - ConnectConfigForm form = new ConnectConfigForm(); - form.setKey(enums.name()); - form.setName(enums.getName()); - form.setForm(enums.getForm()); - formList.add(form); - } - - return formList; - } - - @Override - public ConnectConfig getConfig(String configKey) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("config_key", configKey); - ConnectConfig connectConfig = this.getOne(queryWrapper); - if (connectConfig == null) { - return new ConnectConfig(configKey); - } - return connectConfig; - } - - @Override - public ConnectConfig saveConfig(ConnectConfig connectConfig) { - return null; - } -} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java index 527fe185..2070321a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java @@ -339,7 +339,7 @@ public class ConnectServiceImpl extends ServiceImpl impl return JSONUtil.parseObj(result); } } catch (Exception e) { - log.error("解密，获取微信信息错误",e); + log.error("解密，获取微信信息错误", e); } throw new ServiceException(ResultCode.USER_CONNECT_ERROR); } diff --git a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java deleted file mode 100644 index c49ebdd5..00000000 --- a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java +++ /dev/null @@ -1,52 +0,0 @@ -package cn.lili.controller.member; - -import cn.lili.common.enums.ResultUtil; -import cn.lili.common.vo.ResultMessage; -import cn.lili.modules.connect.entity.ConnectConfig; -import cn.lili.modules.connect.entity.vo.ConnectConfigForm; -import cn.lili.modules.connect.service.ConnectConfigService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - -/** - * 管理端,联合登陆配置接口 - * - * @author Chopper - * @since 2020-02-25 14:10:16 - */ -@RestController -@Api(tags = "管理端,联合登陆配置接口") -@RequestMapping("/manager/connectConfig") -public class ConnectConfigManagerController { - - @Autowired - private ConnectConfigService connectConfigService; - - @GetMapping(value = "/list") - @ApiOperation(value = "获取所有联合配置") - public ResultMessage> all() { - return ResultUtil.data(connectConfigService.listForms()); - } - - @GetMapping(value = "/{key}") - @ApiOperation(value = "查看联合登陆配置详情") - public ResultMessage get(@PathVariable String key) { - ConnectConfig connectConfig = connectConfigService.getConfig(key); - return ResultUtil.data(connectConfig); - } - - - @PutMapping("/{configKey}") - @ApiOperation(value = "更新联合登陆配置") - public ResultMessage update(@PathVariable String configKey, ConnectConfig connectConfig) { - connectConfig.setConfigKey(configKey); - connectConfigService.saveConfig(connectConfig); - return ResultUtil.data(connectConfig); - } - -} diff --git a/pom.xml b/pom.xml index c8200a5c..01a762c9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 1.8 - 4.2.0 + 4.2.2 registry.cn-beijing.aliyuncs.com/lili-images 0.0.1 1.9.6