Commit 23e46b09 authored by m1991's avatar m1991

用户表/资讯表字段补全

parent 00c77d78
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
<result column="zx_field" property="zxField"/> <result column="zx_field" property="zxField"/>
<result column="zx_address" property="zxAddress"/> <result column="zx_address" property="zxAddress"/>
<result column="img_url" property="imgUrl"/> <result column="img_url" property="imgUrl"/>
<result column="zx_date" property="zxDate"/>
</resultMap> </resultMap>
<sql id="table"> <sql id="table">
shop_zx shop_zx
......
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<sql id="updateCondition"> <sql id="updateCondition">
<if test="userId != null">user_id = #{userId},</if> <if test="userId != null">user_id = #{userId},</if>
<if test="userName != null">user_id = #{userName},</if>
<if test="password != null">password =#{password},</if> <if test="password != null">password =#{password},</if>
<if test="headImage != null">head_image =#{headImage},</if> <if test="headImage != null">head_image =#{headImage},</if>
<if test="userLevel != null">user_level =#{userLevel},</if> <if test="userLevel != null">user_level =#{userLevel},</if>
...@@ -55,6 +56,7 @@ ...@@ -55,6 +56,7 @@
<sql id="criteria"> <sql id="criteria">
<if test="id != null">id = #{id}</if> <if test="id != null">id = #{id}</if>
<if test="userId != null">and user_id = #{userId}</if> <if test="userId != null">and user_id = #{userId}</if>
<if test="userName != null">and user_id = #{userName}</if>
<if test="password != null">and password =#{password}</if> <if test="password != null">and password =#{password}</if>
<if test="headImage != null">and head_image =#{headImage}</if> <if test="headImage != null">and head_image =#{headImage}</if>
<if test="userLevel != null">and user_level =#{userLevel}</if> <if test="userLevel != null">and user_level =#{userLevel}</if>
......
...@@ -31,7 +31,7 @@ public class User extends Model<User> implements Serializable{ ...@@ -31,7 +31,7 @@ public class User extends Model<User> implements Serializable{
/** /**
* 用户名称 * 用户名称
*/ */
@ApiModelProperty(name = "userName", value = "用户名称") @ApiModelProperty(name = "user_name", value = "用户名称")
private Integer userName; private Integer userName;
/** /**
......
...@@ -14,6 +14,7 @@ import org.springframework.util.StringUtils; ...@@ -14,6 +14,7 @@ import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
...@@ -54,6 +55,13 @@ public class UploadServiceImpl implements UploadService { ...@@ -54,6 +55,13 @@ public class UploadServiceImpl implements UploadService {
public Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String userId,String zxField, String zxAddress) throws Exception { public Map<String, Object> uploadVideo(MultipartFile file,HttpServletRequest request,String userId,String zxField, String zxAddress) throws Exception {
Map<String, Object> resultMap=new HashMap<String, Object>(); Map<String, Object> resultMap=new HashMap<String, Object>();
/**
* 生成当前时间戳
*/
BigInteger zxDate= BigInteger.valueOf(System.currentTimeMillis());
/**
* http://路径
*/
String basePath = request.getScheme() + "://" + request.getServerName() String basePath = request.getScheme() + "://" + request.getServerName()
+ ":" + request.getServerPort()+"/upload/video/"; + ":" + request.getServerPort()+"/upload/video/";
......
...@@ -62,7 +62,7 @@ uploadFile: ...@@ -62,7 +62,7 @@ uploadFile:
location: /opt/images/upload_flowChart/ #自定义上传文件服务器硬盘保存路径 ,linux服务器保存路径 /home/changfa/app/wxbjgkpt/upload_flowChart/ location: /opt/images/upload_flowChart/ #自定义上传文件服务器硬盘保存路径 ,linux服务器保存路径 /home/changfa/app/wxbjgkpt/upload_flowChart/
file: file:
upload: upload:
path: /opt/images/ path: /opt/upload/video/
jwt: jwt:
# 加密秘钥 # 加密秘钥
secret: f4e2e52034348f86b67cde581c0f9eb5 secret: f4e2e52034348f86b67cde581c0f9eb5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment