Merge remote-tracking branch 'origin/master'

cms/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-auth/mec-auth-server/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/EmployeeDao.java

@@ -65,4 +65,11 @@ public interface EmployeeDao extends BaseDAO<Integer, Employee> {
      * @param roleIds
      */
     void batchAddEmployeeRole(@Param("userId") Integer id, @Param("roleIds")List<Integer> roleIds);
+
+    /**
+     * 获取用户权限列表
+     * @param userId
+     * @return
+     */
+    List<Integer> queryUserRole(Integer userId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupDao.java

@@ -147,4 +147,11 @@ public interface MusicGroupDao extends BaseDAO<String, MusicGroup> {
      * @return
      */
     Set<Integer> queryUserIdByRoleId(@Param("roleIds") Set<Integer> roleIds);
+
+    /**
+     * 获取教务老师时当前用户的乐团
+     * @param userIds
+     * @return
+     */
+    String queryEducationalMusicGroupId(Integer userIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageCourseListDto.java

@@ -38,6 +38,17 @@ public class StudentManageCourseListDto {
     @ApiModelProperty(value = "当前课时",required = false)
     private Integer currentCLassTimes;
 
+    @ApiModelProperty(value = "总课时",required = false)
+    private Integer totalClassTimes;
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
     public Integer getCurrentCLassTimes() {
         return currentCLassTimes;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/TeacherAttendance.java

@@ -78,6 +78,11 @@ public class TeacherAttendance {
 		this.courseScheduleId = courseScheduleId;
 	}
 
+	public TeacherAttendance(Long courseScheduleId, Integer status) {
+		this.courseScheduleId = courseScheduleId;
+		this.status = status;
+	}
+
 	public Integer getCurrentClassTimes() {
 		return currentClassTimes;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/SalarySettlementTypeEnum.java

@@ -11,8 +11,7 @@ public enum SalarySettlementTypeEnum implements BaseEnum<String,SalarySettlement
     TEACHER_DEFAULT("TEACHER_DEFAULT","老师默认课酬"),
     RATIO_DISCOUNT("RATIO_DISCOUNT","课程单价比例折扣"),
     FIXED_SALARY("FIXED_SALARY","固定课酬"),
-    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬"),
-    CLASSROOM_SALARY("CLASSROOM_SALARY","课堂课课酬");
+    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬");
 
     private String code;
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -12,7 +12,6 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -97,12 +96,12 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 courseScheduleTeacherSalary.setClassGroupId(courseSchedules.get(i).getClassGroupId());
                 courseScheduleTeacherSalary.setSubsidy(school.getSubsidy());
 
-                Map<String, BigDecimal> feeInfo = vipGroupService.countVipGroupPredictFee(vipGroup,
-                        courseSchedules.get(i).getActualTeacherId().intValue(),
-                        onlineTeacherSalary,
-                        offlineTeacherSalary,
-                        false,
-                        false);
+//                Map<String, BigDecimal> feeInfo = vipGroupService.countVipGroupPredictFee(vipGroup,
+//                        courseSchedules.get(i).getActualTeacherId().intValue(),
+//                        onlineTeacherSalary,
+//                        offlineTeacherSalary,
+//                        false,
+//                        true);
 
                 if (vipGroupActivity.getType() == VipGroupActivityTypeEnum.GIVE_CLASS
                         && vipGroup.getGiveTeachMode() == teachModeEnum
@@ -111,9 +110,11 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                     courseScheduleTeacherSalary.setExpectSalary(new BigDecimal(0));
                 } else {
                     if (teachModeEnum == TeachModeEnum.ONLINE) {
-                        courseScheduleTeacherSalary.setExpectSalary(feeInfo.get("onlineTeacherSalary"));
+                        courseScheduleTeacherSalary.setExpectSalary(onlineTeacherSalary);
+//                        courseScheduleTeacherSalary.setExpectSalary(feeInfo.get("onlineTeacherSalary"));
                     } else {
-                        courseScheduleTeacherSalary.setExpectSalary(feeInfo.get("offlineTeacherSalary"));
+                        courseScheduleTeacherSalary.setExpectSalary(offlineTeacherSalary);
+//                        courseScheduleTeacherSalary.setExpectSalary(feeInfo.get("offlineTeacherSalary"));
                     }
                 }
                 if(Objects.isNull(courseScheduleTeacherSalary.getId())){

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -106,14 +106,14 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Autowired
     private SysUserFeignService sysUserFeignService;
+
+    @Autowired
+    private EmployeeDao employeeDao;
 	
 	@Autowired
 	private SysMessageService sysMessageService;
 
 	@Autowired
-	private SysMessageConfigDao sysMessageConfigDao;
-
-	@Autowired
 	private SysConfigDao sysConfigDao;
 
     @Override
@@ -832,7 +832,18 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
     @Override
     public PageInfo<MusicGroup> queryMusicGroupPage(MusicGroupQueryInfo queryInfo) {
-        PageInfo<MusicGroup> musicGroupPageInfo = queryPage(queryInfo);
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        //获取用户权限列表
+        List<Integer> roles = employeeDao.queryUserRole(sysUser.getId());
+        PageInfo<MusicGroup> musicGroupPageInfo;
+        if(roles != null && roles.size() == 1 && roles.contains(SysUserRole.EDUCATIONAL_TEACHER)){
+            //只有教务老师权限
+            String musicGroupIds = musicGroupDao.queryEducationalMusicGroupId(sysUser.getId());
+            queryInfo.setMusicGroupId(musicGroupIds);
+            musicGroupPageInfo = queryPage(queryInfo);
+        }else {
+            musicGroupPageInfo = queryPage(queryInfo);
+        }
         List<MusicGroup> musicGroupList = musicGroupPageInfo.getRows();
         // 获取学校编号列表
 //        Set<Integer> schoolIds = musicGroupList.stream().map(e -> e.getSchoolId()).collect(Collectors.toSet());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentAttendanceServiceImpl.java

@@ -4,16 +4,14 @@ import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
-import com.ym.mec.biz.dal.entity.ClassGroup;
-import com.ym.mec.biz.dal.entity.ClassGroupStudentMapper;
-import com.ym.mec.biz.dal.entity.CourseSchedule;
-import com.ym.mec.biz.dal.entity.StudentAttendance;
+import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
 import com.ym.mec.biz.dal.page.CourseHomeworkQueryInfo;
 import com.ym.mec.biz.dal.page.StudentAttendanceQueryInfo;
 import com.ym.mec.biz.service.StudentAttendanceService;
 import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysMessageService;
+import com.ym.mec.biz.service.TeacherAttendanceService;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
@@ -58,6 +56,8 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	private SysMessageService sysMessageService;
 	@Autowired
 	private SysConfigDao sysConfigDao;
+	@Autowired
+	private TeacherAttendanceService teacherAttendanceService;
 
 	@Override
 	public BaseDAO<Long, StudentAttendance> getDAO() {
@@ -131,6 +131,10 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 		courseSchedule.setStudentNum(studentNum);
 		courseSchedule.setLeaveStudentNum(leaveStudentNum);
 		courseScheduleDao.update(courseSchedule);
+
+		TeacherSignOutDto teacherSignOutDto=new TeacherSignOutDto();
+		teacherSignOutDto.setTeacherAttendanceInfo(new TeacherAttendance(courseSchedule.getId(),0));
+		teacherAttendanceService.addTeacherAttendanceRecord(teacherSignOutDto);
 	}
 
 	@Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentCourseHomeworkServiceImpl.java

@@ -76,7 +76,11 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 
 	@Override
 	public CourseHomeworkStudentDetailDto findCourseHomeworkStudentDetail(Long courseScheduleID, Long userId) {
-		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseScheduleID, userId);
+		CourseHomework courseHomework = courseHomeworkDao.get(courseScheduleID);
+		if(Objects.isNull(courseHomework)){
+			throw new BizException("作业不存在");
+		}
+		return studentCourseHomeworkDao.findCourseHomeworkStudentDetail(courseHomework.getCourseScheduleId(), userId);
 	}
 
 	@Override

mec-biz/src/main/java/com/ym/mec/biz/service/impl/TeacherAttendanceServiceImpl.java

@@ -176,10 +176,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 			courseHomework.setGroupType(classGroup.getGroupType());
 			courseHomework.setClassGroupId(currentCourseDetail.getClassId().intValue());
 			courseHomework.setExpectNum(studentAttendanceDao.countNormalAttendanceStudentNums(teacherAttendance.getCourseScheduleId()));
-			CourseSchedule nextCourseSchedule = courseScheduleDao.getNextCourseSchedule(classGroup.getId());
-			if(Objects.nonNull(nextCourseSchedule)){
-				courseHomework.setExpiryDate(nextCourseSchedule.getStartClassTime());
-			}
+			courseHomework.setExpiryDate(DateUtil.addDays(date,7));
 			courseHomeworkService.insert(courseHomework);
 			List<StudentCourseHomework> studentCourseHomeworks = studentCourseHomeworkDao
 					.constructInitialStudentHomeworkRecordsWithPayment(teacherAttendance.getCourseScheduleId(),

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -898,6 +898,11 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("用户信息获取失败");
 		}
 
+		ClassGroup classGroup= classGroupDao.lockByMusicGroupAndType(vipGroupBuyParams.getVipGroupId().toString(),ClassGroupTypeEnum.VIP.getCode());
+		if(Objects.isNull(classGroup)){
+			throw new BizException("课程信息错误");
+		}
+
 		VipGroup vipGroup = vipGroupDao.get(vipGroupBuyParams.getVipGroupId());
 
 		if(vipGroup.getStatus()!=VipGroupStatusEnum.APPLYING){
@@ -912,11 +917,6 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("您已购买过此课程");
 		}
 
-		ClassGroup classGroup= classGroupDao.lockByMusicGroupAndType(vipGroup.getId().toString(),ClassGroupTypeEnum.VIP.getCode());
-		if(Objects.isNull(classGroup)){
-			throw new BizException("课程信息错误");
-		}
-
 		StudentPaymentOrder byStudentVipGroup = studentPaymentOrderDao.findByStudentVipGroup(vipGroupBuyParams.getVipGroupId(),
 				user.getId(),
 				DealStatusEnum.ING.getCode());

mec-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -212,4 +212,7 @@
             AND (ue.real_name_ LIKE CONCAT('%',#{search},'%') OR ue.phone_ LIKE CONCAT('%',#{search},'%'))
         </if>
     </select>
+    <select id="queryUserRole" resultType="java.lang.Integer">
+        SELECT sur.role_id_ FROM sys_user_role sur WHERE sur.user_id_ = #{userId}
+    </select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -170,6 +170,9 @@
 			<if test="musicGroupStatus != null">
 				AND status_ = #{musicGroupStatus}
 			</if>
+			<if test="musicGroupId != null">
+				AND FIND_IN_SET(id_,#{musicGroupId})
+			</if>
 		</where>
 	</sql>
 
@@ -357,4 +360,7 @@
 		WHERE cgtm.music_group_id_ = #{musicGroupId}
 		GROUP BY cgtm.user_id_
 	</select>
+	<select id="queryEducationalMusicGroupId" resultType="java.lang.String">
+		SELECT GROUP_CONCAT(mg.id_) FROM music_group mg WHERE mg.educational_teacher_id_ = #{userIds}
+	</select>
 </mapper>

mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -22,6 +22,7 @@
         <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_" />
         <result property="currentCLassTimes" column="current_class_times_" />
+        <result property="totalClassTimes" column="total_class_times_" />
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -265,7 +266,8 @@
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             su.real_name_ teacher_name_,
             sa.status_,
-            sa.current_class_times_
+            sa.current_class_times_,
+            cg.total_class_times_
         FROM
             student_attendance sa
             LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_

mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -165,7 +165,7 @@
             teacher_attendance ta
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_
         <include refid="queryCondition"/>
-        ORDER BY class_date_ DESC
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>
 

mec-education/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-gateway/mec-gateway-web/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-im/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-monitor/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=localhost:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-student/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-task/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-teacher/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e

mec-web/src/main/resources/application.yml

@@ -30,12 +30,12 @@ spring:
 
   datasource:
     name: test
-#    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    username: dayaData
-    password: dayaDataOnline2019
-#    username: mec_dev
-#    password: mec_dev
+    url: jdbc:mysql://47.99.212.176:3306/mec_dev?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+#    url: jdbc:mysql://47.99.212.176:3306/mec_data_online?useUnicode=true&characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    username: dayaData
+#    password: dayaDataOnline2019
+    username: mec_dev
+    password: mec_dev
     # 使用druid数据源
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -113,4 +113,4 @@ message:
 payment:
   hiddenMode: true
   #隐藏的支付方式
-  channel: YQPAY,
+  channel: YQPAY,

mec-web/src/main/resources/bootstrap-test.properties

@@ -1,7 +1,7 @@
 #\u6307\u5b9a\u5f00\u53d1\u73af\u5883
 #spring.profiles.active=dev
 #\u670d\u52a1\u5668\u5730\u5740
-spring.cloud.nacos.config.server-addr=47.99.212.176:8848
+spring.cloud.nacos.config.server-addr=47.96.85.100:8848
 #\u9ed8\u8ba4\u4e3aPublic\u547d\u540d\u7a7a\u95f4,\u53ef\u4ee5\u7701\u7565\u4e0d\u5199
 spring.cloud.nacos.config.namespace=02105743-16b8-46ab-87df-2aca0f3dbca3
 #\u6307\u5b9a\u914d\u7f6e\u7fa4\u7ec4 --\u5982\u679c\u662fPublic\u547d\u540d\u7a7a\u95f4 \u5219\u53ef\u4ee5\u7701\u7565\u7fa4\u7ec4\u914d\u7f6e