diff --git a/.idea/compiler.xml b/.idea/compiler.xml index a82a4ae..e1229c0 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -17,7 +17,7 @@ - + diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml index cb8bbd6..59ed1f7 100644 --- a/pluss-common-bundle/src/main/resources/config/application-common.yml +++ b/pluss-common-bundle/src/main/resources/config/application-common.yml @@ -9,11 +9,11 @@ ip138: aliyun: # 这里推荐使用RAM账号信息 # - keyid: LTAI5tMLHwnM1zYYAFuRa1fK - keysecret: jS1h2STq1vcODczDNFQkjcU6ODyYAj + keyid: LTAI5tPdEfYSZcqHbjCrtPRD + keysecret: DZjyHBq3nTujF0NMLxnZgsecU8ZCvy region-id: cn-hangzhou sts: - role-arn: + role-arn: acs:ram::1413456038175003:role/oss endpoint: https://sts.cn-hangzhou.aliyuncs.com oss: endpoint: https://oss-cn-hangzhou.aliyuncs.com diff --git a/pluss-manage-page/pluss-manage-page.iml b/pluss-manage-page/pluss-manage-page.iml index 9ade217..f43d653 100644 --- a/pluss-manage-page/pluss-manage-page.iml +++ b/pluss-manage-page/pluss-manage-page.iml @@ -6,6 +6,11 @@ + + + + + @@ -37,6 +42,7 @@ + diff --git a/pluss-manage-page/pom.xml b/pluss-manage-page/pom.xml index 5a1a8ca..9621304 100644 --- a/pluss-manage-page/pom.xml +++ b/pluss-manage-page/pom.xml @@ -10,7 +10,7 @@ 4.0.0 pluss-manage-page - war + jar @@ -80,13 +80,13 @@ - + diff --git a/pluss-wap-page/pluss-wap-page.iml b/pluss-wap-page/pluss-wap-page.iml index a5cf495..462208b 100644 --- a/pluss-wap-page/pluss-wap-page.iml +++ b/pluss-wap-page/pluss-wap-page.iml @@ -36,6 +36,8 @@ + +