Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
S
shop-Mall
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
licc
shop-Mall
Commits
23e46b09
Commit
23e46b09
authored
Mar 10, 2021
by
m1991
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
用户表/资讯表字段补全
parent
00c77d78
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
2 deletions
+13
-2
ShopZxMapper.xml
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
+1
-0
UsersMapper.xml
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
+2
-0
User.java
...ergy-model/src/main/java/cn/wisenergy/model/app/User.java
+1
-1
UploadServiceImpl.java
...java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
+8
-0
application-dev.yml
wisenergy-web-admin/src/main/resources/application-dev.yml
+1
-1
No files found.
wisenergy-mapper/src/main/resources/mapper/ShopZxMapper.xml
View file @
23e46b09
...
@@ -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
...
...
wisenergy-mapper/src/main/resources/mapper/UsersMapper.xml
View file @
23e46b09
...
@@ -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>
...
...
wisenergy-model/src/main/java/cn/wisenergy/model/app/User.java
View file @
23e46b09
...
@@ -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
=
"user
N
ame"
,
value
=
"用户名称"
)
@ApiModelProperty
(
name
=
"user
_n
ame"
,
value
=
"用户名称"
)
private
Integer
userName
;
private
Integer
userName
;
/**
/**
...
...
wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/UploadServiceImpl.java
View file @
23e46b09
...
@@ -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/"
;
...
...
wisenergy-web-admin/src/main/resources/application-dev.yml
View file @
23e46b09
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment