修改代码冲突

eladmin-logging/src/main/java/me/zhengjie/aspect/LogRequestParam.java

@@ -85,7 +85,7 @@ public class LogRequestParam {
 				if (value instanceof String) {
 					String str = (String) value;
 					if (str.length() > 1000) {
-						//去掉特别长的参数，保留1000个值
+						// 去掉特别长的参数
 						value = str.substring(0, 1000);
 					}
 				}
@@ -93,10 +93,11 @@ public class LogRequestParam {
 				params.put(param, value);
 			}
 			String json = JSON.toJSONString(params, SerializerFeature.WriteMapNullValue);
-
+			// 请求方法
+			String method = request.getMethod();
 			// 这里判断
-			Object[] obj = { ip, uri, json };
-			log.info("[request] - ip: {} , requestUrl: {} ,param: {} ", obj);
+			Object[] obj = { ip,method, uri, json };
+			log.info("[request] - ip: {} , method: {} , requestUrl: {} , param: {} ", obj);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
@@ -121,8 +122,9 @@ public class LogRequestParam {
 			// 打印输出的值
 			if (StringUtils.isNotBlank(json) && json.length() < 1500) {
 				String uri = request.getRequestURI();
-				Object obj[] = { status, uri, json };
-				log.info("[reponse] - status: {} , url:{} ,result:{}", obj);
+				String method = request.getMethod();
+				Object obj[] = { status,method, uri, json };
+				log.info("[reponse] - status: {} ,method:{}, url:{} ,result:{}", obj);
 			}
 
 		} catch (Exception e) {

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -164,7 +164,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 		SysUserEntity user = userDao.selectById(contextUtil.getCurrentUserId());
 		String maxRole = userDomain.getUserMaxRole();
 		if ("超级管理员".equals(maxRole)) {
-		} else if ("公证处管理员".equals(maxRole)) {
+		} else if ("公证处管理员".equals(maxRole) || "公证书签发".equals(maxRole)) {
 			qw.eq("notary_office_id", user.getOrgId().split("_")[1]);
 		} else if ("公证员".equals(maxRole)) {
 			qw.eq("notary_office_id", user.getOrgId().split("_")[1]);

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/SmsTemplateServiceImpl.java

@@ -8,6 +8,11 @@ import java.util.Set;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.ParameterizedTypeReference;
+
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -183,7 +188,7 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 	public void remindSignNotarialCertificate(String businessNo) {
 		// 保存发送短信
 		// 查询发送的短信，如果发送过了就不发送
-		//发送短信
+		// 发送短信
 		QueryWrapper<SmsSendLogEntity> log = new QueryWrapper<>();
 		log.eq("business_no", businessNo);
 		log.eq("order_type", 5);
@@ -236,7 +241,12 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 		log.setUpdateTime(LocalDateTime.now());
 		log.setReturnContent(result);
 		log.setOrderType(orderType);
-		sendLogMapper.insert(log);
+		try {
+			sendLogMapper.insert(log);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 
 	/**
@@ -274,6 +284,11 @@ public class SmsTemplateServiceImpl extends AbstractServiceImpl<ISmsTemplateDao,
 		log.setUpdateTime(LocalDateTime.now());
 		log.setReturnContent(result);
 		log.setOrderType(orderType);
-		sendLogMapper.insert(log);
+		try {
+			sendLogMapper.insert(log);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+
 	}
 }

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/User.java

@@ -150,7 +150,10 @@ public class User extends BaseEntity implements Serializable {
 	 * @return
 	 */
 	public String getUserType() {
-		return orgId.split("_")[0];
+		if (StringUtils.isNotBlank(orgId) && orgId.contains(",")) {
+			return orgId.split("_")[0];
+		}
+		return "";
 	}
 
 	/**
@@ -160,7 +163,7 @@ public class User extends BaseEntity implements Serializable {
 	 */
 	public String getComId() {
 		// 增加非空判断
-		if (StringUtils.isNotBlank(orgId) && orgId.contains("_")) {
+		if (StringUtils.isNotBlank(orgId) && orgId.contains(",")) {
 			return orgId.split("_")[1];
 		}
 		return "";

eladmin-system/src/main/java/me/zhengjie/domain/user/impl/UserDomainImpl.java

@@ -49,7 +49,10 @@ public class UserDomainImpl implements UserDomain {
             roleName = "客户经理";
         } else if (roleNameSet.contains("银行客户经理")) {
             roleName = "客户经理";
+        }else if (roleNameSet.contains("公证书签发")) {
+            roleName = "公证书签发";
         }
+        
         return roleName;
     }
 }

eladmin-system/src/main/resources/config/application-nt-test.yml

@@ -1,11 +1,19 @@
 #配置数据源
 server:
+<<<<<<< HEAD
   port: 8007
+=======
+  port: 8001
+>>>>>>> feature-2022.10.09
 spring:
   mvc:
     static-path-pattern: /image/**
   resources:
+<<<<<<< HEAD
     static-locations: file:/image/,file:/image/
+=======
+    static-locations: file:/nt/,file:/nt/
+>>>>>>> feature-2022.10.09
   datasource:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
@@ -56,7 +64,11 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
+<<<<<<< HEAD
     database: 0
+=======
+    database: 1
+>>>>>>> feature-2022.10.09
     host: 114.55.230.80
     port: 6379
     password: 123qysd!@#
@@ -156,6 +168,7 @@ app:
   background:
     picture: https://fqgz.flowbb.cn/image/logo/83d9449f4e02459da1661bafdf08b86a_8.png
   image:
+<<<<<<< HEAD
     url: https://fqgz.flowbb.cn/image/
   upload:
     path: /image/
@@ -163,6 +176,15 @@ app:
     domain: https://fqgz.flowbb.cn/
   push:
     port: 8090
+=======
+    url: https://fqgz.flowbb.cn:10001/image/
+  upload:
+    path: /image/
+  host:
+    domain: https://fqgz.flowbb.cn:10001/
+  push:
+    port: 8081
+>>>>>>> feature-2022.10.09
   minio:
     accesskey: minioadmin
     secretkey: minioadmin
@@ -188,10 +210,17 @@ xxl:
     admin:
       addresses: http://114.55.230.80:8080/xxl-job-admin
     executor:
+<<<<<<< HEAD
       appname: eladmin-xxl-job-executor
       address:
       ip:
       port: 9998
+=======
+      appname: nt-xxl-job-executor
+      address:
+      ip:
+      port: 9991
+>>>>>>> feature-2022.10.09
       logpath: /users/songxiaodong/applogs/xxl-job/jobhandler
       logretentiondays: 30