快速构建，增加部门机构、角色填写、删除、数据权限

src/main/java/org/springblade/bank/autodata/controller/AutoDataController.java

@@ -23,10 +23,15 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.bank.autostruct.entity.AutoStruct;
+import org.springblade.bank.autostruct.service.IAutoStructService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -49,6 +54,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class AutoDataController extends BladeController {
 
 	private final IAutoDataService autoDataService;
+	private final IAutoStructService autoStructService;
 
 	/**
 	 * 详情
@@ -80,6 +86,21 @@ public class AutoDataController extends BladeController {
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入autoData")
 	public R<IPage<AutoDataVO>> page(AutoDataVO autoData, Query query) {
+		BladeUser user = AuthUtil.getUser();
+		//當前部門id
+		autoData.setCurrentDeptId(AuthUtil.getDeptId());
+
+		Assert.isTrue(autoData.getTableId() != null, "表ID不能為空！");
+		AutoStruct autoStruct = autoStructService.getById(autoData.getTableId());
+		//多個角色問題
+		String[] userRoles = user.getRoleId().split(",");
+		boolean isManageRole = false;
+		for (int i = 0; i < userRoles.length; i++) {
+			String roleId = userRoles[i];
+			isManageRole = isManageRole || autoStruct.getManageRoleId().contains(roleId);
+		}
+		//是否管理員角色
+		autoData.setIsManageRole(isManageRole);
 		IPage<AutoDataVO> pages = autoDataService.selectAutoDataPage(Condition.getPage(query), autoData);
 		return R.data(pages);
 	}

src/main/java/org/springblade/bank/autodata/mapper/AutoDataMapper.java

@@ -16,10 +16,11 @@
  */
 package org.springblade.bank.autodata.mapper;
 
-import org.springblade.bank.autodata.entity.AutoData;
-import org.springblade.bank.autodata.vo.AutoDataVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.bank.autodata.entity.AutoData;
+import org.springblade.bank.autodata.vo.AutoDataVO;
+
 import java.util.List;
 
 /**
@@ -37,6 +38,8 @@ public interface AutoDataMapper extends BaseMapper<AutoData> {
 	 * @param autoData
 	 * @return
 	 */
+
+//	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
 	List<AutoDataVO> selectAutoDataPage(IPage page, AutoDataVO autoData);
 
 }

src/main/java/org/springblade/bank/autodata/mapper/AutoDataMapper.xml

@@ -47,24 +47,30 @@
 
 
     <select id="selectAutoDataPage" resultMap="autoDataResultMap">
-        select * from zh_auto_data where is_deleted = 0 and table_id = #{autoData.tableId}
+        select td.* from zh_auto_data td
+        where td.is_deleted = 0 and td.table_id = #{autoData.tableId}
+
         <if test="autoData!=null">
+            <if test="autoData.isManageRole != true">
+                and td.create_dept = '${autoData.currentDeptId}'
+            </if>
             <if test="autoData.params1!=null">
-                AND params1 like '${autoData.params1}%'
+                AND td.params1 like '${autoData.params1}%'
             </if>
             <if test="autoData.params2!=null">
-                AND params2 like '${autoData.params2}%'
+                AND td.params2 like '${autoData.params2}%'
             </if>
             <if test="autoData.params3!=null">
-                AND params3 like '${autoData.params3}%'
+                AND td.params3 like '${autoData.params3}%'
             </if>
             <if test="autoData.params4!=null">
-                AND params4 like '${autoData.params4}%'
+                AND td.params4 like '${autoData.params4}%'
             </if>
             <if test="autoData.params5!=null">
-                AND params5 like '${autoData.params5}%'
+                AND td.params5 like '${autoData.params5}%'
             </if>
         </if>
+        ORDER BY td.create_time DESC
     </select>
 
 </mapper>

src/main/java/org/springblade/bank/autodata/vo/AutoDataVO.java

@@ -33,4 +33,7 @@ import io.swagger.annotations.ApiModel;
 public class AutoDataVO extends AutoData {
 	private static final long serialVersionUID = 1L;
 
+	private String currentDeptId;
+	private Boolean isManageRole;
+
 }

src/main/java/org/springblade/bank/autostruct/controller/AutoStructController.java

@@ -16,25 +16,34 @@
  */
 package org.springblade.bank.autostruct.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
-import javax.validation.Valid;
-
+import org.springblade.bank.autostruct.entity.AutoStruct;
+import org.springblade.bank.autostruct.service.IAutoStructService;
+import org.springblade.bank.autostruct.vo.AutoStructVO;
+import org.springblade.bank.autostruct.wrapper.AutoStructWrapper;
+import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.modules.system.service.IDeptService;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestParam;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.bank.autostruct.entity.AutoStruct;
-import org.springblade.bank.autostruct.vo.AutoStructVO;
-import org.springblade.bank.autostruct.wrapper.AutoStructWrapper;
-import org.springblade.bank.autostruct.service.IAutoStructService;
-import org.springblade.core.boot.ctrl.BladeController;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  *  控制器
@@ -49,6 +58,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class AutoStructController extends BladeController {
 
 	private final IAutoStructService autoStructService;
+	private final IDeptService deptService;
 
 	/**
 	 * 详情
@@ -62,19 +72,68 @@ public class AutoStructController extends BladeController {
 	}
 
 	/**
-	 * 分页 
+	 * 分页
 	 */
 	@GetMapping("/list")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入autoStruct")
 	public R<IPage<AutoStructVO>> list(AutoStruct autoStruct, Query query) {
-		IPage<AutoStruct> pages = autoStructService.page(Condition.getPage(query), Condition.getQueryWrapper(autoStruct));
+		QueryWrapper<AutoStruct> queryWrapper = Condition.getQueryWrapper(new AutoStruct());
+		if (StringUtil.isNotBlank(autoStruct.getName())){
+			queryWrapper.lambda().like(AutoStruct::getName, autoStruct.getName());
+		}
+		IPage<AutoStruct> pages = autoStructService.page(Condition.getPage(query), queryWrapper);
 		return R.data(AutoStructWrapper.build().pageVO(pages));
 	}
 
 
 	/**
-	 * 自定义分页 
+	 *
+	 */
+	@GetMapping("/getSelectAndPermissionByDept")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入autoStruct")
+	public R getSelectAndPermissionByDept() {
+		List<Map> mapList = new ArrayList<>();
+		List<AutoStruct> list = autoStructService.list(new QueryWrapper<>(new AutoStruct()).lambda().like(AutoStruct::getDeptId, AuthUtil.getDeptId()));
+		BladeUser user = AuthUtil.getUser();
+		String userDeptId = AuthUtil.getDeptId();
+		//多個角色問題
+		String[] userRoles = user.getRoleId().split(",");
+
+		list.forEach(item -> {
+			Map<String, Object> map = new HashMap<>();
+			Map<String, Object> map1 = BeanUtil.toMap(item);
+			Map<String, Object> map2 = new HashMap<>();
+//			map.put("tableStruct", item);
+			String tableDeptIds = item.getDeptId();
+			String tableRoleIds = item.getRoleId();
+			boolean canWrite = tableDeptIds.contains(userDeptId);
+			boolean roleFlag = false;
+
+			boolean isManageRole = false;
+			for (int i = 0; i < userRoles.length; i++) {
+				String roleId = userRoles[i];
+				isManageRole = isManageRole || item.getManageRoleId().contains(roleId);
+				if (StringUtil.isNotBlank(tableRoleIds)){
+					roleFlag = roleFlag && tableRoleIds.contains(roleId);
+				}
+			}
+			if (StringUtil.isNotBlank(tableRoleIds)){
+				canWrite = canWrite && roleFlag;
+			}
+			map2.put("isManageRole", isManageRole);
+			map2.put("canWrite", canWrite);
+			map.putAll(map1);
+			map.putAll(map2);
+			mapList.add(map);
+		});
+		return R.data(mapList);
+	}
+
+
+	/**
+	 * 自定义分页
 	 */
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
@@ -85,7 +144,7 @@ public class AutoStructController extends BladeController {
 	}
 
 	/**
-	 * 新增 
+	 * 新增
 	 */
 	@PostMapping("/save")
 	@ApiOperationSupport(order = 4)
@@ -95,7 +154,7 @@ public class AutoStructController extends BladeController {
 	}
 
 	/**
-	 * 修改 
+	 * 修改
 	 */
 	@PostMapping("/update")
 	@ApiOperationSupport(order = 5)
@@ -105,7 +164,7 @@ public class AutoStructController extends BladeController {
 	}
 
 	/**
-	 * 新增或修改 
+	 * 新增或修改
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 6)
@@ -114,9 +173,9 @@ public class AutoStructController extends BladeController {
 		return R.status(autoStructService.saveOrUpdate(autoStruct));
 	}
 
-	
+
 	/**
-	 * 删除 
+	 * 删除
 	 */
 	@PostMapping("/remove")
 	@ApiOperationSupport(order = 7)
@@ -125,5 +184,5 @@ public class AutoStructController extends BladeController {
 		return R.status(autoStructService.deleteLogic(Func.toLongList(ids)));
 	}
 
-	
+
 }

src/main/java/org/springblade/bank/autostruct/entity/AutoStruct.java

@@ -48,5 +48,20 @@ public class AutoStruct extends BaseEntity {
 		@ApiModelProperty(value = "列结构")
 		private String columns;
 
+	/**
+	 * 填寫部門
+	 */
+		@ApiModelProperty(value = "填寫部門")
+		private String deptId;
+	/**
+	 * 填寫角色
+	 */
+		@ApiModelProperty(value = "填寫角色")
+		private String roleId;
+	/**
+	 * 管理員角色
+	 */
+		@ApiModelProperty(value = "管理員角色")
+		private String manageRoleId;
 
 }

src/main/java/org/springblade/bank/autostruct/mapper/AutoStructMapper.xml

@@ -14,6 +14,9 @@
         <result column="is_deleted" property="isDeleted"/>
         <result column="name" property="name"/>
         <result column="columns" property="columns"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="role_id" property="roleId"/>
+        <result column="manage_role_id" property="manageRoleId"/>
     </resultMap>
 
 

src/main/java/org/springblade/bank/autostruct/vo/AutoStructVO.java

@@ -33,4 +33,6 @@ import io.swagger.annotations.ApiModel;
 public class AutoStructVO extends AutoStruct {
 	private static final long serialVersionUID = 1L;
 
+	private String deptName;
+	private String roleName;
 }

src/main/java/org/springblade/bank/autostruct/wrapper/AutoStructWrapper.java

@@ -16,10 +16,14 @@
  */
 package org.springblade.bank.autostruct.wrapper;
 
+import org.springblade.common.cache.SysCache;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.bank.autostruct.entity.AutoStruct;
 import org.springblade.bank.autostruct.vo.AutoStructVO;
+import org.springblade.core.tool.utils.StringUtil;
+
+import java.util.List;
 import java.util.Objects;
 
 /**
@@ -43,6 +47,11 @@ public class AutoStructWrapper extends BaseEntityWrapper<AutoStruct, AutoStructV
 		//autoStructVO.setCreateUserName(createUser.getName());
 		//autoStructVO.setUpdateUserName(updateUser.getName());
 
+		List<String> deptNames = SysCache.getDeptNames(autoStruct.getDeptId());
+		List<String> roleNames = SysCache.getDeptNames(autoStruct.getRoleId());
+		autoStructVO.setDeptName(StringUtil.join(deptNames, "|"));
+		autoStructVO.setRoleName(StringUtil.join(roleNames, "|"));
+
 		return autoStructVO;
 	}
 

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -275,7 +275,7 @@ public class KeyPwdController extends BladeController {
 
 		KeyPwd old = null;
 		if (isAdd){
-			keyPwd.setFillingPerson(currentUser.getNickName());
+			keyPwd.setFillingPerson(user.getName());
 			keyPwd.setFillingDate(DateUtil.now());
 		}else{
 			old = keyPwdService.getById(keyPwd.getId());

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -355,7 +355,7 @@ public class SealHandoverController extends BladeController {
 		SealHandover old = null;
 		if (isAdd){
 			sealHandover.setProcess(2);
-			sealHandover.setFillingPerson(currentUser.getNickName());
+			sealHandover.setFillingPerson(user.getName());
 			sealHandover.setFillingDate(DateUtil.now());
 
 			//判断该机构下此印章是否有待确认记录

src/main/java/org/springblade/bank/tellertrunk/controller/TellerTrunkController.java

@@ -145,7 +145,7 @@ public class TellerTrunkController extends BladeController {
 
 		TellerTrunk old = null;
 		if (isAdd){
-			tellerTrunk.setFillingPerson(currentUser.getNickName());
+			tellerTrunk.setFillingPerson(user.getName());
 			tellerTrunk.setFillingDate(DateUtil.now());
 		}else{
 			old = tellerTrunkService.getById(tellerTrunk.getId());

src/main/java/org/springblade/bank/warehouse/controller/CheckWarehouseController.java

@@ -145,7 +145,7 @@ public class CheckWarehouseController extends BladeController {
 
 		CheckWarehouse old = null;
 		if (isAdd){
-			checkWarehouse.setFillingPerson(currentUser.getNickName());
+			checkWarehouse.setFillingPerson(user.getName());
 			checkWarehouse.setFillingDate(DateUtil.now());
 		}else{
 			old = checkWarehouseService.getById(checkWarehouse.getId());

src/main/java/org/springblade/common/utils/CommonUtil.java

@@ -83,6 +83,19 @@ public class CommonUtil {
 		return weekDays[w] == 5;
 	}
 
+	/**
+	 * 判断日期是否为周五
+	 * @param theDay
+	 * @return
+	 */
+	public static boolean isWeekend(String theDay){
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(DateUtil.parse(theDay, pattern));
+		int w = cal.get(Calendar.DAY_OF_WEEK) - 1; // 指示一个星期中的某天。
+		int[] weekDays = { 7, 1, 2, 3, 4, 5, 6 };
+		return weekDays[w] == 6 || weekDays[w] == 7;
+	}
+
 	/**
 	 * 根据传入时间，算出这周开始日期和结束日期
 	 * @param theDay

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -297,6 +297,8 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 			List<String> userEhrs = users.stream().map(user -> user.getEhr()).collect(Collectors.toList());
 			notice.setTargetIds(StringUtil.join(userIds));
 			notice.setTargetEhrs(StringUtil.join(userEhrs, "|"));
+
+			notice.setRoleId(StringUtil.join(roleIds));
 		}else{
 			User createUser = userService.getById(postChange.getCreateUser());
 			title += createUser.getName() + "已提交網點出納主管及專管員崗位變更記錄表，請登陸系統查詢";

src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -46,6 +46,7 @@ import org.springblade.modules.auth.ldap.service.LdapService;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.excel.UserImporter;
+import org.springblade.modules.system.service.IDeptService;
 import org.springblade.modules.system.service.IUserService;
 import org.springblade.modules.system.vo.UserVO;
 import org.springblade.modules.system.wrapper.UserWrapper;
@@ -75,6 +76,7 @@ import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
 public class UserController {
 
 	private final IUserService userService;
+	private final IDeptService deptService;
 	@Autowired
 	private LdapService ldapService;
 
@@ -240,6 +242,21 @@ public class UserController {
 		List<User> list = userService.list((!AuthUtil.isAdministrator()) ? queryWrapper.lambda().eq(User::getTenantId, bladeUser.getTenantId()) : queryWrapper);
 		return R.data(list);
 	}
+	/**
+	 * 用户列表
+	 */
+	@GetMapping("/list-dept-child")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "用户列表", notes = "传入user")
+	public R<List<User>> listDeptChild() {
+		List<Long> deptChildIds = deptService.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+		List<String> deptList = new ArrayList<>();
+		for(Long deptId : deptChildIds) {
+			deptList.add(deptId+"");
+		}
+		List<User> list = userService.getUsersByDeptIdsRoleIds(deptList, null);
+		return R.data(list);
+	}
 
 	/**
 	 * 导入用户

src/main/java/org/springblade/modules/system/entity/Dept.java

@@ -92,7 +92,7 @@ public class Dept implements Serializable {
 	private String ancestors;
 
 	/**
-	 * 机构类型
+	 * 机构类型 （1: 管理部門，2：非管理部門）
 	 */
 	@ApiModelProperty(value = "机构类型")
 	private Integer deptCategory;

src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -50,6 +50,9 @@
         <if test="user.ehr!=null and user.ehr != ''">
             and ehr = #{user.ehr}
         </if>
+        <if test="user.isLdapuser!=null">
+            and is_ldapuser = #{user.isLdapuser}
+        </if>
         <if test="user.roleId!=null and user.roleId != ''">
             and role_id like '%${user.roleId}%'
         </if>

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -606,14 +606,20 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public List<User> getUsersByDeptIdsRoleIds(List<String> deptIds, List<String> roleIds) {
-
+		Assert.isTrue(!((deptIds == null || deptIds.size() == 0 ) && (roleIds == null || roleIds.size() == 0)), "所屬部門和所屬角色不能同時為空！");
 		List<User> list = baseMapper.getUsersByDeptIdsRoleIds(deptIds, roleIds);
 		if (roleIds != null){
 			roleIds.forEach(ids -> {
 				List<User> usersByRoleId = getUsersByRoleId(ids);
 				usersByRoleId.forEach(item -> {
-					if (!isUserInList(item.getId(), list) && deptIds != null && deptIds.contains(item.getDeptId())){
-						list.add(item);
+					if (deptIds != null ){
+						if (!isUserInList(item.getId(), list) && deptIds.contains(item.getDeptId())){
+							list.add(item);
+						}
+					}else{
+						if (!isUserInList(item.getId(), list)){
+							list.add(item);
+						}
 					}
 				});
 			});
@@ -640,7 +646,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		List<Long> longs = Func.toLongList(targetIds);
 		longs.forEach(id -> {
 			User user = getById(id);
-			list.add(user);
+			if (user != null){
+				list.add(user);
+			}
 		});
 		return list;
 	}

src/main/java/org/springblade/modules/timer/TimeTask.java

@@ -37,8 +37,10 @@ public class TimeTask extends BladeController {
 	private void configureTasks() {
 		System.err.println("执行静态定时任务时间: " + DateUtil.format(DateUtil.now(), "yyyy-MM-dd HH:mm:ss"));
 
-		//1、每天
-		dayTask();
+		//1、每天 （排除週六日，週末）
+		if (!CommonUtil.isWeekend(DateUtil.format(DateUtil.now(), CommonUtil.pattern))){
+			dayTask();
+		}
 
 		//2、每周
 		if (CommonUtil.isWeekLastDay(DateUtil.format(DateUtil.now(), CommonUtil.pattern))){

src/main/resources/application-prod.yml

@@ -15,7 +15,7 @@ spring:
     #  commandTimeout: 5000
   datasource:
 #    url: jdbc:mysql://22.237.192.144:3306/macao_zh_sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
-    url: jdbc:mysql://22.237.160.39:3306/macao_zh_sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://22.236.178.185:3306/macao_zh_sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
     password:
 
@@ -56,4 +56,4 @@ oss:
 
 hangxin:
   url: http://22.237.189.107:9001
-  sysid: "000017"
+  sysid: "000004"

src/main/resources/application-test.yml

@@ -14,9 +14,16 @@ spring:
     #  nodes: 127.0.0.1:7001,127.0.0.1:7002,127.0.0.1:7003
     #  commandTimeout: 5000
   datasource:
-    url: jdbc:mysql://localhost:3306/bladex_boot?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    #    url: jdbc:mysql://22.237.192.144:3306/macao_zh_sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://22.237.160.39:3306/macao_zh_sys?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true
     username: root
-    password: root
+    password:
+
+  ldap:
+    urls: ldap://22.236.1.35:389
+    base: DC=mo,DC=ad,DC=boc-ap,DC=com
+    username: mosormadm01
+    password: Admin1089
 
 #第三方登陆
 social:
@@ -38,3 +45,15 @@ blade:
     remote-mode: true
     upload-domain: http://localhost:8999
     remote-path: /usr/share/nginx/html
+
+oss:
+  enabled: true
+  name: minio
+  tenant-mode: false
+  endpoint: http://192.168.2.9:90
+  access-key: D99KGE6ZTQXSATTJWU24
+  secret-key: QyVqGnhIQQE734UYSUFlGOZViE6+ZlDEfUG3NjhJ
+
+hangxin:
+  url: http://22.237.189.107:9001
+  sysid: "000017"