diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
new file mode 100644
index 0000000..b5b1bc7
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and t.ACCOUNT = #{userDto.account}
+
+
+ and t.NAME = #{userDto.name}
+
+
+ and t.PHONE = #{userDto.attr1}
+
+
+ and t.SYNC_ID = #{userDto.syncId}
+
+
+
+ UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
+
+
+ UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
+
+
+ INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
+ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
+ VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
new file mode 100644
index 0000000..b5b1bc7
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and t.ACCOUNT = #{userDto.account}
+
+
+ and t.NAME = #{userDto.name}
+
+
+ and t.PHONE = #{userDto.attr1}
+
+
+ and t.SYNC_ID = #{userDto.syncId}
+
+
+
+ UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
+
+
+ UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
+
+
+ INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
+ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
+ VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
new file mode 100644
index 0000000..e81414d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
new file mode 100644
index 0000000..b5b1bc7
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and t.ACCOUNT = #{userDto.account}
+
+
+ and t.NAME = #{userDto.name}
+
+
+ and t.PHONE = #{userDto.attr1}
+
+
+ and t.SYNC_ID = #{userDto.syncId}
+
+
+
+ UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
+
+
+ UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
+
+
+ INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
+ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
+ VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
new file mode 100644
index 0000000..e81414d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 3422629..7f92b1d 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -20,7 +20,6 @@
@EnableTransactionManagement(proxyTargetClass = true)
@EnableAsync
@Slf4j
-@MapperScan("com.casic.missiles.modular.system.dao")
public class CasicApplication {
public static void main(String[] args) {
SpringApplication.run(CasicApplication.class, args);
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
new file mode 100644
index 0000000..b5b1bc7
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and t.ACCOUNT = #{userDto.account}
+
+
+ and t.NAME = #{userDto.name}
+
+
+ and t.PHONE = #{userDto.attr1}
+
+
+ and t.SYNC_ID = #{userDto.syncId}
+
+
+
+ UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
+
+
+ UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
+
+
+ INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
+ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
+ VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
new file mode 100644
index 0000000..e81414d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 3422629..7f92b1d 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -20,7 +20,6 @@
@EnableTransactionManagement(proxyTargetClass = true)
@EnableAsync
@Slf4j
-@MapperScan("com.casic.missiles.modular.system.dao")
public class CasicApplication {
public static void main(String[] args) {
SpringApplication.run(CasicApplication.class, args);
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 1b9c063..9dc8566 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -20,7 +20,6 @@
# 配置结果集属性为空时 是否映射返回结果
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
map-underscore-to-camel-case: true
- mapper-locations: classpath:mapper/*.xml
################### guns配置 ###################
casic:
swagger-open: false #是否开启swagger (true/false)
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
new file mode 100644
index 0000000..b5b1bc7
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and t.ACCOUNT = #{userDto.account}
+
+
+ and t.NAME = #{userDto.name}
+
+
+ and t.PHONE = #{userDto.attr1}
+
+
+ and t.SYNC_ID = #{userDto.syncId}
+
+
+
+ UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
+
+
+ UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
+
+
+ INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
+ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
+ VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
new file mode 100644
index 0000000..e81414d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 3422629..7f92b1d 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -20,7 +20,6 @@
@EnableTransactionManagement(proxyTargetClass = true)
@EnableAsync
@Slf4j
-@MapperScan("com.casic.missiles.modular.system.dao")
public class CasicApplication {
public static void main(String[] args) {
SpringApplication.run(CasicApplication.class, args);
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 1b9c063..9dc8566 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -20,7 +20,6 @@
# 配置结果集属性为空时 是否映射返回结果
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
map-underscore-to-camel-case: true
- mapper-locations: classpath:mapper/*.xml
################### guns配置 ###################
casic:
swagger-open: false #是否开启swagger (true/false)
diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml
deleted file mode 100644
index b5b1bc7..0000000
--- a/casic-web/src/main/resources/mapper/UserActionMapper.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- and t.ACCOUNT = #{userDto.account}
-
-
- and t.NAME = #{userDto.name}
-
-
- and t.PHONE = #{userDto.attr1}
-
-
- and t.SYNC_ID = #{userDto.syncId}
-
-
-
- UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
-
-
- UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
-
-
- INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
- VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
-
-
- INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
- VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
-
-
- UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
-
-
-
-
-
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
new file mode 100644
index 0000000..b5b1bc7
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/UserActionMapper.xml
@@ -0,0 +1,82 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ and t.ACCOUNT = #{userDto.account}
+
+
+ and t.NAME = #{userDto.name}
+
+
+ and t.PHONE = #{userDto.attr1}
+
+
+ and t.SYNC_ID = #{userDto.syncId}
+
+
+
+ UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
+
+
+ UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
+
+
+ INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
+ VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
+ VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
+
+
+ UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
new file mode 100644
index 0000000..e81414d
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/VisitorApplyMapper.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 3422629..7f92b1d 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -20,7 +20,6 @@
@EnableTransactionManagement(proxyTargetClass = true)
@EnableAsync
@Slf4j
-@MapperScan("com.casic.missiles.modular.system.dao")
public class CasicApplication {
public static void main(String[] args) {
SpringApplication.run(CasicApplication.class, args);
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 1b9c063..9dc8566 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -20,7 +20,6 @@
# 配置结果集属性为空时 是否映射返回结果
log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
map-underscore-to-camel-case: true
- mapper-locations: classpath:mapper/*.xml
################### guns配置 ###################
casic:
swagger-open: false #是否开启swagger (true/false)
diff --git a/casic-web/src/main/resources/mapper/UserActionMapper.xml b/casic-web/src/main/resources/mapper/UserActionMapper.xml
deleted file mode 100644
index b5b1bc7..0000000
--- a/casic-web/src/main/resources/mapper/UserActionMapper.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- and t.ACCOUNT = #{userDto.account}
-
-
- and t.NAME = #{userDto.name}
-
-
- and t.PHONE = #{userDto.attr1}
-
-
- and t.SYNC_ID = #{userDto.syncId}
-
-
-
- UPDATE sys_user SET `PHONE` = #{userDto.phone},`SALT`=#{userDto.salt} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name}
-
-
- UPDATE sys_user SET `SYNC_ID` = #{userDto.syncId} WHERE `ACCOUNT` = #{userDto.account} and `NAME` = #{userDto.name} and `PHONE` = #{userDto.phone}
-
-
- INSERT INTO sys_ru_relation ( `ID`, `USERID`, `ROLEID`,`UPDATE_TIME`)
- VALUES (#{id},#{userId},'1397015476211346433',DATE_FORMAT(#{updateTime},'%Y-%m-%d %H:%i:%S'))
-
-
- INSERT INTO bus_message ( `ID`, `MESSAGE_ID`, `STATUS`,`CREATE_TIME`)
- VALUES (#{message.id},#{message.messageId},#{message.status},DATE_FORMAT(#{message.createTime},'%Y-%m-%d %H:%i:%S'))
-
-
- UPDATE sys_user SET `AVATAR` = #{fileId} WHERE `ID` = #{uid}
-
-
-
-
-
\ No newline at end of file
diff --git a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml b/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml
deleted file mode 100644
index e81414d..0000000
--- a/casic-web/src/main/resources/mapper/VisitorApplyMapper.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file