Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-tool
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
王通通
amos-tool
Commits
d9192645
Commit
d9192645
authored
Jun 10, 2023
by
陈祥烨
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
13d48759
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
6 deletions
+8
-6
AmosDemoResource.java
...om/yeejoin/amos/api/tool/controller/AmosDemoResource.java
+1
-1
TplResource.java
...ava/com/yeejoin/amos/api/tool/controller/TplResource.java
+1
-0
TplModel.java
...n/java/com/yeejoin/amos/api/tool/face/model/TplModel.java
+2
-1
Tpl.java
...n/java/com/yeejoin/amos/api/tool/face/orm/entity/Tpl.java
+1
-1
application-dev.properties
src/main/resources/application-dev.properties
+3
-3
No files found.
src/main/java/com/yeejoin/amos/api/tool/controller/AmosDemoResource.java
View file @
d9192645
...
@@ -76,7 +76,7 @@ public class AmosDemoResource {
...
@@ -76,7 +76,7 @@ public class AmosDemoResource {
}
}
@TycloudOperation
(
ApiLevel
=
UserType
.
SUPER_ADMIN
)
@TycloudOperation
(
ApiLevel
=
UserType
.
SUPER_ADMIN
,
needAuth
=
false
)
@ApiOperation
(
value
=
"列表查询"
)
@ApiOperation
(
value
=
"列表查询"
)
@RequestMapping
(
value
=
"/list"
,
method
=
RequestMethod
.
GET
)
@RequestMapping
(
value
=
"/list"
,
method
=
RequestMethod
.
GET
)
public
ResponseModel
selectForList
(
@RequestParam
(
value
=
"agencyCode"
)
String
agencyCode
)
{
public
ResponseModel
selectForList
(
@RequestParam
(
value
=
"agencyCode"
)
String
agencyCode
)
{
...
...
src/main/java/com/yeejoin/amos/api/tool/controller/TplResource.java
View file @
d9192645
...
@@ -35,6 +35,7 @@ public class TplResource {
...
@@ -35,6 +35,7 @@ public class TplResource {
tplModel
.
setIsDel
(
false
);
tplModel
.
setIsDel
(
false
);
tplModel
.
setDisplayName
(
tplModel
.
getComName
());
tplModel
.
setDisplayName
(
tplModel
.
getComName
());
tplModel
=
tplService
.
createWithModel
(
tplModel
);
tplModel
=
tplService
.
createWithModel
(
tplModel
);
System
.
out
.
println
(
tplModel
.
getThumb
());
return
ResponseHelper
.
buildResponse
(
tplModel
);
return
ResponseHelper
.
buildResponse
(
tplModel
);
}
}
/**
/**
...
...
src/main/java/com/yeejoin/amos/api/tool/face/model/TplModel.java
View file @
d9192645
...
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
...
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import
io.swagger.annotations.ApiModelProperty
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
lombok.Data
;
import
lombok.EqualsAndHashCode
;
import
lombok.EqualsAndHashCode
;
import
org.springframework.web.multipart.MultipartFile
;
import
org.typroject.tyboot.core.rdbms.model.BaseModel
;
import
org.typroject.tyboot.core.rdbms.model.BaseModel
;
@Data
@Data
...
@@ -30,7 +31,7 @@ public class TplModel extends BaseModel {
...
@@ -30,7 +31,7 @@ public class TplModel extends BaseModel {
private
Boolean
openStatus
;
private
Boolean
openStatus
;
@ApiModelProperty
(
value
=
"缩略图"
)
@ApiModelProperty
(
value
=
"缩略图"
)
private
String
thumb
;
private
MultipartFile
thumb
;
@ApiModelProperty
(
value
=
"效果图"
)
@ApiModelProperty
(
value
=
"效果图"
)
private
String
sketch
;
private
String
sketch
;
...
...
src/main/java/com/yeejoin/amos/api/tool/face/orm/entity/Tpl.java
View file @
d9192645
...
@@ -54,7 +54,7 @@ public class Tpl extends BaseEntity {
...
@@ -54,7 +54,7 @@ public class Tpl extends BaseEntity {
*缩略图
*缩略图
*/
*/
@TableField
(
"THUMB"
)
@TableField
(
"THUMB"
)
private
String
thumb
;
private
String
[]
thumb
;
/**
/**
*状态图
*状态图
...
...
src/main/resources/application-dev.properties
View file @
d9192645
...
@@ -15,7 +15,7 @@ spring.datasource.hikari.connection-timeout=30000
...
@@ -15,7 +15,7 @@ spring.datasource.hikari.connection-timeout=30000
spring.datasource.hikari.connection-test-query
=
SELECT 1
spring.datasource.hikari.connection-test-query
=
SELECT 1
#??????
#??????
eureka.instance.hostname
=
172.16.3.18
eureka.instance.hostname
=
39.98.45.134
eureka.client.serviceUrl.defaultZone
=
http://${eureka.instance.hostname}:10001/eureka/
eureka.client.serviceUrl.defaultZone
=
http://${eureka.instance.hostname}:10001/eureka/
eureka.instance.prefer-ip-address
=
true
eureka.instance.prefer-ip-address
=
true
eureka.instance.health-check-url
=
http://localhost:${server.port}${server.servlet.context-path}/actuator/health
eureka.instance.health-check-url
=
http://localhost:${server.port}${server.servlet.context-path}/actuator/health
...
@@ -25,7 +25,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
...
@@ -25,7 +25,7 @@ eureka.instance.metadata-map.management.api-docs=http://localhost:${server.port}
#redis
#redis
spring.redis.database
=
1
spring.redis.database
=
1
spring.redis.host
=
172.16.3.18
spring.redis.host
=
39.98.45.134
spring.redis.port
=
6379
spring.redis.port
=
6379
spring.redis.password
=
yeejoin@2020
spring.redis.password
=
yeejoin@2020
spring.redis.timeout
=
0
spring.redis.timeout
=
0
...
@@ -33,7 +33,7 @@ spring.redis.timeout=0
...
@@ -33,7 +33,7 @@ spring.redis.timeout=0
## emqx
## emqx
emqx.clean-session
=
true
emqx.clean-session
=
true
emqx.client-id
=
${spring.application.name}-${random.int[1024,65536]}
emqx.client-id
=
${spring.application.name}-${random.int[1024,65536]}
emqx.broker
=
tcp://
172.16.3.18
:2883
emqx.broker
=
tcp://
39.98.45.134
:2883
emqx.client-user-name
=
super
emqx.client-user-name
=
super
emqx.client-password
=
a123456
emqx.client-password
=
a123456
emqx.max-inflight
=
1000
emqx.max-inflight
=
1000
...
...
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