diff --git a/odcs2.com/.env b/odcs2.com/.env
index 10e00e3..e7739c6 100644
--- a/odcs2.com/.env
+++ b/odcs2.com/.env
@@ -1 +1 @@
-VUE_APP_BASE_URL='http://154.12.94.229:8080/'
\ No newline at end of file
+VUE_APP_BASE_URL='http://156.238.240.18:8081/'
\ No newline at end of file
diff --git a/odcs2.com/src/api/basurl.js b/odcs2.com/src/api/basurl.js
index ea2b04a..0b0d21f 100644
--- a/odcs2.com/src/api/basurl.js
+++ b/odcs2.com/src/api/basurl.js
@@ -3,7 +3,7 @@
//const DEV_BASE_URL = "ws://1.92.85.51:8080";
-const DEV_BASE_URL = "ws://127.0.0.1:8081";
+const DEV_BASE_URL = "ws://156.238.240.18:8081";
export default {
BASE_API: DEV_BASE_URL,
};
diff --git a/odcs2.com/src/api/index.js b/odcs2.com/src/api/index.js
index 2c28c58..cb54d80 100644
--- a/odcs2.com/src/api/index.js
+++ b/odcs2.com/src/api/index.js
@@ -23,7 +23,7 @@ const reqAxios = axios.create({
//baseURL:'http://1.92.85.51:8080',
// baseURL:'http://3.92.67.237:8080',
-baseURL:'http://127.0.0.1:8081/',
+baseURL:'http://156.238.240.18:8081/',
// baseURL: "http://beecsgo.com/prod-api/",
// baseURL: "http://www.f2cs2.com/prod-api/",
@@ -95,11 +95,14 @@ reqAxios.interceptors.response.use(
// console.log('response',res)
vue.$hide();
if (res.data.code == 401) {
- Message({
- message: "登录已过期,请重新登陆",
- type: "warning",
- customClass: "log_warning",
- });
+ const token = getToken();
+ if (token) {
+ Message({
+ message: "登录已过期,请重新登陆",
+ type: "warning",
+ customClass: "log_warning",
+ });
+ }
removeToken();
store.commit("LOGIN_IS_SHOW", true);
store.commit("ADVERT_IS_SHOW", true);
@@ -134,14 +137,17 @@ reqAxios.interceptors.response.use(
});
}
if (err.response.status == 401) {
+ const token = getToken();
+ if (token) {
+ Message({
+ message: "登录过期，请重新登陆",
+ type: "warning",
+ customClass: "log_warning",
+ });
+ }
removeToken();
store.commit("LOGIN_IS_SHOW", true);
store.commit("ADVERT_IS_SHOW", true);
- Message({
- message: "登录过期，请重新登陆",
- type: "warning",
- customClass: "log_warning",
- });
}
}
);
diff --git a/ruoyi-ui/.env.production b/ruoyi-ui/.env.production
index 71251b8..7c72ea1 100644
--- a/ruoyi-ui/.env.production
+++ b/ruoyi-ui/.env.production
@@ -1,9 +1,9 @@
# 页面标题
-VUE_APP_TITLE = WildCS2
+VUE_APP_TITLE = 后台管理系统
# 生产环境配置
ENV = 'production'
# skins管理系统/生产环境
# VUE_APP_BASE_API = 'http://8.160.181.6:8081'
-VUE_APP_BASE_API = 'https://hou.wildcs2.com'
+VUE_APP_BASE_API = 'http://156.238.240.18:8081'
diff --git a/ruoyi-ui/src/api/skins/ttOrnaments/api.js b/ruoyi-ui/src/api/skins/ttOrnaments/api.js
index 1a818ab..0c677fd 100644
--- a/ruoyi-ui/src/api/skins/ttOrnaments/api.js
+++ b/ruoyi-ui/src/api/skins/ttOrnaments/api.js
@@ -20,7 +20,7 @@ export function getOrnaments(id) {
// 新增饰品数据
export function addOrnaments(data) {
return request({
- url: '/admin/ornaments',
+ url: '/admin/ornaments/addTtOrnament',
method: 'post',
data: data
})
@@ -37,8 +37,8 @@ export function grantOrnaments(data,userId,ornamentsId,num) {
// 修改饰品数据
export function updateOrnaments(data) {
return request({
- url: '/admin/ornaments',
- method: 'put',
+ url: '/admin/ornaments/editTtOrnament',
+ method: 'post',
data: data
})
}
diff --git a/ruoyi-ui/src/views/skins/ttOrnaments/index.vue b/ruoyi-ui/src/views/skins/ttOrnaments/index.vue
index 67dce9e..07aa3c4 100644
--- a/ruoyi-ui/src/views/skins/ttOrnaments/index.vue
+++ b/ruoyi-ui/src/views/skins/ttOrnaments/index.vue
@@ -14,26 +14,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -48,6 +28,15 @@
+
+ 新增饰品
+
-
-
- {{ scope.row.exteriorName || '无涂装' }}
-
-
-
- {{ scope.row.rarityName }}
-
-
-
+
+
-
-
- {{ scope.row.typeName }}
-
-
-
-
+
- 发放饰品
- 详情
+ 编辑
@@ -184,60 +153,24 @@
-
-
-
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
@@ -538,39 +471,13 @@ export default {
},
// 表单重置
reset() {
- this.queryParams.id = "";
- this.queryParams.itemName = "";
- this.queryParams.isPutaway = "";
- this.queryParams.exterior = "";
- this.queryParams.maxPrice = "";
- this.queryParams.minPrice = "";
- this.queryParams.type = "";
- this.getList();
this.form = {
id: null,
- itemName: null,
+ name: null,
usePrice: null,
imageUrl: null,
- marketHashName: null,
- itemId: null,
- price: null,
- shortName: null,
- type: null,
- typeName: null,
- quality: null,
- qualityName: null,
- qualityColor: null,
- rarity: null,
- rarityName: null,
- rarityColor: null,
- exterior: null,
- exteriorName: null,
- createTime: null,
- updateTime: null,
- remark: null,
- isPutaway: null
+ updateTime: null
};
- this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
@@ -619,12 +526,16 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
- const id = row.id || this.ids;
- getOrnaments(id).then(response => {
- this.form = response.data;
- this.open = true;
- this.title = "修改饰品数据";
- });
+ this.form = {
+ id: row.id,
+ marketHashName: row.marketHashName,
+ name: row.name,
+ usePrice: row.usePrice,
+ imageUrl: row.imageUrl,
+ updateTime: row.updateTime
+ };
+ this.open = true;
+ this.title = "修改饰品数据";
},
/** 提交按钮 */
submitForm() {
diff --git a/ruoyi-ui/src/views/skins/ttRoll/index.vue b/ruoyi-ui/src/views/skins/ttRoll/index.vue
index 588f8d1..99635c9 100644
--- a/ruoyi-ui/src/views/skins/ttRoll/index.vue
+++ b/ruoyi-ui/src/views/skins/ttRoll/index.vue
@@ -81,8 +81,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
搜索
重置
@@ -107,14 +71,6 @@
v-hasPermi="['admin:user:export']"
>导出
-
- 生成招商账号
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- LV{{scope.row.promotionLevel }}
-
-
- VIP{{scope.row.vipLevel }}
-
{{ parseTime(scope.row.loginDate, "{y}-{m}-{d}") }}
-
-
-
- 统计
- 背包
-
- 更多
-
- 修改
- 详情
- 重置余额积分
- 删除
- 真删除
-
-
-
-
diff --git a/skins-service/service-admin/src/main/java/com/ruoyi/admin/controller/TtOrnamentsController.java b/skins-service/service-admin/src/main/java/com/ruoyi/admin/controller/TtOrnamentsController.java
index 1043a24..403063e 100644
--- a/skins-service/service-admin/src/main/java/com/ruoyi/admin/controller/TtOrnamentsController.java
+++ b/skins-service/service-admin/src/main/java/com/ruoyi/admin/controller/TtOrnamentsController.java
@@ -65,6 +65,24 @@ public class TtOrnamentsController extends BaseController {
return ornamentsService.grantOrnaments(userId, ornamentsId, ornamentsLevelId, num);
}
+ @ApiOperation("新增饰品")
+ @PostMapping("/addTtOrnament")
+ public AjaxResult add(@RequestBody TtOrnament ttOrnament) {
+ if (ttOrnament.getId() == null) {
+ ttOrnament.setId(System.currentTimeMillis());
+ }
+ if (ttOrnament.getMarketHashName() == null){
+ ttOrnament.setMarketHashName(String.valueOf(System.currentTimeMillis()));
+ }
+ return toAjax(ornamentsService.save(ttOrnament));
+ }
+
+ @ApiOperation("修改饰品")
+ @PostMapping("/editTtOrnament")
+ public AjaxResult edit(@RequestBody TtOrnament ttOrnament) {
+ return toAjax(ornamentsService.updateById(ttOrnament));
+ }
+
@PutMapping("/updateOrnamentPrice")
public AjaxResult updateOrnamentPrice(@RequestBody TtOrnamentsPrice ttOrnamentsPrice) {
return ornamentsService.updateOrnamentPrice(ttOrnamentsPrice.getId(), ttOrnamentsPrice.getPrice());