Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
P
pms
概览
概览
详情
活动
周期分析
版本库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
问题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程表
图表
维基
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
iuav
pms
Commits
1a6f4013
提交
1a6f4013
authored
11月 16, 2023
作者:
bax
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
配置更新
上级
cb532795
流水线
#6902
已通过 于阶段
in 2 分 28 秒
变更
10
流水线
1
隐藏空白字符变更
内嵌
并排
正在显示
10 个修改的文件
包含
27 行增加
和
27 行删除
+27
-27
.gitlab-ci.yml
.gitlab-ci.yml
+1
-1
TokenCheckHandleInterceptor.java
...in/java/com/mmc/pms/auth/TokenCheckHandleInterceptor.java
+1
-1
CompanyInfoVO.java
src/main/java/com/mmc/pms/auth/dto/CompanyInfoVO.java
+1
-1
UploadController.java
src/main/java/com/mmc/pms/controller/UploadController.java
+1
-1
ProductTypeVO.java
...ain/java/com/mmc/pms/model/category/vo/ProductTypeVO.java
+1
-1
LeasePriceStockVO.java
...in/java/com/mmc/pms/model/lease/vo/LeasePriceStockVO.java
+1
-1
PriceStockVO.java
src/main/java/com/mmc/pms/model/mall/PriceStockVO.java
+1
-1
application-dev.yml
src/main/resources/application-dev.yml
+7
-7
application-local.yml
src/main/resources/application-local.yml
+6
-6
application-prod.yml
src/main/resources/application-prod.yml
+7
-7
没有找到文件。
.gitlab-ci.yml
浏览文件 @
1a6f4013
...
...
@@ -21,7 +21,7 @@ variables:
mvn_clean
:
stage
:
clean
script
:
-
echo "
情
理中..."
-
echo "
清
理中..."
-
mvn clean -B -Dmaven.test.skip=true --settings /usr/local/maven/conf/settings.xml
docker_build_dev
:
...
...
src/main/java/com/mmc/pms/auth/TokenCheckHandleInterceptor.java
浏览文件 @
1a6f4013
...
...
@@ -52,7 +52,7 @@ public class TokenCheckHandleInterceptor implements HandlerInterceptor {
// log.info("forwardedFor: {}", forwardedFor);
// log.info("forwardedHost: {}", forwardedHost);
// if (hostName.equals("iuav.mmcuav.cn") || hostName.equals("test.iuav.mmcuav.cn") ||
// hostName.equals("www.iuav.
shop") || hostName.equals("test.iuav.shop
")){
// hostName.equals("www.iuav.
com") || hostName.equals("test.iuav.com
")){
// String token = request.getHeader("token");
// if (StringUtils.isBlank(token)){
// exceptionProcess(response);
...
...
src/main/java/com/mmc/pms/auth/dto/CompanyInfoVO.java
浏览文件 @
1a6f4013
...
...
@@ -74,7 +74,7 @@ public class CompanyInfoVO {
private
String
content
;
@ApiModelProperty
(
value
=
"评分"
,
example
=
"*****"
)
private
Integer
score
;
@ApiModelProperty
(
value
=
"背景图"
,
example
=
"http://
pad-video-x.oss-cn-shenzhen
.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg"
)
@ApiModelProperty
(
value
=
"背景图"
,
example
=
"http://
share-fly.oss-cn-hangzhou
.aliyuncs.com/file/3505c402-cbf9-41a5-9d6f-bdb350625bea.jpg"
)
private
String
backImg
;
@ApiModelProperty
(
value
=
"当前距离"
)
private
Double
distance
;
...
...
src/main/java/com/mmc/pms/controller/UploadController.java
浏览文件 @
1a6f4013
...
...
@@ -104,7 +104,7 @@ public class UploadController {
+
oldName
.
substring
(
oldName
.
lastIndexOf
(
"."
),
oldName
.
length
());
// 通过UploadFileRequest设置多个参数。
// 依次填写Bucket名称(例如examplebucket)以及Object完整路径(例如exampledir/exampleobject.txt),Object完整路径中不能包含Bucket名称。
UploadFileRequest
uploadFileRequest
=
new
UploadFileRequest
(
"
pad-video-x
"
,
newName
);
UploadFileRequest
uploadFileRequest
=
new
UploadFileRequest
(
"
share-fly
"
,
newName
);
// 通过UploadFileRequest设置单个参数。
// 填写本地文件的完整路径,例如D:\\localpath\\examplefile.txt。如果未指定本地路径,则默认从示例程序所属项目对应本地路径中上传文件。
...
...
src/main/java/com/mmc/pms/model/category/vo/ProductTypeVO.java
浏览文件 @
1a6f4013
...
...
@@ -31,7 +31,7 @@ public class ProductTypeVO implements Serializable {
@NotEmpty
(
groups
=
{
Create
.
class
,
Update
.
class
},
message
=
"类型名称不能为空"
)
private
String
name
;
@ApiModelProperty
(
value
=
"图标"
,
example
=
"https://
pad-video-x.oss-cn-shenzhen
.aliyuncs.com/file/ad0e77b4-8518-4ecc-9b7f-19218f56b755.png"
)
@ApiModelProperty
(
value
=
"图标"
,
example
=
"https://
share-fly.oss-cn-hangzhou
.aliyuncs.com/file/ad0e77b4-8518-4ecc-9b7f-19218f56b755.png"
)
@NotEmpty
(
groups
=
{
Create
.
class
,
Update
.
class
},
message
=
"图标不能为空"
)
private
String
url
;
}
src/main/java/com/mmc/pms/model/lease/vo/LeasePriceStockVO.java
浏览文件 @
1a6f4013
...
...
@@ -50,7 +50,7 @@ public class LeasePriceStockVO implements Serializable {
@ApiModelProperty
(
value
=
"180天租金"
,
example
=
"1"
)
private
BigDecimal
maxDaysRental
;
@ApiModelProperty
(
value
=
"sku图片"
,
example
=
"https://
pad-video-x.oss-cn-shenzhen
.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg"
)
@ApiModelProperty
(
value
=
"sku图片"
,
example
=
"https://
share-fly.oss-cn-hangzhou
.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg"
)
private
String
skuImage
;
@ApiModelProperty
(
value
=
"库存"
,
example
=
"10"
)
...
...
src/main/java/com/mmc/pms/model/mall/PriceStockVO.java
浏览文件 @
1a6f4013
...
...
@@ -30,7 +30,7 @@ public class PriceStockVO implements Serializable {
@ApiModelProperty
(
value
=
"销售价格"
,
example
=
"1"
)
private
BigDecimal
salePrice
;
@ApiModelProperty
(
value
=
"sku图片"
,
example
=
"https://
pad-video-x.oss-cn-shenzhen
.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg"
)
@ApiModelProperty
(
value
=
"sku图片"
,
example
=
"https://
share-fly.oss-cn-hangzhou
.aliyuncs.com/file/35bbd044-7cd7-4c85-ba27-69776e03dbb2.jpg"
)
private
String
skuImage
;
@ApiModelProperty
(
value
=
"渠道价格"
,
example
=
"1"
)
...
...
src/main/resources/application-dev.yml
浏览文件 @
1a6f4013
...
...
@@ -2,12 +2,12 @@ spring:
datasource
:
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://
mysql.default
:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://
rm-bp1m8kze2l399i1jyko.mysql.rds.aliyuncs.com
:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
iuav_dev
password
:
${MYSQL_PASSWORD}
redis
:
database
:
1
host
:
redis.default
host
:
172.24.1.207
port
:
6379
password
:
${REDIS_PASSWORD}
jedis
:
...
...
@@ -26,10 +26,10 @@ springfox:
aliyun
:
oss
:
endpoint
:
oss-cn-
shenzhen
.aliyuncs.com
access-key-id
:
LTAI
4FzCpyrA33PegnxWS6XV
endpoint
:
oss-cn-
hangzhou
.aliyuncs.com
access-key-id
:
LTAI
5tK6UG2LzMkf1FKZBkBU
access-key-secret
:
${OSS_ACCESS_KEY_SECRET}
bucket
:
pad-video-x
bucket
:
share-fly
mmcflying
:
download
:
...
...
@@ -39,9 +39,9 @@ mount:
iuav
:
userapp
:
url
:
https://test.iuav.
shop
url
:
https://test.iuav.
com
ims
:
url
:
https://test.iuav.
shop
url
:
https://test.iuav.
com
src/main/resources/application-local.yml
浏览文件 @
1a6f4013
...
...
@@ -2,12 +2,12 @@ spring:
datasource
:
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://rm-
wz9dd796t4j1giz6t2
o.mysql.rds.aliyuncs.com:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://rm-
bp1m8kze2l399i1jyk
o.mysql.rds.aliyuncs.com:3306/iuav_pms_dev?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
iuav_dev
password
:
IUAV_DEV@2023&MYSQL
redis
:
database
:
1
host
:
r-wz9ke310fs684hacn1pd.redis.rds.aliyuncs.com
host
:
172.24.1.207
port
:
6379
password
:
MMC@2022&REDIS
servlet
:
...
...
@@ -35,10 +35,10 @@ springfox:
aliyun
:
oss
:
endpoint
:
oss-cn-
shenzhen
.aliyuncs.com
access-key-id
:
LTAI
4FzCpyrA33PegnxWS6XV
access-key-secret
:
ILuNh3zJfRjg3iARSipMWBKCjglz3u
bucket
:
pad-video-x
endpoint
:
oss-cn-
hangzhou
.aliyuncs.com
access-key-id
:
LTAI
5tK6UG2LzMkf1FKZBkBU
access-key-secret
:
UrXws5uVH6JMf0jCwipjOug4nHQvAz
bucket
:
share-fly
mmcflying
:
download
:
...
...
src/main/resources/application-prod.yml
浏览文件 @
1a6f4013
...
...
@@ -2,12 +2,12 @@ spring:
datasource
:
type
:
com.alibaba.druid.pool.DruidDataSource
driver-class-name
:
com.mysql.cj.jdbc.Driver
url
:
jdbc:mysql://
mysql.default
:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
url
:
jdbc:mysql://
rm-bp1m8kze2l399i1jyko.mysql.rds.aliyuncs.com
:3306/iuav_pms?characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
iuav
password
:
${MYSQL_PASSWORD}
redis
:
database
:
5
host
:
redis.default
host
:
172.24.1.207
port
:
6379
password
:
${REDIS_PASSWORD}
jedis
:
...
...
@@ -26,10 +26,10 @@ springfox:
aliyun
:
oss
:
endpoint
:
oss-cn-
shenzhen
.aliyuncs.com
access-key-id
:
LTAI
4FzCpyrA33PegnxWS6XV
endpoint
:
oss-cn-
hangzhou
.aliyuncs.com
access-key-id
:
LTAI
5tK6UG2LzMkf1FKZBkBU
access-key-secret
:
${OSS_ACCESS_KEY_SECRET}
bucket
:
pad-video-x
bucket
:
share-fly
mmcflying
:
download
:
...
...
@@ -39,7 +39,7 @@ mount:
iuav
:
userapp
:
url
:
https://www.iuav.
shop
url
:
https://www.iuav.
com
ims
:
url
:
https://www.iuav.
shop
url
:
https://www.iuav.
com
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论