Merge remote-tracking branch 'origin/master'

jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -79,7 +79,7 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
 
         filterChainDefinitionMap.put("/sso/dy/**", "anon"); //SSO单点登录
-
+        filterChainDefinitionMap.put("/interlockLoginConfig/interlockLoginConfig/**", "anon"); //登陆页面配置接口
 
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockLoginConfig/controller/InterlockLoginConfigController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.interlockLoginConfig.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.interlockLoginConfig.entity.InterlockLoginConfig;
+import org.jeecg.modules.interlockLoginConfig.service.IInterlockLoginConfigService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 联锁登陆页配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-12
+ * @Version: V1.0
+ */
+@Api(tags="联锁登陆页配置表")
+@RestController
+@RequestMapping("/interlockLoginConfig/interlockLoginConfig")
+@Slf4j
+public class InterlockLoginConfigController extends JeecgController<InterlockLoginConfig, IInterlockLoginConfigService> {
+	@Autowired
+	private IInterlockLoginConfigService interlockLoginConfigService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param interlockLoginConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "联锁登陆页配置表-分页列表查询")
+	@ApiOperation(value="联锁登陆页配置表-分页列表查询", notes="联锁登陆页配置表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<InterlockLoginConfig>> queryPageList(InterlockLoginConfig interlockLoginConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<InterlockLoginConfig> queryWrapper = QueryGenerator.initQueryWrapper(interlockLoginConfig, req.getParameterMap());
+		Page<InterlockLoginConfig> page = new Page<InterlockLoginConfig>(pageNo, pageSize);
+		IPage<InterlockLoginConfig> pageList = interlockLoginConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param interlockLoginConfig
+	 * @return
+	 */
+	@AutoLog(value = "联锁登陆页配置表-添加")
+	@ApiOperation(value="联锁登陆页配置表-添加", notes="联锁登陆页配置表-添加")
+	//@RequiresPermissions("org.jeecg.modules:interlock_login_config:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody InterlockLoginConfig interlockLoginConfig) {
+		interlockLoginConfigService.save(interlockLoginConfig);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param interlockLoginConfig
+	 * @return
+	 */
+	@AutoLog(value = "联锁登陆页配置表-编辑")
+	@ApiOperation(value="联锁登陆页配置表-编辑", notes="联锁登陆页配置表-编辑")
+	//@RequiresPermissions("org.jeecg.modules:interlock_login_config:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody InterlockLoginConfig interlockLoginConfig) {
+		interlockLoginConfigService.updateById(interlockLoginConfig);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "联锁登陆页配置表-通过id删除")
+	@ApiOperation(value="联锁登陆页配置表-通过id删除", notes="联锁登陆页配置表-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_login_config:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		interlockLoginConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "联锁登陆页配置表-批量删除")
+	@ApiOperation(value="联锁登陆页配置表-批量删除", notes="联锁登陆页配置表-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:interlock_login_config:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.interlockLoginConfigService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "联锁登陆页配置表-通过id查询")
+	@ApiOperation(value="联锁登陆页配置表-通过id查询", notes="联锁登陆页配置表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<InterlockLoginConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		InterlockLoginConfig interlockLoginConfig = interlockLoginConfigService.getById(id);
+		if(interlockLoginConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(interlockLoginConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param interlockLoginConfig
+    */
+    //@RequiresPermissions("org.jeecg.modules:interlock_login_config:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, InterlockLoginConfig interlockLoginConfig) {
+        return super.exportXls(request, interlockLoginConfig, InterlockLoginConfig.class, "联锁登陆页配置表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("interlock_login_config:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, InterlockLoginConfig.class);
+    }
+
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockLoginConfig/entity/InterlockLoginConfig.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.interlockLoginConfig.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 联锁登陆页配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-12
+ * @Version: V1.0
+ */
+@Data
+@TableName("interlock_login_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="interlock_login_config对象", description="联锁登陆页配置表")
+public class InterlockLoginConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**背景图片*/
+	@Excel(name = "背景图片", width = 15)
+    @ApiModelProperty(value = "背景图片")
+    private java.lang.String backPic;
+	/**logo图片*/
+	@Excel(name = "logo图片", width = 15)
+    @ApiModelProperty(value = "logo图片")
+    private java.lang.String logoPic;
+	/**公司网址*/
+	@Excel(name = "公司网址", width = 15)
+    @ApiModelProperty(value = "公司网址")
+    private java.lang.String companyUrl;
+	/**公司地址*/
+	@Excel(name = "公司地址", width = 15)
+    @ApiModelProperty(value = "公司地址")
+    private java.lang.String companyAddress;
+	/**公司电话*/
+	@Excel(name = "公司电话", width = 15)
+    @ApiModelProperty(value = "公司电话")
+    private java.lang.String companyTelephone;
+	/**公司版权*/
+	@Excel(name = "公司版权", width = 15)
+    @ApiModelProperty(value = "公司版权")
+    private java.lang.String companyCopyright;
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockLoginConfig/mapper/InterlockLoginConfigMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.interlockLoginConfig.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.interlockLoginConfig.entity.InterlockLoginConfig;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 联锁登陆页配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-12
+ * @Version: V1.0
+ */
+public interface InterlockLoginConfigMapper extends BaseMapper<InterlockLoginConfig> {
+
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockLoginConfig/mapper/xml/InterlockLoginConfigMapper.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="org.jeecg.modules.interlockLoginConfig.mapper.InterlockLoginConfigMapper">
+
+</mapper>

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockLoginConfig/service/IInterlockLoginConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.interlockLoginConfig.service;
+
+import org.jeecg.modules.interlockLoginConfig.entity.InterlockLoginConfig;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 联锁登陆页配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-12
+ * @Version: V1.0
+ */
+public interface IInterlockLoginConfigService extends IService<InterlockLoginConfig> {
+
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/interlockLoginConfig/service/impl/InterlockLoginConfigServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.interlockLoginConfig.service.impl;
+
+import org.jeecg.modules.interlockLoginConfig.entity.InterlockLoginConfig;
+import org.jeecg.modules.interlockLoginConfig.mapper.InterlockLoginConfigMapper;
+import org.jeecg.modules.interlockLoginConfig.service.IInterlockLoginConfigService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 联锁登陆页配置表
+ * @Author: jeecg-boot
+ * @Date:   2024-08-12
+ * @Version: V1.0
+ */
+@Service
+public class InterlockLoginConfigServiceImpl extends ServiceImpl<InterlockLoginConfigMapper, InterlockLoginConfig> implements IInterlockLoginConfigService {
+
+}

jeecg-module-interlock/src/main/java/org/jeecg/modules/iotedgeConfig/util/ConfigInfo.java

@@ -87,4 +87,7 @@ public class ConfigInfo {
 
     /** IoTEdge-根据组织id查询设备信息 */
     public static String IOTEDGE_GETINFOBYGROUPID = "IoTEdge.getInfoByGroupID";
+
+    /** SSO-获取SSO用户角色 */
+    public static String SSO_GETSSORLOE = "SSO.GetSSORole";
 }

jeecg-module-interlock/src/main/java/org/jeecg/modules/ssoClient/controller/SSOLoginLogoutController.java

@@ -711,8 +711,8 @@ public class SSOLoginLogoutController {
      *  sso登录，获取当前sso用户的角色，是否是系统管理员
      */
     public  String getSSORole(String eiToken){
-         String url = "http://192.168.2.248:8188/v4.0/users/me";
-//        String url = configService.getConfigValue(ConfigInfo.SSO_LOGIN_URL);
+         //String url = "http://192.168.2.248:8188/v4.0/users/me";
+        String url = configService.getConfigValue(ConfigInfo.SSO_GETSSORLOE);
         // 设置请求头部
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);