瀏覽代碼

版本切换

anderx 3 年之前
父節點
當前提交
7e6d653c2b

+ 1 - 1
src/main/java/com/goafanti/common/mapper/UserMapperExt.xml

@@ -381,7 +381,7 @@
 		select
 		count(0)
 		from(select a.id from `user` a
-		<if test="role == 1 and name != null">
+		<if test="name != null">
 		left join user_names un on a.id=un.uid
 		</if>
 		left join organization_identity b on a.id = b.uid

+ 1 - 1
src/main/java/com/goafanti/common/task/PatentTask.java

@@ -65,7 +65,7 @@ public class PatentTask {
 	 * 4、在相隔30天、20天、10天、3天、2天、1天分别一次提醒。原是在距离90天提醒。
 	 */
 	@Scheduled(cron = "0 0 0  * * ?")
-	@RequestMapping(value = "/open/patentRemind", method = RequestMethod.GET)
+//	@RequestMapping(value = "/open/patentRemind", method = RequestMethod.GET)
 	public void patentRemind() {
 		LoggerUtils.debug(getClass(), "====================开始检查专利提醒==================");
 		try {

+ 5 - 5
src/main/resources/props/config_local.properties

@@ -1,12 +1,12 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=123456
-jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.url=jdbc\:mysql://localhost:3306/aft20220318?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 jdbc.username=root
-jdbc.password=aftdev
+jdbc.password=123456
+#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+#jdbc.username=root
+#jdbc.password=aftdev
 jdbc.validationQuery=SELECT 'x'
 jdbc.initialSize=3
 jdbc.maxActive=20