1.修改配置

2.sys_dept   字段merch_sn  写死 mhbs764449385500180480

eccs-admin/src/main/resources/application-prod.yml

@@ -8,13 +8,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 120.78.152.8
+    host: 8.135.102.238
     # 端口，默认为6379
-    port: 7379
+    port: 6379
     # 数据库索引
     database: 0
     # 密码
-    password: Abc-123#*.-
+    password:
     # 连接超时时间
     timeout: 10s
     lettuce:
@@ -33,16 +33,16 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: tuser
-        password: Qq!123
+        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: eccs_cw
+        password: 2KYkenCFH8
       # 从库数据源
       slave:
         # 从数据源开关/默认关闭
         enabled: false
-        url: jdbc:mysql://120.76.84.45:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: tuser
-        password: Qq!123
+        url: jdbc:mysql://out-rm-wz92efl25x02n44xego.mysql.rds.aliyuncs.com:3306/eccs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: eccs_cw
+        password: 2KYkenCFH8
       # 初始连接数
       initialSize: 5
       # 最小连接池数量
@@ -97,7 +97,7 @@ swagger:
   # 是否开启swagger
   enabled: false
   # 请求前缀
-  pathMapping: /dev-api
+  pathMapping: /prod-api
 
 # 日志配置
 logging:
@@ -105,4 +105,4 @@ logging:
     com.emato: info
     org.springframework: warn
   file:
-    path: /data/eccs/logs
+    path: /data/project/logs

eccs-admin/src/main/resources/application.yml

@@ -9,7 +9,7 @@ cadmin:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: ~/uploadFile
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
@@ -37,7 +37,7 @@ spring:
     # 国际化资源文件路径
     basename: i18n/messages
   profiles: 
-    active: test
+    active: prod
   # 文件上传
   servlet:
      multipart:

eccs-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/data/eccs/logs" />
+	<property name="log.path" value="/app/project/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -14,11 +14,11 @@
 	
 	<!-- 系统日志输出 -->
 	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-info.log</file>
+	    <file>${log.path}/eccs-sys-info.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<fileNamePattern>${log.path}/eccs-sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
 		</rollingPolicy>
@@ -36,11 +36,11 @@
 	</appender>
 	
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-	    <file>${log.path}/sys-error.log</file>
+	    <file>${log.path}/eccs-sys-error.log</file>
         <!-- 循环政策：基于时间创建日志文件 -->
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/eccs-sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
 			<!-- 日志最大的历史 60天 -->
 			<maxHistory>60</maxHistory>
         </rollingPolicy>
@@ -59,10 +59,10 @@
 
 	<!-- 用户访问日志输出  -->
     <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${log.path}/sys-user.log</file>
+		<file>${log.path}/eccs-sys-user.log</file>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
             <!-- 按天回滚 daily -->
-            <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
+            <fileNamePattern>${log.path}/eccs-sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
             <!-- 日志最大的历史 60天 -->
             <maxHistory>60</maxHistory>
         </rollingPolicy>
@@ -74,7 +74,7 @@
 	<!-- 系统模块日志级别控制  -->
 	<logger name="com.emato" level="info" />
 	<!-- Spring日志级别控制  -->
-	<logger name="org.springframework" level="warn" />
+	<logger name="org.springframework" level="info" />
 
 	<root level="info">
 		<appender-ref ref="console" />

eccs-system/src/main/java/com/emato/system/service/impl/SysDeptServiceImpl.java

@@ -185,6 +185,8 @@ public class SysDeptServiceImpl implements ISysDeptService
         {
             throw new CustomException("部门停用，不允许新增");
         }
+        //TODO 后面动态添加 cw，sys_dept   字段merch_sn  写死 mhbs764449385500180480
+        dept.setMerchSn("mhbs764449385500180480");
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         return deptMapper.insertDept(dept);
     }

eccs-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -96,6 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">email,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+ 			<if test="merchSn != null and merchSn != ''">merch_sn,</if>
  			create_time
  		)values(
  			<if test="deptId != null and deptId != 0">#{deptId},</if>
@@ -108,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="email != null and email != ''">#{email},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+			<if test="merchSn != null and merchSn != ''">#{merchSn},</if>
  			sysdate()
  		)
 	</insert>