From a069424edf3fb8321a743f7bbd937cffdd096371 Mon Sep 17 00:00:00 2001
From: yinglong zhang <1679309912@qq.com>
Date: Thu, 24 Jun 2021 11:05:25 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E9=87=8D=E5=86=99=E4=BA=86=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9B=E8=AF=A1=E5=BC=82=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adc-da-main/src/main/resources/application-dev.properties     | 4 ++--
 adc-da-main/src/main/resources/application.properties         | 1 -
 adc-da-slrs/pom.xml                                           | 4 ----
 .../resources/mybatis/mapper/sarPosition/TsPositionMapper.xml | 2 +-
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties
index afdb5624..88425a41 100644
--- a/adc-da-main/src/main/resources/application-dev.properties
+++ b/adc-da-main/src/main/resources/application-dev.properties
@@ -3,9 +3,9 @@
 # 数据库配置
 #=============================================
 spring.datasource.driverClassName = com.mysql.cj.jdbc.Driver
-spring.datasource.url = jdbc:mysql://localhost:3306/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
+spring.datasource.url = jdbc:mysql://101.36.227.22:33050/foton_slrs_test?useUnicode=true&characterEncoding=utf8&serverTimezone=UTC&useSSL=false
 spring.datasource.username = root
-spring.datasource.password = Zxy20010202
+spring.datasource.password = 1q2w3e4r
 
 #==============================================
 # 应用设置
diff --git a/adc-da-main/src/main/resources/application.properties b/adc-da-main/src/main/resources/application.properties
index 503b05d7..d0fa62ba 100644
--- a/adc-da-main/src/main/resources/application.properties
+++ b/adc-da-main/src/main/resources/application.properties
@@ -91,7 +91,6 @@ spring.datasource.druid.stat-view-servlet.url-pattern=/druid/*
 # =======================================
 mybatis-plus.config-location=classpath:mybatis/mybatis-config.xml
 mybatis-plus.mapper-locations=classpath*:mybatis/mapper/**/*.xml
-mybatis-plus.type-aliases-package=com.adc.da.**.entity
 
 # ========================================
 #  activiti 配置信息
diff --git a/adc-da-slrs/pom.xml b/adc-da-slrs/pom.xml
index b2a17634..e0f98a9f 100644
--- a/adc-da-slrs/pom.xml
+++ b/adc-da-slrs/pom.xml
@@ -11,10 +11,6 @@
 
     <artifactId>adc-da-slrs</artifactId>
     <dependencies>
-        <dependency>
-            <groupId></groupId>
-            <artifactId></artifactId>
-        </dependency>
         <dependency>
             <groupId>com.adc</groupId>
             <artifactId>adc-da-base</artifactId>
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
index 2c45b160..6188a7bb 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarPosition/TsPositionMapper.xml
@@ -1,7 +1,7 @@
 <?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.adc.da.slrs.sarPosition.dao.TsPositionDao">
-    <select id="getRole" resultType="TsRole">
+    <select id="getRole" resultType="com.adc.da.slrs.sarRole.entity.TsRole">
         select * from ts_role r
         left join ts_position_role ps
         on r.id=ps.role_id