Procházet zdrojové kódy

修改新增指导

anderx před 4 roky
rodič
revize
1042dd2ab7

+ 1 - 1
.gitignore

@@ -5,5 +5,5 @@
 /.externalToolBuilders/
 /bin/
 /build/
-/generatorConfig.xml
+/src/main/resources/generatorConfig.xml
 /.gitignore

+ 21 - 11
pom.xml

@@ -51,7 +51,9 @@
 		</profile>
 	</profiles>
 
+
 	<dependencies>
+
 		<!-- spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -86,11 +88,7 @@
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>5.4.0.Final</version>
 		</dependency>
-		<!-- <dependency> <groupId>de.dfki.cos.basys.platform.wrapper-bundle-settings</groupId> 
-			<artifactId>javax.websocket-api</artifactId> <version>0.2.6</version> <scope>provided</scope> 
-			</dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
@@ -410,16 +408,27 @@
 				</includes>
 				<filtering>false</filtering>
 			</resource>
-			<resource>
-				<directory>src/main/java</directory>
-				<includes>
-					<include>**/*.xml</include>
-				</includes>
-				<filtering>false</filtering>
-			</resource>
+				<resource>
+					<directory>src/main/java</directory>
+					<includes>
+						<include>**/**/*.xml</include>
+					</includes>
+				</resource>
+
 		</resources>
 		<plugins>
 			<plugin>
+				<!--IDEA在maven Project加入generator插件-->
+				<groupId>org.mybatis.generator</groupId>
+				<artifactId>mybatis-generator-maven-plugin</artifactId>
+				<version>1.3.2</version>
+				<configuration>
+					<verbose>true</verbose>
+					<overwrite>true</overwrite>
+				</configuration>
+
+			</plugin>
+			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<version>3.5.1</version>
@@ -472,6 +481,7 @@
 		</plugins>
 	</build>
 
+
 	<repositories>
 		<repository>
 			<id>aliyun-repos</id>

+ 1 - 0
src/main/java/com/goafanti/core/websocket/WebSocketConfig.java

@@ -1,6 +1,7 @@
 package com.goafanti.core.websocket;
 
 
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;

+ 1 - 0
src/main/java/com/goafanti/core/websocket/WebSocketHandshakeInterceptor.java

@@ -7,6 +7,7 @@ import javax.servlet.http.HttpSession;
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;
 import org.springframework.http.server.ServletServerHttpRequest;
+import org.springframework.stereotype.Component;
 import org.springframework.web.socket.WebSocketHandler;
 import org.springframework.web.socket.server.HandshakeInterceptor;
 

+ 3 - 0
src/main/java/com/goafanti/customer/service/impl/CustomerServiceImpl.java

@@ -2014,6 +2014,9 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
 		uf.setId(followId);
 		uf.setGuidance(guidance);
 		uf.setGuidanceTime(new Date());
+		String aid=TokenManager.getAdminId();
+		Admin a=adminMapper.selectByPrimaryKey(aid);
+
 		userFollowMapper.pushUserGuidance(followId, 1);
 		return userFollowMapper.updateByPrimaryKeySelective(uf);
 	}

+ 3 - 6
src/main/java/com/goafanti/user/controller/UserLoginController.java

@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.web.util.SavedRequest;
 import org.apache.shiro.web.util.WebUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,9 +33,9 @@ import com.goafanti.user.service.UserService;
 
 @Controller
 public class UserLoginController extends BaseController {
-	@Resource
+	@Autowired
 	private UserService userService;
-	@Resource
+	@Autowired
 	private AdminMapper			adminMapper;
 	
 	@RequestMapping(value = "/login", method = RequestMethod.GET)
@@ -94,8 +95,6 @@ public class UserLoginController extends BaseController {
 	/**
 	 * 管理端登录
 	 * 
-	 * @param user
-	 * @param remember
 	 * @param request
 	 * @return
 	 */
@@ -124,9 +123,7 @@ public class UserLoginController extends BaseController {
 	/**
 	 * 忘记密码 使用手机号+手机验证码登录
 	 * 
-	 * @param mobile
 	 * @param mobileCode
-	 * @param type
 	 * @return
 	 */
 	@RequestMapping(value = "/mobileSigin", method = RequestMethod.POST)

+ 58 - 0
src/main/resources/generatorConfig.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<generatorConfiguration>
+    <classPathEntry location="C:\Users\Administrator.SC-202107051558\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" />
+   <!-- <classPathEntry location="C:\Users\Administrator.SC-202009251130\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" /> /> -->
+  <context  id="MysqlTables" targetRuntime="MyBatis3" defaultModelType="flat">
+  <!-- 自动识别数据库关键字,默认false,如果设置为true,根据SqlReservedWords中定义的关键字列表;一般保留默认值,遇到数据库关键字(Java关键字),使用columnOverride覆盖 -->
+        <property name="autoDelimitKeywords" value="true"/>	
+        <!-- 生成的Java文件的编码 -->
+        <property name="javaFileEncoding" value="utf-8"/>
+        <!-- beginningDelimiter和endingDelimiter:指明数据库的用于标记数据库对象名的符号,比如ORACLE就是双引号,MYSQL默认是`反引号; -->
+        <property name="beginningDelimiter" value="`"/>
+        <property name="endingDelimiter" value="`"/>
+        <property name="addRemarkComments" value="true"/>
+        <!-- 格式化XML代码 -->
+        <property name="xmlFormatter" value="org.mybatis.generator.api.dom.DefaultXmlFormatter"/>
+        <plugin type="org.mybatis.generator.plugins.SerializablePlugin"/>
+        <plugin type="org.mybatis.generator.plugins.ToStringPlugin"/>
+        <!-- 注释 -->
+        <commentGenerator>
+            <property name="suppressAllComments" value="false"/><!-- 是否取消注释 -->
+            <property name="suppressDate" value="false"/> <!-- 是否生成注释代时间戳-->
+            <property name="addRemarkComments" value="true"/> 
+        </commentGenerator>
+     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft?serverTimezone=UTC"  
+    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="root" >
+    	 <!-- 防止生成其它库的表 -->
+            <property name="nullCatalogMeansCurrent" value="true"/>
+        </jdbcConnection>
+         <!-- 类型转换 -->
+        <javaTypeResolver>
+            <!-- 是否使用bigDecimal, false可自动转化以下类型(Long, Integer, Short, etc.) -->
+            <property name="forceBigDecimals" value="false"/>
+        </javaTypeResolver>
+    <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" >
+    		<!-- 是否让schema作为包的后缀 -->
+            <property name="enableSubPackages" value="false"/>
+            <!-- 从数据库返回的值去掉前后空格 -->
+            <property name="trimStrings" value="true"/>
+    </javaModelGenerator>
+    <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" >
+    	<property name="enableSubPackages" value="false"/>
+    </sqlMapGenerator>
+    <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  >
+    <property name="enableSubPackages" value="false"/>
+     <property name="nullCatalogMeansCurrent" value="true"/>
+    </javaClientGenerator>
+    <table schema="aft" tableName="user_follow"
+	enableCountByExample="false" enableUpdateByExample="false"
+	enableDeleteByExample="false" enableSelectByExample="false"
+	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"
+	enableUpdateByPrimaryKey="true" enableDeleteByPrimaryKey="true">
+         <property name="useActualColumnNames" value="false"/>
+        </table>
+  </context>
+</generatorConfiguration>

+ 5 - 3
GeneratorConfig.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
+<!DOCTYPE generatorConfiguration
+        PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN"
+        "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-   <classPathEntry location="C:\Users\Administrator.SC-202009251130\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-5.1.39.jar" /> 
+   <classPathEntry location="C:\Users\Administrator.SC-202107051558\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" />
    <!-- <classPathEntry location="C:\Users\Administrator.SC-202009251130\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" /> /> -->
   <context  id="MysqlTables" targetRuntime="MyBatis3" defaultModelType="flat">
   <!-- 自动识别数据库关键字,默认false,如果设置为true,根据SqlReservedWords中定义的关键字列表;一般保留默认值,遇到数据库关键字(Java关键字),使用columnOverride覆盖 -->
@@ -45,7 +47,7 @@
     <property name="enableSubPackages" value="false"/>
      <property name="nullCatalogMeansCurrent" value="true"/>
     </javaClientGenerator>
-    <table schema="aft" tableName="patent_new"
+    <table schema="aft" tableName="user_follow"
 	enableCountByExample="false" enableUpdateByExample="false"
 	enableDeleteByExample="false" enableSelectByExample="false"
 	selectByExampleQueryId="false" enableSelectByPrimaryKey="true"