From 740168b1c7f2fe2dded71a74449b153417a1cc93 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期三, 23 二月 2022 10:08:47 +0800 Subject: [PATCH] stable --- /dev/null | 45 --------------------------------------------- src/main/resources/application-dev.yml | 8 ++++---- src/main/resources/application.yml | 2 +- 3 files changed, 5 insertions(+), 50 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index aab8ca1..e7c600b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,10 +3,10 @@ spring: datasource: - driver-class-name: com.mysql.jdbc.Driver - url: jdbc:mysql://iot.emperyland.com:3306/dz-admin?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai - username: root - password: xltys1995 + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://47.97.1.152:51433;databasename=zypms + username: sa + password: Zoneyung@zy56$ aliyun: oss: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2b1816b..280723d 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl logging: - path: /stock/out/logs + path: /stock/out/@pom.build.finalName@/logs super: pwd: xltys1995 diff --git a/src/main/resources/mapper/SmsLogMapper.xml b/src/main/resources/mapper/SmsLogMapper.xml deleted file mode 100644 index 7a48885..0000000 --- a/src/main/resources/mapper/SmsLogMapper.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.zy.sc.manager.mapper.SmsLogMapper"> - - <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> - <resultMap id="BaseResultMap" type="com.zy.sc.manager.entity.SmsLog"> - <id column="id" property="id" /> - <result column="uuid" property="uuid" /> - <result column="host_id" property="hostId" /> - <result column="sensor_id" property="sensorId" /> - <result column="sensor_type" property="sensorType" /> - <result column="sms_code" property="smsCode" /> - <result column="sms_param" property="smsParam" /> - <result column="title" property="title" /> - <result column="phone" property="phone" /> - <result column="content" property="content" /> - <result column="result" property="result" /> - <result column="create_time" property="createTime" /> - <result column="memo" property="memo" /> - - </resultMap> - -</mapper> diff --git a/src/main/resources/mapper/StandardMapper.xml b/src/main/resources/mapper/StandardMapper.xml deleted file mode 100644 index d7ca3d1..0000000 --- a/src/main/resources/mapper/StandardMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> -<mapper namespace="com.zy.sc.manager.mapper.StandardMapper"> - - <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 --> - <resultMap id="BaseResultMap" type="com.zy.sc.manager.entity.Standard"> - <id column="id" property="id" /> - <result column="uuid" property="uuid" /> - <result column="host_id" property="hostId" /> - <result column="sensor_id" property="sensorId" /> - <result column="sensor_type" property="sensorType" /> - <result column="sensor_uuid" property="sensorUuid" /> - <result column="name" property="name" /> - <result column="type" property="type" /> - <result column="url" property="url" /> - <result column="is_dir" property="isDir" /> - <result column="status" property="status" /> - <result column="create_by" property="createBy" /> - <result column="create_time" property="createTime" /> - <result column="update_by" property="updateBy" /> - <result column="update_time" property="updateTime" /> - <result column="memo" property="memo" /> - <result column="resource_id" property="resourceId" /> - - </resultMap> - - <select id="listAll" resultMap="BaseResultMap"> - select - * - from man_standard - where 1=1 - and resource_id = #{resourceId} - <if test="hostId!=null and hostId!='' "> - and host_id = #{hostId} - </if> - <if test="sensorType!=null and sensorType!='' "> - and sensor_type = #{sensorType} - </if> - <if test="sensorId!=null and sensorId!='' "> - and sensor_id = #{sensorId} - </if> - order by create_time desc - </select> - -</mapper> -- Gitblit v1.9.1