Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
R
rs-cloud-platform
Project
Project
Details
Activity
Releases
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
周健威
rs-cloud-platform
Commits
69979d32
Commit
69979d32
authored
Dec 16, 2020
by
unset
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改支付信息
parent
54af3725
Changes
21
Show whitespace changes
Inline
Side-by-side
Showing
21 changed files
with
18 additions
and
574 deletions
+18
-574
pom.xml
ace-sidecar/ace-sidecar-client-demo/pom.xml
+0
-61
readme.md
ace-sidecar/ace-sidecar-client-demo/readme.md
+0
-28
PythonServerBootstrap.java
...wxiaoqi/security/sidecarclient/PythonServerBootstrap.java
+0
-23
PythonFeignClient.java
...aoqi/security/sidecarclient/client/PythonFeignClient.java
+0
-24
Message.java
...github/wxiaoqi/security/sidecarclient/entity/Message.java
+0
-28
PythonController.java
...wxiaoqi/security/sidecarclient/rest/PythonController.java
+0
-31
application.yml
...ce-sidecar-client-demo/src/main/resources/application.yml
+0
-14
application.yml
...ar/ace-sidecar-client-demo/target/classes/application.yml
+0
-14
PythonServerBootstrap.class
...xiaoqi/security/sidecarclient/PythonServerBootstrap.class
+0
-0
PythonFeignClient.class
...oqi/security/sidecarclient/client/PythonFeignClient.class
+0
-0
Message.class
...ithub/wxiaoqi/security/sidecarclient/entity/Message.class
+0
-0
PythonController.class
...xiaoqi/security/sidecarclient/rest/PythonController.class
+0
-0
pom.xml
ace-sidecar/ace-sidecar-server/pom.xml
+0
-54
readme.md
ace-sidecar/ace-sidecar-server/readme.md
+0
-24
SidercarBootstrap.java
...om/github/wxiaoqi/security/sidecar/SidercarBootstrap.java
+0
-16
application.yml
...car/ace-sidecar-server/src/main/resources/application.yml
+0
-29
application.yml
...sidecar/ace-sidecar-server/target/classes/application.yml
+0
-29
SidercarBootstrap.class
...m/github/wxiaoqi/security/sidecar/SidercarBootstrap.class
+0
-0
pom.xml
ace-sidecar/pom.xml
+0
-20
nacos.sql
alibaba-base/nacos.sql
+0
-179
OrderInfoDto.java
...java/com/upyuns/platform/rs/website/dto/OrderInfoDto.java
+18
-0
No files found.
ace-sidecar/ace-sidecar-client-demo/pom.xml
deleted
100644 → 0
View file @
54af3725
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
ace-sidecar
</artifactId>
<groupId>
com.github.wxiaoqi
</groupId>
<version>
2.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
ace-sidecar-client-demo
</artifactId>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-config
</artifactId>
</dependency>
<!--表示为web工程-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix-sidecar
</artifactId>
</dependency>
<!--暴露各种指标-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-config-server
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-consul-all
</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework.cloud</groupId>-->
<!-- <artifactId>spring-cloud-starter-consul-all</artifactId>-->
<!-- </dependency>-->
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-openfeign
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
ace-sidecar/ace-sidecar-client-demo/readme.md
deleted
100644 → 0
View file @
54af3725
Python服务端示例:
https://gitee.com/superjery/tornado_boilerplate
~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
需以下根文件:
__init__.py
application.py
server.py
urls.py
需以下根文件夹:
handlers
model
static
templates
~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Python 安装 3.5
tornado 安装 4.5
~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
运行python server.py即可启动Web
~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
两种访问接口方式:
http://localhost:5689/ace-sidecar-client-demo/test/test
http://localhost:5689/ace-sidecar-client-demo/message/123
ace-sidecar/ace-sidecar-client-demo/src/main/java/com/github/wxiaoqi/security/sidecarclient/PythonServerBootstrap.java
deleted
100644 → 0
View file @
54af3725
package
com
.
github
.
wxiaoqi
.
security
.
sidecarclient
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.cloud.client.discovery.EnableDiscoveryClient
;
import
org.springframework.cloud.netflix.eureka.EnableEurekaClient
;
import
org.springframework.cloud.openfeign.EnableFeignClients
;
/**
* ${DESCRIPTION}
*
* @author yangyongjie
* @create 2017-10-22 20:30
*/
@SpringBootApplication
@EnableEurekaClient
@EnableDiscoveryClient
@EnableFeignClients
public
class
PythonServerBootstrap
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
PythonServerBootstrap
.
class
,
args
);
}
}
ace-sidecar/ace-sidecar-client-demo/src/main/java/com/github/wxiaoqi/security/sidecarclient/client/PythonFeignClient.java
deleted
100644 → 0
View file @
54af3725
package
com
.
github
.
wxiaoqi
.
security
.
sidecarclient
.
client
;
import
com.github.wxiaoqi.security.sidecarclient.entity.Message
;
import
org.springframework.cloud.openfeign.FeignClient
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
java.util.List
;
/**
* ${DESCRIPTION}
*
* @author yangyongjie
* @create 2017-10-22 20:30
*/
@FeignClient
(
name
=
"ace-sidecar-server"
)
public
interface
PythonFeignClient
{
//parse param like /message?id=12
@RequestMapping
(
"/message/{id}"
)
List
<
Message
>
getMsg
(
@RequestParam
(
"id"
)
Long
id
);
//parse url like /test
@RequestMapping
(
"/test"
)
String
getTest
();
}
\ No newline at end of file
ace-sidecar/ace-sidecar-client-demo/src/main/java/com/github/wxiaoqi/security/sidecarclient/entity/Message.java
deleted
100644 → 0
View file @
54af3725
package
com
.
github
.
wxiaoqi
.
security
.
sidecarclient
.
entity
;
/**
* ${DESCRIPTION}
*
* @author yangyongjie
* @create 2017-10-22 20:30
*/
public
class
Message
{
private
Long
id
;
private
String
msg
;
public
Long
getId
()
{
return
id
;
}
public
void
setId
(
Long
id
)
{
this
.
id
=
id
;
}
public
String
getMsg
()
{
return
msg
;
}
public
void
setMsg
(
String
msg
)
{
this
.
msg
=
msg
;
}
}
\ No newline at end of file
ace-sidecar/ace-sidecar-client-demo/src/main/java/com/github/wxiaoqi/security/sidecarclient/rest/PythonController.java
deleted
100644 → 0
View file @
54af3725
package
com
.
github
.
wxiaoqi
.
security
.
sidecarclient
.
rest
;
import
com.github.wxiaoqi.security.sidecarclient.entity.Message
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.RestController
;
import
com.github.wxiaoqi.security.sidecarclient.client.PythonFeignClient
;
import
org.springframework.web.bind.annotation.*
;
import
java.util.List
;
/**
* ${DESCRIPTION}
*
* @author yangyongjie
* @create 2017-10-22 20:30
*/
@RestController
@RequestMapping
(
"test"
)
public
class
PythonController
{
@Autowired
private
PythonFeignClient
pythonFeignClient
;
@RequestMapping
(
value
=
"/test"
,
method
=
RequestMethod
.
GET
)
public
String
getTest
()
{
return
pythonFeignClient
.
getTest
();
}
@RequestMapping
(
value
=
"/message/{id}"
,
method
=
RequestMethod
.
GET
)
public
List
<
Message
>
getMsg
(
@PathVariable
Long
id
)
{
return
pythonFeignClient
.
getMsg
(
id
);
}
}
\ No newline at end of file
ace-sidecar/ace-sidecar-client-demo/src/main/resources/application.yml
deleted
100644 → 0
View file @
54af3725
server
:
port
:
5689
#启动端口
spring
:
application
:
name
:
ace-sidecar-client-demo
eureka
:
instance
:
statusPageUrlPath
:
/info
healthCheckUrlPath
:
/health
client
:
serviceUrl
:
defaultZone
:
http://localhost:8761/eureka/
\ No newline at end of file
ace-sidecar/ace-sidecar-client-demo/target/classes/application.yml
deleted
100644 → 0
View file @
54af3725
server
:
port
:
5689
#启动端口
spring
:
application
:
name
:
ace-sidecar-client-demo
eureka
:
instance
:
statusPageUrlPath
:
/info
healthCheckUrlPath
:
/health
client
:
serviceUrl
:
defaultZone
:
http://localhost:8761/eureka/
\ No newline at end of file
ace-sidecar/ace-sidecar-client-demo/target/classes/com/github/wxiaoqi/security/sidecarclient/PythonServerBootstrap.class
deleted
100644 → 0
View file @
54af3725
File deleted
ace-sidecar/ace-sidecar-client-demo/target/classes/com/github/wxiaoqi/security/sidecarclient/client/PythonFeignClient.class
deleted
100644 → 0
View file @
54af3725
File deleted
ace-sidecar/ace-sidecar-client-demo/target/classes/com/github/wxiaoqi/security/sidecarclient/entity/Message.class
deleted
100644 → 0
View file @
54af3725
File deleted
ace-sidecar/ace-sidecar-client-demo/target/classes/com/github/wxiaoqi/security/sidecarclient/rest/PythonController.class
deleted
100644 → 0
View file @
54af3725
File deleted
ace-sidecar/ace-sidecar-server/pom.xml
deleted
100644 → 0
View file @
54af3725
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
ace-sidecar
</artifactId>
<groupId>
com.github.wxiaoqi
</groupId>
<version>
2.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
ace-sidecar-server
</artifactId>
<dependencies>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-config
</artifactId>
</dependency>
<!--表示为web工程-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-web
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-netflix-sidecar
</artifactId>
</dependency>
<!--暴露各种指标-->
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-config-server
</artifactId>
</dependency>
<dependency>
<groupId>
org.springframework.cloud
</groupId>
<artifactId>
spring-cloud-starter-consul-all
</artifactId>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
ace-sidecar/ace-sidecar-server/readme.md
deleted
100644 → 0
View file @
54af3725
使用Sidecar代理远程Python服务,端口为Python的Web端口
当然,换成Node的Web端口,即可代理Node的远程服务
远程服务需要实现一个接口,返回
~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Node:
app.get('/health', (req, res) => {
res.json({
status: 'UP'
})
})
~~~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Python:
class HealthHandler(tornado.web.RequestHandler):
def get(self):
self.set_header("content-type", "application/json")
self.render('health')
health:
{"status":"UP"}
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
切记,通过此代理访问不到远程Python提供的服务,
需通过ace-sidecar-client-demo封装后才可访问到。
\ No newline at end of file
ace-sidecar/ace-sidecar-server/src/main/java/com/github/wxiaoqi/security/sidecar/SidercarBootstrap.java
deleted
100644 → 0
View file @
54af3725
package
com
.
github
.
wxiaoqi
.
security
.
sidecar
;
import
org.springframework.boot.SpringApplication
;
import
org.springframework.boot.autoconfigure.SpringBootApplication
;
import
org.springframework.cloud.netflix.sidecar.EnableSidecar
;
/**
* Created by ace on 2017/7/29.
*/
@EnableSidecar
@SpringBootApplication
public
class
SidercarBootstrap
{
public
static
void
main
(
String
[]
args
)
{
SpringApplication
.
run
(
SidercarBootstrap
.
class
,
args
);
}
}
ace-sidecar/ace-sidecar-server/src/main/resources/application.yml
deleted
100644 → 0
View file @
54af3725
server
:
port
:
5688
#启动端口
spring
:
application
:
name
:
ace-sidecar-server
cloud
:
consul
:
enabled
:
true
host
:
127.0.0.1
port
:
8500
discovery
:
healthCheckPath
:
/actuator/health
healthCheckInterval
:
5s
instanceId
:
${spring.application.name}:${vcap.application.instance_id:${spring.application.instance_id:${random.value}}}
register
:
true
enabled
:
true
sidecar
:
port
:
5680
#python接口
health
:
uri
:
http://localhost:${sidecar.port}/health
eureka
:
instance
:
statusPageUrlPath
:
/info
healthCheckUrlPath
:
/health
client
:
serviceUrl
:
defaultZone
:
http://localhost:8761/eureka/
\ No newline at end of file
ace-sidecar/ace-sidecar-server/target/classes/application.yml
deleted
100644 → 0
View file @
54af3725
server
:
port
:
5688
#启动端口
spring
:
application
:
name
:
ace-sidecar-server
cloud
:
consul
:
enabled
:
true
host
:
127.0.0.1
port
:
8500
discovery
:
healthCheckPath
:
/actuator/health
healthCheckInterval
:
5s
instanceId
:
${spring.application.name}:${vcap.application.instance_id:${spring.application.instance_id:${random.value}}}
register
:
true
enabled
:
true
sidecar
:
port
:
5680
#python接口
health
:
uri
:
http://localhost:${sidecar.port}/health
eureka
:
instance
:
statusPageUrlPath
:
/info
healthCheckUrlPath
:
/health
client
:
serviceUrl
:
defaultZone
:
http://localhost:8761/eureka/
\ No newline at end of file
ace-sidecar/ace-sidecar-server/target/classes/com/github/wxiaoqi/security/sidecar/SidercarBootstrap.class
deleted
100644 → 0
View file @
54af3725
File deleted
ace-sidecar/pom.xml
deleted
100644 → 0
View file @
54af3725
<?xml version="1.0" encoding="UTF-8"?>
<project
xmlns=
"http://maven.apache.org/POM/4.0.0"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
>
<parent>
<artifactId>
ace-security
</artifactId>
<groupId>
com.github.wxiaoqi
</groupId>
<version>
2.0-SNAPSHOT
</version>
</parent>
<modelVersion>
4.0.0
</modelVersion>
<artifactId>
ace-sidecar
</artifactId>
<packaging>
pom
</packaging>
<modules>
<module>
ace-sidecar-server
</module>
<module>
ace-sidecar-client-demo
</module>
</modules>
</project>
\ No newline at end of file
alibaba-base/nacos.sql
deleted
100644 → 0
View file @
54af3725
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = config_info */
/******************************************/
CREATE
TABLE
`config_info`
(
`id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`data_id`
varchar
(
255
)
NOT
NULL
COMMENT
'data_id'
,
`group_id`
varchar
(
255
)
DEFAULT
NULL
,
`content`
longtext
NOT
NULL
COMMENT
'content'
,
`md5`
varchar
(
32
)
DEFAULT
NULL
COMMENT
'md5'
,
`gmt_create`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'创建时间'
,
`gmt_modified`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'修改时间'
,
`src_user`
text
COMMENT
'source user'
,
`src_ip`
varchar
(
20
)
DEFAULT
NULL
COMMENT
'source ip'
,
`app_name`
varchar
(
128
)
DEFAULT
NULL
,
`tenant_id`
varchar
(
128
)
DEFAULT
''
COMMENT
'租户字段'
,
`c_desc`
varchar
(
256
)
DEFAULT
NULL
,
`c_use`
varchar
(
64
)
DEFAULT
NULL
,
`effect`
varchar
(
64
)
DEFAULT
NULL
,
`type`
varchar
(
64
)
DEFAULT
NULL
,
`c_schema`
text
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_configinfo_datagrouptenant`
(
`data_id`
,
`group_id`
,
`tenant_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'config_info'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = config_info_aggr */
/******************************************/
CREATE
TABLE
`config_info_aggr`
(
`id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`data_id`
varchar
(
255
)
NOT
NULL
COMMENT
'data_id'
,
`group_id`
varchar
(
255
)
NOT
NULL
COMMENT
'group_id'
,
`datum_id`
varchar
(
255
)
NOT
NULL
COMMENT
'datum_id'
,
`content`
longtext
NOT
NULL
COMMENT
'内容'
,
`gmt_modified`
datetime
NOT
NULL
COMMENT
'修改时间'
,
`app_name`
varchar
(
128
)
DEFAULT
NULL
,
`tenant_id`
varchar
(
128
)
DEFAULT
''
COMMENT
'租户字段'
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_configinfoaggr_datagrouptenantdatum`
(
`data_id`
,
`group_id`
,
`tenant_id`
,
`datum_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'增加租户字段'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = config_info_beta */
/******************************************/
CREATE
TABLE
`config_info_beta`
(
`id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`data_id`
varchar
(
255
)
NOT
NULL
COMMENT
'data_id'
,
`group_id`
varchar
(
128
)
NOT
NULL
COMMENT
'group_id'
,
`app_name`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'app_name'
,
`content`
longtext
NOT
NULL
COMMENT
'content'
,
`beta_ips`
varchar
(
1024
)
DEFAULT
NULL
COMMENT
'betaIps'
,
`md5`
varchar
(
32
)
DEFAULT
NULL
COMMENT
'md5'
,
`gmt_create`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'创建时间'
,
`gmt_modified`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'修改时间'
,
`src_user`
text
COMMENT
'source user'
,
`src_ip`
varchar
(
20
)
DEFAULT
NULL
COMMENT
'source ip'
,
`tenant_id`
varchar
(
128
)
DEFAULT
''
COMMENT
'租户字段'
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_configinfobeta_datagrouptenant`
(
`data_id`
,
`group_id`
,
`tenant_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'config_info_beta'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = config_info_tag */
/******************************************/
CREATE
TABLE
`config_info_tag`
(
`id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`data_id`
varchar
(
255
)
NOT
NULL
COMMENT
'data_id'
,
`group_id`
varchar
(
128
)
NOT
NULL
COMMENT
'group_id'
,
`tenant_id`
varchar
(
128
)
DEFAULT
''
COMMENT
'tenant_id'
,
`tag_id`
varchar
(
128
)
NOT
NULL
COMMENT
'tag_id'
,
`app_name`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'app_name'
,
`content`
longtext
NOT
NULL
COMMENT
'content'
,
`md5`
varchar
(
32
)
DEFAULT
NULL
COMMENT
'md5'
,
`gmt_create`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'创建时间'
,
`gmt_modified`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'修改时间'
,
`src_user`
text
COMMENT
'source user'
,
`src_ip`
varchar
(
20
)
DEFAULT
NULL
COMMENT
'source ip'
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_configinfotag_datagrouptenanttag`
(
`data_id`
,
`group_id`
,
`tenant_id`
,
`tag_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'config_info_tag'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = config_tags_relation */
/******************************************/
CREATE
TABLE
`config_tags_relation`
(
`id`
bigint
(
20
)
NOT
NULL
COMMENT
'id'
,
`tag_name`
varchar
(
128
)
NOT
NULL
COMMENT
'tag_name'
,
`tag_type`
varchar
(
64
)
DEFAULT
NULL
COMMENT
'tag_type'
,
`data_id`
varchar
(
255
)
NOT
NULL
COMMENT
'data_id'
,
`group_id`
varchar
(
128
)
NOT
NULL
COMMENT
'group_id'
,
`tenant_id`
varchar
(
128
)
DEFAULT
''
COMMENT
'tenant_id'
,
`nid`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
,
PRIMARY
KEY
(
`nid`
),
UNIQUE
KEY
`uk_configtagrelation_configidtag`
(
`id`
,
`tag_name`
,
`tag_type`
),
KEY
`idx_tenant_id`
(
`tenant_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'config_tag_relation'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = group_capacity */
/******************************************/
CREATE
TABLE
`group_capacity`
(
`id`
bigint
(
20
)
unsigned
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键ID'
,
`group_id`
varchar
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'Group ID,空字符表示整个集群'
,
`quota`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'配额,0表示使用默认值'
,
`usage`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'使用量'
,
`max_size`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'单个配置大小上限,单位为字节,0表示使用默认值'
,
`max_aggr_count`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'聚合子配置最大个数,,0表示使用默认值'
,
`max_aggr_size`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'单个聚合数据的子配置大小上限,单位为字节,0表示使用默认值'
,
`max_history_count`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'最大变更历史数量'
,
`gmt_create`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'创建时间'
,
`gmt_modified`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'修改时间'
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_group_id`
(
`group_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'集群、各Group容量信息表'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = his_config_info */
/******************************************/
CREATE
TABLE
`his_config_info`
(
`id`
bigint
(
64
)
unsigned
NOT
NULL
,
`nid`
bigint
(
20
)
unsigned
NOT
NULL
AUTO_INCREMENT
,
`data_id`
varchar
(
255
)
NOT
NULL
,
`group_id`
varchar
(
128
)
NOT
NULL
,
`app_name`
varchar
(
128
)
DEFAULT
NULL
COMMENT
'app_name'
,
`content`
longtext
NOT
NULL
,
`md5`
varchar
(
32
)
DEFAULT
NULL
,
`gmt_create`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
,
`gmt_modified`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
,
`src_user`
text
,
`src_ip`
varchar
(
20
)
DEFAULT
NULL
,
`op_type`
char
(
10
)
DEFAULT
NULL
,
`tenant_id`
varchar
(
128
)
DEFAULT
''
COMMENT
'租户字段'
,
PRIMARY
KEY
(
`nid`
),
KEY
`idx_gmt_create`
(
`gmt_create`
),
KEY
`idx_gmt_modified`
(
`gmt_modified`
),
KEY
`idx_did`
(
`data_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'多租户改造'
;
/******************************************/
/* 数据库全名 = nacos_config */
/* 表名称 = tenant_capacity */
/******************************************/
CREATE
TABLE
`tenant_capacity`
(
`id`
bigint
(
20
)
unsigned
NOT
NULL
AUTO_INCREMENT
COMMENT
'主键ID'
,
`tenant_id`
varchar
(
128
)
NOT
NULL
DEFAULT
''
COMMENT
'Tenant ID'
,
`quota`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'配额,0表示使用默认值'
,
`usage`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'使用量'
,
`max_size`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'单个配置大小上限,单位为字节,0表示使用默认值'
,
`max_aggr_count`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'聚合子配置最大个数'
,
`max_aggr_size`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'单个聚合数据的子配置大小上限,单位为字节,0表示使用默认值'
,
`max_history_count`
int
(
10
)
unsigned
NOT
NULL
DEFAULT
'0'
COMMENT
'最大变更历史数量'
,
`gmt_create`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'创建时间'
,
`gmt_modified`
datetime
NOT
NULL
DEFAULT
'2010-05-05 00:00:00'
COMMENT
'修改时间'
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_tenant_id`
(
`tenant_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'租户容量信息表'
;
CREATE
TABLE
`tenant_info`
(
`id`
bigint
(
20
)
NOT
NULL
AUTO_INCREMENT
COMMENT
'id'
,
`kp`
varchar
(
128
)
NOT
NULL
COMMENT
'kp'
,
`tenant_id`
varchar
(
128
)
default
''
COMMENT
'tenant_id'
,
`tenant_name`
varchar
(
128
)
default
''
COMMENT
'tenant_name'
,
`tenant_desc`
varchar
(
256
)
DEFAULT
NULL
COMMENT
'tenant_desc'
,
`create_source`
varchar
(
32
)
DEFAULT
NULL
COMMENT
'create_source'
,
`gmt_create`
bigint
(
20
)
NOT
NULL
COMMENT
'创建时间'
,
`gmt_modified`
bigint
(
20
)
NOT
NULL
COMMENT
'修改时间'
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`uk_tenant_info_kptenantid`
(
`kp`
,
`tenant_id`
),
KEY
`idx_tenant_id`
(
`tenant_id`
)
)
ENGINE
=
InnoDB
DEFAULT
CHARSET
=
utf8
COLLATE
=
utf8_bin
COMMENT
=
'tenant_info'
;
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/OrderInfoDto.java
View file @
69979d32
...
...
@@ -4,6 +4,7 @@ import com.github.wxiaoqi.security.common.vo.PageParam;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.Data
;
import
java.math.BigDecimal
;
import
java.util.List
;
/**
...
...
@@ -40,4 +41,21 @@ public class OrderInfoDto extends PageParam {
* 商品信息ID
*/
private
List
<
ItemInfoDto
>
itemInfoDtoList
;
//详情ID
Integer
detailId
;
//1、标准数据,2、影像图库,3、行业应用信息
Integer
type
;
//数量
Integer
number
;
//单价
BigDecimal
price
;
//文件地址
String
filePath
;
}
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