From abd73edd5d08e26fba60ab47f53722502a87505a Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 08 一月 2026 17:21:50 +0800
Subject: [PATCH] 浪潮对接单点登录:租户数据隔离功能
---
src/main/resources/application-scgkxt.yml | 5
src/main/resources/application-cwglxt.yml | 11 +
src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 7 +
src/main/java/com/ruoyi/project/system/controller/SysDeptController.java | 3
src/main/java/com/ruoyi/project/system/domain/SysDept.java | 12 ++
src/main/resources/application-cgglxt.yml | 5
src/main/java/com/ruoyi/project/system/domain/SysRole.java | 14 ++
src/main/resources/application-xtbgxt.yml | 5
src/main/resources/application-yxglxt.yml | 11 +
src/main/java/com/ruoyi/tide/controller/TideController.java | 30 +++++
src/main/java/com/ruoyi/project/system/controller/SysPostController.java | 3
src/main/resources/application-sbglxt.yml | 5
src/main/java/com/ruoyi/project/system/service/ISysDeptService.java | 8 +
src/main/resources/application-ccwlxt.yml | 11 +
src/main/resources/mybatis/mybatis-config.xml | 4
src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java | 3
src/main/java/com/ruoyi/project/system/controller/SysRoleController.java | 3
src/main/resources/application-rlzyxt.yml | 11 +
src/main/resources/application-hbmjxt.yml | 5
src/main/resources/mapper/system/SysPostMapper.xml | 6 +
src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java | 9 +
src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java | 6 +
src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java | 2
src/main/java/com/ruoyi/project/system/domain/SysPost.java | 10 ++
src/main/resources/mapper/system/SysDeptMapper.xml | 7 +
src/main/java/com/ruoyi/tide/utils/TideUtils.java | 36 +++++-
src/main/resources/mapper/system/SysRoleMapper.xml | 3
src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java | 2
src/main/resources/application.yml | 11 ++
29 files changed, 205 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index 2cf52c3..0cb4cee 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -74,7 +74,7 @@
if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
{
String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), PermissionContextHolder.getContext());
- dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
+ dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), controllerDataScope.tenantIdFelid(), permission);
}
}
}
@@ -86,9 +86,10 @@
* @param user 鐢ㄦ埛
* @param deptAlias 閮ㄩ棬鍒悕
* @param userAlias 鐢ㄦ埛鍒悕
+ * @param tenantIdFelid 绉熸埛id瀛楁鍚�
* @param permission 鏉冮檺瀛楃
*/
- public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
+ public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias,String tenantIdFelid, String permission)
{
StringBuilder sqlString = new StringBuilder();
List<String> conditions = new ArrayList<String>();
@@ -138,6 +139,8 @@
if (StringUtils.isNotBlank(userAlias))
{
sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
+ }else if(StringUtils.isNotBlank(tenantIdFelid)){
+ sqlString.append(StringUtils.format(" OR {}.tenant_id = {} ", tenantIdFelid, user.getTenantId()));
}
else
{
diff --git a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
index f36896e..715ef0c 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/lang/annotation/DataScope.java
@@ -27,6 +27,12 @@
public String userAlias() default "";
/**
+ * 绉熸埛id瀛楁鍚�
+ * @return
+ */
+ public String tenantIdFelid() default "";
+
+ /**
* 鏉冮檺瀛楃锛堢敤浜庡涓鑹插尮閰嶇鍚堣姹傜殑鏉冮檺锛夐粯璁ゆ牴鎹潈闄愭敞瑙ss鑾峰彇锛屽涓潈闄愮敤閫楀彿鍒嗛殧寮�鏉�
*/
public String permission() default "";
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
index 0a48efe..a33563d 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.system.controller;
import java.util.List;
+
+import com.ruoyi.common.utils.SecurityUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -81,6 +83,7 @@
return error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
}
dept.setCreateBy(getUsername());
+ dept.setTenantId(SecurityUtils.getLoginUser().getTenantId());
return toAjax(deptService.insertDept(dept));
}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index a49692c..b159a27 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -86,6 +88,7 @@
return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
}
post.setCreateBy(getUsername());
+ post.setTenantId(SecurityUtils.getLoginUser().getTenantId());
return toAjax(postService.insertPost(post));
}
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
index c3766bf..db2d33d 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -102,6 +104,7 @@
return error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
}
role.setCreateBy(getUsername());
+ role.setTenantId(SecurityUtils.getLoginUser().getTenantId());
return toAjax(roleService.insertRole(role));
}
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysDept.java b/src/main/java/com/ruoyi/project/system/domain/SysDept.java
index e2c6b2b..cdd1924 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysDept.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysDept.java
@@ -54,7 +54,17 @@
/** 閮ㄩ棬缂栧彿 */
private String deptNick;
-
+
+ private Long tenantId;
+
+ public Long getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Long tenantId) {
+ this.tenantId = tenantId;
+ }
+
/** 瀛愰儴闂� */
private List<SysDept> children = new ArrayList<SysDept>();
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysPost.java b/src/main/java/com/ruoyi/project/system/domain/SysPost.java
index e9b7ecd..787df98 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysPost.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysPost.java
@@ -38,6 +38,16 @@
@Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
+ private Long tenantId;
+
+ public Long getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Long tenantId) {
+ this.tenantId = tenantId;
+ }
+
/** 鐢ㄦ埛鏄惁瀛樺湪姝ゅ矖浣嶆爣璇� 榛樿涓嶅瓨鍦� */
private boolean flag = false;
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysRole.java b/src/main/java/com/ruoyi/project/system/domain/SysRole.java
index 67941af..b6ad698 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysRole.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysRole.java
@@ -4,6 +4,9 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
@@ -64,6 +67,17 @@
/** 瑙掕壊鑿滃崟鏉冮檺 */
private Set<String> permissions;
+ /**绉熸埛id*/
+ private Long tenantId;
+
+ public Long getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(Long tenantId) {
+ this.tenantId = tenantId;
+ }
+
public SysRole()
{
diff --git a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java b/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
index 0b4dae4..b263c14 100644
--- a/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
+++ b/src/main/java/com/ruoyi/project/system/mapper/SysDeptMapper.java
@@ -122,4 +122,6 @@
* @return
*/
Long maxLevelDeptId(Long deptId);
+
+ SysDept selectDeptByDeptName(@Param("deptName") String deptName);
}
diff --git a/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java b/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
index 77eda76..11e6726 100644
--- a/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
+++ b/src/main/java/com/ruoyi/project/system/service/ISysDeptService.java
@@ -20,6 +20,14 @@
public List<SysDept> selectDeptList(SysDept dept);
/**
+ * 鏍规嵁閮ㄩ棬鍚嶇О鏌ヨ閮ㄩ棬淇℃伅
+ *
+ * @param deptName 閮ㄩ棬鍚嶇О
+ * @return 閮ㄩ棬淇℃伅闆嗗悎
+ */
+ public SysDept selectDeptByDeptName(String deptName);
+
+ /**
* 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
*
* @param dept 閮ㄩ棬淇℃伅
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index eae688f..08d97f8 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -42,12 +42,17 @@
* @return 閮ㄩ棬淇℃伅闆嗗悎
*/
@Override
- @DataScope(deptAlias = "d")
+ @DataScope(tenantIdFelid = "d")
public List<SysDept> selectDeptList(SysDept dept)
{
return deptMapper.selectDeptList(dept);
}
-
+
+ @Override
+ public SysDept selectDeptByDeptName(String deptName) {
+ return deptMapper.selectDeptByDeptName(deptName);
+ }
+
/**
* 鏌ヨ閮ㄩ棬鏍戠粨鏋勪俊鎭�
*
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
index 5501e27..2ba2fc5 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysPostServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.project.system.service.impl;
import java.util.List;
+
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.constant.UserConstants;
@@ -32,6 +34,7 @@
* @return 宀椾綅淇℃伅闆嗗悎
*/
@Override
+ @DataScope(tenantIdFelid = "p")
public List<SysPost> selectPostList(SysPost post)
{
return postMapper.selectPostList(post);
diff --git a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
index 1fe2055..9cf549f 100644
--- a/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/system/service/impl/SysRoleServiceImpl.java
@@ -52,7 +52,7 @@
* @return 瑙掕壊鏁版嵁闆嗗悎淇℃伅
*/
@Override
- @DataScope(deptAlias = "d")
+ @DataScope(tenantIdFelid = "r")
public List<SysRole> selectRoleList(SysRole role)
{
return roleMapper.selectRoleList(role);
diff --git a/src/main/java/com/ruoyi/tide/controller/TideController.java b/src/main/java/com/ruoyi/tide/controller/TideController.java
index 695b17d..c4f76a6 100644
--- a/src/main/java/com/ruoyi/tide/controller/TideController.java
+++ b/src/main/java/com/ruoyi/tide/controller/TideController.java
@@ -1,5 +1,6 @@
package com.ruoyi.tide.controller;
+import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.ruoyi.common.constant.Constants;
@@ -7,20 +8,26 @@
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
import com.ruoyi.framework.security.service.SysLoginService;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysDeptService;
import com.ruoyi.project.system.service.ISysUserService;
import com.ruoyi.tide.pojo.TidePojo;
import com.ruoyi.tide.utils.TideUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.PreDestroy;
+import javax.annotation.security.PermitAll;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@@ -36,6 +43,9 @@
@Autowired
private ISysUserService userService;
+
+ @Autowired
+ private ISysDeptService deptService;
@ApiOperation(value = "鐧诲綍")
@PostMapping("/tideLogin")
@@ -57,7 +67,20 @@
String defaultPwd = "I73Kj+Mn$+SI";//榛樿寮�閫氬瘑鐮佸浐瀹氬啓姝�
// String randomString = TideUtils.getRandomString(12);
//璐﹀彿涓嶅瓨鍦紝鎵ц鏂板鎿嶄綔
- if(Objects.isNull(user)){
+ if(ObjectUtils.isEmpty(user)){
+ //1.鍏堟柊澧炵敤鎴峰搴旂殑鍏徃
+ SysDept dept = new SysDept();
+ dept.setParentId(100L);//鐖跺叕鍙竔d
+ dept.setDeptName(tidePojo.getEnterpriseName());
+ dept.setDeptNick(tidePojo.getEnterpriseName());
+ dept.setOrderNum(0);
+ boolean deptNameUnique = deptService.checkDeptNameUnique(dept);
+ if (deptNameUnique){
+ deptService.insertDept(dept);
+ }
+ //鏌ヨ鍏徃
+ SysDept newSysDept = deptService.selectDeptByDeptName(dept.getDeptName());
+ dept.setDeptId(ObjectUtils.isEmpty(newSysDept)?100L:newSysDept.getDeptId());
user = new SysUser();
String password = SecurityUtils.encryptPassword(defaultPwd);
user.setPassword(password);
@@ -67,8 +90,9 @@
user.setDelFlag("0");
user.setPostIds(new Long[]{1L});
user.setRoleId(1L);
- user.setRoleIds(new Long[]{2L});
- user.setDeptIds(new Long[]{100L});
+ user.setRoleIds(new Long[]{2L});//榛樿鏅�氳鑹�
+ user.setDeptIds(new Long[]{dept.getDeptId()});//缁戝畾鍏徃
+ user.setTenantId(dept.getDeptId());
userService.insertUser(user);
}
Map<String, Object> map = new HashMap<>();
diff --git a/src/main/java/com/ruoyi/tide/utils/TideUtils.java b/src/main/java/com/ruoyi/tide/utils/TideUtils.java
index 2d27290..10f84ab 100644
--- a/src/main/java/com/ruoyi/tide/utils/TideUtils.java
+++ b/src/main/java/com/ruoyi/tide/utils/TideUtils.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -21,9 +22,26 @@
@Component
@Slf4j
public class TideUtils {
- private final static String appId = "1205972857687900160";
- private final static String appSecret = "MgzPMDYwMTIwMjYxNzQ2NDA3OTYGqt";
+ public static String APP_ID;
+ public static String APP_SECRET;
+
+
+ @Value("${inspur.appId}")
+ private String appId;
+
+ @Value("${inspur.appSecret}")
+ private String appSecret;
+
+ @Value("${inspur.appId}")
+ public void setAppId(String appId) {
+ TideUtils.APP_ID = appId;
+ }
+
+ @Value("${inspur.appSecret}")
+ public void setAppSecret(String appSecret) {
+ TideUtils.APP_SECRET = appSecret;
+ }
// 鍐呯綉鍦板潃
private final static String ip = "http://10.136.0.8:8083";
@@ -62,14 +80,14 @@
xSignSplicingTogether = "x-random=" + xRandom + "&x-time=" + xTime;
}
// 閰嶇疆鍔犲瘑鏂瑰紡涓庡瘑閽�
- HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, appSecret.getBytes());
+ HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, APP_SECRET.getBytes());
// 寰楀嚭x-sign
String xSign = hMac.digestHex(xSignSplicingTogether);
HashMap<String, String> result = new HashMap<>();
result.put("x-time", xTime);
result.put("x-random", xRandom);
result.put("x-sign", xSign);
- result.put("appKey", appId);
+ result.put("appKey", APP_ID);
return result;
}
@@ -91,13 +109,13 @@
xSignSplicingTogether = "x-random=" + xRandom + "&x-time=" + xTime;
}
// x-sign 鍔犲瘑
- HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, appSecret.getBytes());
+ HMac hMac = new HMac(HmacAlgorithm.HmacSHA256, APP_SECRET.getBytes());
String xSign = hMac.digestHex(xSignSplicingTogether);
HashMap<String, String> result = new HashMap<>();
result.put("x-time", xTime);
result.put("x-random", xRandom);
result.put("x-sign", xSign);
- result.put("appKey", appId);
+ result.put("appKey", APP_ID);
return result;
}
@@ -117,8 +135,8 @@
String url = ip + "/cpn/extral/applicationCode/appAuthCheck";
JSONObject json = new JSONObject();
json.put("code", code);
- json.put("appID", appId);
- json.put("appSecret", appSecret);
+ json.put("appID", APP_ID);
+ json.put("appSecret", APP_SECRET);
HashMap<String, String> header = getPostHeader(json.toString());
String body = HttpRequest.post(url)
.headerMap(header, false)
@@ -132,7 +150,7 @@
public static JSONObject getUserInfo(String token) {
String url = ip + "/cpn/api/extral/applicationCode/getUserInfoByToken";
JSONObject json = new JSONObject();
- json.put("appID", appId);
+ json.put("appID", APP_ID);
HashMap<String, String> header = getPostHeader(json.toString());
header.put("Authorization", token);
String body = HttpRequest.post(url)
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-ccwlxt.yml
similarity index 93%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-ccwlxt.yml
index 0127df1..3579ebf 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-ccwlxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-浠撳偍鐗╂祦绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205971611543404544
+ appSecret: VkyDMDYwMTIwMjYxNzQxNDM2OTItrv
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -62,7 +65,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://127.0.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
# 浠庡簱鏁版嵁婧�
@@ -134,8 +137,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
+# host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-cgglxt.yml
similarity index 97%
rename from src/main/resources/application-tide.yml
rename to src/main/resources/application-cgglxt.yml
index 0127df1..db32737 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-cgglxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-閲囪喘绠＄悊绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205971212673482752
+ appSecret: d9R2MDYwMTIwMjYxNzQwMDg1OTU4Du
ruoyi:
# 鍚嶇О
name: RuoYi
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-cwglxt.yml
similarity index 93%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-cwglxt.yml
index 0127df1..0ceb86a 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-cwglxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-璐㈠姟绠＄悊绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205964626886393856
+ appSecret: 2kxXMDYwMTIwMjYxNzEzNTg0MjE91C
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -62,7 +65,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://127.0.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://10.136.58.65:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
# 浠庡簱鏁版嵁婧�
@@ -141,8 +144,8 @@
# 鏁版嵁搴撶储寮�
database: 0
# 瀵嗙爜
- password: zttZTT123!
-# password: 123456
+# password: zttZTT123!
+ password: 123456
# 杩炴帴瓒呮椂鏃堕棿
timeout: 10s
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-hbmjxt.yml
similarity index 97%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-hbmjxt.yml
index 0127df1..a1fe416 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-hbmjxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-鐜繚闂ㄧ绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205972857687900160
+ appSecret: MgzPMDYwMTIwMjYxNzQ2NDA3OTYGqt
ruoyi:
# 鍚嶇О
name: RuoYi
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-rlzyxt.yml
similarity index 93%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-rlzyxt.yml
index 0127df1..516c35e 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-rlzyxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-浜哄姏璧勬簮绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205972506809204736
+ appSecret: 4g5AMDYwMTIwMjYxNzQ1MTcxNDE35h
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -62,7 +65,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://127.0.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
# 浠庡簱鏁版嵁婧�
@@ -134,8 +137,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
+# host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-sbglxt.yml
similarity index 97%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-sbglxt.yml
index 0127df1..1e2b107 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-sbglxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-璁惧绠＄悊绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205969741508771840
+ appSecret: rnAvMDYwMTIwMjYxNzM0MTc4NDEIxC
ruoyi:
# 鍚嶇О
name: RuoYi
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-scgkxt.yml
similarity index 97%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-scgkxt.yml
index 0127df1..cbec68d 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-scgkxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-鐢熶骇绠℃帶绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205970458172719104
+ appSecret: GFHKMDYwMTIwMjYxNzM3MDg3MDc0g1
ruoyi:
# 鍚嶇О
name: RuoYi
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-xtbgxt.yml
similarity index 97%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-xtbgxt.yml
index 0127df1..ba24749 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-xtbgxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-鍗忓悓鍔炲叕绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205970862683979776
+ appSecret: 9UR1MDYwMTIwMjYxNzM4NDUxNTARkN
ruoyi:
# 鍚嶇О
name: RuoYi
diff --git a/src/main/resources/application-tide.yml b/src/main/resources/application-yxglxt.yml
similarity index 93%
copy from src/main/resources/application-tide.yml
copy to src/main/resources/application-yxglxt.yml
index 0127df1..26564ca 100644
--- a/src/main/resources/application-tide.yml
+++ b/src/main/resources/application-yxglxt.yml
@@ -1,4 +1,7 @@
-# 椤圭洰鐩稿叧閰嶇疆
+# 鑺-钀ラ攢绠＄悊绯荤粺椤圭洰鐩稿叧閰嶇疆
+inspur:
+ appId: 1205972006802030592
+ appSecret: BgpqMDYwMTIwMjYxNzQzMTc5MjkKou
ruoyi:
# 鍚嶇О
name: RuoYi
@@ -62,7 +65,7 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://127.0.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://172.17.0.1:3306/mis-ruoyi?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
password: zttZTT123!
# 浠庡簱鏁版嵁婧�
@@ -134,8 +137,8 @@
# redis 閰嶇疆
redis:
# 鍦板潃
- host: 127.0.0.1
-# host: 172.17.0.1
+# host: 127.0.0.1
+ host: 172.17.0.1
# 绔彛锛岄粯璁や负6379
port: 6379
# 鏁版嵁搴撶储寮�
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9e740c8..e52b416 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,4 +1,13 @@
# Spring閰嶇疆
spring:
profiles:
- active: tide
\ No newline at end of file
+ active: cwglxt
+#10.136.58.65 璐㈠姟绠＄悊绯荤粺 cwglxt
+#10.136.58.66 璁惧绠＄悊绯荤粺 sbglxt
+#10.136.58.67 鐢熶骇绠℃帶绯荤粺 scgkxt
+#10.136.58.68 鍗忓悓鍔炲叕绯荤粺 xtbgxt
+#10.136.58.69 閲囪喘绠＄悊绯荤粺 cgglxt
+#10.136.58.70 浠撳偍鐗╂祦绯荤粺 ccwlxt
+#10.136.58.71 钀ラ攢绠＄悊绯荤粺 yxglxt
+#10.136.58.72 浜哄姏璧勬簮绯荤粺 rlzyxt
+#10.136.58.73 鐜繚闂ㄧ绯荤粺 hbmjxt
\ No newline at end of file
diff --git a/src/main/resources/mapper/system/SysDeptMapper.xml b/src/main/resources/mapper/system/SysDeptMapper.xml
index 5c6310a..afc0a47 100644
--- a/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -99,6 +99,7 @@
<if test="phone != null and phone != ''">phone,</if>
<if test="email != null and email != ''">email,</if>
<if test="deptNick != null and deptNick != ''">dept_nick,</if>
+ <if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="status != null">status,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
@@ -112,6 +113,7 @@
<if test="phone != null and phone != ''">#{phone},</if>
<if test="email != null and email != ''">#{email},</if>
<if test="deptNick != null and deptNick != '' ">#{deptNick},</if>
+ <if test="tenantId != null and tenantId != '' ">#{tenantId},</if>
<if test="status != null">#{status},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
@@ -178,5 +180,10 @@
FROM DepartmentHierarchy
WHERE parent_id = 100;
</select>
+ <select id="selectDeptByDeptName" resultType="com.ruoyi.project.system.domain.SysDept">
+ <include refid="selectDeptVo"/>
+ WHERE d.dept_name = #{deptName}
+ LIMIT 1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mapper/system/SysPostMapper.xml b/src/main/resources/mapper/system/SysPostMapper.xml
index 177f74d..ce16e9f 100644
--- a/src/main/resources/mapper/system/SysPostMapper.xml
+++ b/src/main/resources/mapper/system/SysPostMapper.xml
@@ -19,7 +19,7 @@
<sql id="selectPostVo">
select post_id, post_code, post_name, post_sort, status, create_by, create_time, remark
- from sys_post
+ from sys_post p
</sql>
<select id="selectPostList" parameterType="com.ruoyi.project.system.domain.SysPost" resultMap="SysPostResult">
@@ -34,6 +34,8 @@
<if test="postName != null and postName != ''">
AND post_name like concat('%', #{postName}, '%')
</if>
+ <!-- 鏁版嵁鑼冨洿杩囨护 -->
+ ${params.dataScope}
</where>
</select>
@@ -95,6 +97,7 @@
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
+ <if test="tenantId != null and tenantId != ''">tenant_id,</if>
create_time
)values(
<if test="postId != null and postId != 0">#{postId},</if>
@@ -104,6 +107,7 @@
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
+ <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
sysdate()
)
</insert>
diff --git a/src/main/resources/mapper/system/SysRoleMapper.xml b/src/main/resources/mapper/system/SysRoleMapper.xml
index 92ab684..cf731b5 100644
--- a/src/main/resources/mapper/system/SysRoleMapper.xml
+++ b/src/main/resources/mapper/system/SysRoleMapper.xml
@@ -27,6 +27,7 @@
from sys_role r
left join sys_user_role ur on ur.role_id = r.role_id
left join sys_user u on u.user_id = ur.user_id
+ left join sys_user_dept d on u.user_id = d.user_id
</sql>
<select id="selectRoleList" parameterType="com.ruoyi.project.system.domain.SysRole" resultMap="SysRoleResult">
@@ -103,6 +104,7 @@
<if test="deptCheckStrictly != null">dept_check_strictly,</if>
<if test="status != null and status != ''">status,</if>
<if test="remark != null and remark != ''">remark,</if>
+ <if test="tenantId != null and tenantId != ''">tenant_id,</if>
<if test="createBy != null and createBy != ''">create_by,</if>
create_time
)values(
@@ -115,6 +117,7 @@
<if test="deptCheckStrictly != null">#{deptCheckStrictly},</if>
<if test="status != null and status != ''">#{status},</if>
<if test="remark != null and remark != ''">#{remark},</if>
+ <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
<if test="createBy != null and createBy != ''">#{createBy},</if>
sysdate()
)
diff --git a/src/main/resources/mybatis/mybatis-config.xml b/src/main/resources/mybatis/mybatis-config.xml
index ee4d2a1..ec5fa1a 100644
--- a/src/main/resources/mybatis/mybatis-config.xml
+++ b/src/main/resources/mybatis/mybatis-config.xml
@@ -12,8 +12,8 @@
<!-- 閰嶇疆榛樿鐨勬墽琛屽櫒.SIMPLE灏辨槸鏅�氭墽琛屽櫒;REUSE鎵ц鍣ㄤ細閲嶇敤棰勫鐞嗚鍙�(prepared statements);BATCH鎵ц鍣ㄥ皢閲嶇敤璇彞骞舵墽琛屾壒閲忔洿鏂� -->
<setting name="defaultExecutorType" value="SIMPLE" />
<!-- 鎸囧畾 MyBatis 鎵�鐢ㄦ棩蹇楃殑鍏蜂綋瀹炵幇 -->
- <setting name="logImpl" value="SLF4J" />
-<!-- <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />-->
+<!-- <setting name="logImpl" value="SLF4J" />-->
+ <setting name="logImpl" value="org.apache.ibatis.logging.stdout.StdOutImpl" />
<!-- 浣跨敤椹煎嘲鍛藉悕娉曡浆鎹㈠瓧娈� -->
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
</settings>
--
Gitblit v1.9.3