Browse Source

中文簡體修改為中文繁體

lyhzzz 2 years ago
parent
commit
c0f5884052
26 changed files with 103 additions and 103 deletions
  1. 3 3
      README.md
  2. 1 1
      src/main/java/com/cdf/business/LoginService.java
  3. 10 10
      src/main/java/com/cdf/common/ResultCode.java
  4. 7 7
      src/main/java/com/cdf/controller/api/PageDataApiController.java
  5. 1 1
      src/main/java/com/cdf/controller/back/LoginController.java
  6. 6 6
      src/main/java/com/cdf/controller/back/SceneBackController.java
  7. 6 6
      src/main/java/com/cdf/controller/back/ShopBackController.java
  8. 6 6
      src/main/java/com/cdf/controller/back/ShopCategoryController.java
  9. 6 6
      src/main/java/com/cdf/controller/back/SysDeptController.java
  10. 2 2
      src/main/java/com/cdf/controller/back/SysMenuController.java
  11. 2 2
      src/main/java/com/cdf/controller/back/SysRoleController.java
  12. 9 9
      src/main/java/com/cdf/controller/back/SysUserController.java
  13. 1 1
      src/main/java/com/cdf/controller/back/TestController.java
  14. 6 6
      src/main/java/com/cdf/controller/back/VideoBackController.java
  15. 5 5
      src/main/java/com/cdf/controller/service/FdkkSceneEditController.java
  16. 1 1
      src/main/java/com/cdf/entity/NumRegion.java
  17. 3 3
      src/main/java/com/cdf/entity/User.java
  18. 3 3
      src/main/java/com/cdf/httpClient/client/CdfClient.java
  19. 11 11
      src/main/java/com/cdf/httpClient/client/FdkkClient.java
  20. 2 2
      src/main/java/com/cdf/httpClient/request/FdkkSceneFolderRequest.java
  21. 1 1
      src/main/java/com/cdf/response/ShopVo.java
  22. 2 2
      src/main/java/com/cdf/service/impl/FdkkSceneEditService.java
  23. 1 1
      src/main/java/com/cdf/util/Base64Converter.java
  24. 4 4
      src/main/java/com/cdf/util/JwtUtil.java
  25. 2 2
      src/main/java/com/cdf/util/UploadToCdfOssUtil.java
  26. 2 2
      src/main/java/com/cdf/util/UploadToFdkkOssUtil.java

+ 3 - 3
README.md

@@ -20,10 +20,10 @@
 
 
 ###**v2.0.1** 
 ###**v2.0.1** 
 ~~~~
 ~~~~
-1.h5获取店铺列表根据分类Id    /api/getShopByCategory
+1.h5获取店鋪列表根据分類Id    /api/getShopByCategory
     添加参数deptId  不传默认澳门  
     添加参数deptId  不传默认澳门  
-2.添加接口 根据景码获取组织和区域信息 /api/getDeptIdByNum
-3.h5获取开场视频  /api/getVideo
+2.添加接口 根据景码获取组织和区域信息 /api/getDeptIdByNum
+3.h5获取開場視頻  /api/getVideo
     添加参数 deptId
     添加参数 deptId
 4.添加香港商品列表接口 /back/product/HKList
 4.添加香港商品列表接口 /back/product/HKList
 5页面统计 /api/point
 5页面统计 /api/point

+ 1 - 1
src/main/java/com/cdf/business/LoginService.java

@@ -42,7 +42,7 @@ public class LoginService {
     private RedisUtil redisUtil;
     private RedisUtil redisUtil;
 
 
     public LoginResponse  login(LoginRequest param) {
     public LoginResponse  login(LoginRequest param) {
-        //对前端传的密解密
+        //对前端传的密解密
         String password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         String password = Base64Converter.decode(Base64Converter.subText(param.getPassword()));
         String passwordMd5 = SecurityUtil.MD52(password);
         String passwordMd5 = SecurityUtil.MD52(password);
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();

+ 10 - 10
src/main/java/com/cdf/common/ResultCode.java

@@ -5,24 +5,24 @@ public enum ResultCode {
     ERROR(-1,"操作失败"),
     ERROR(-1,"操作失败"),
 
 
     NOT_LOGIN(2001,"请重新登录!"),
     NOT_LOGIN(2001,"请重新登录!"),
-    USER_NOT_EXIST(2002,"用不存在!"),
-    FD_USER_NOT_EXIST(2003,"四维用不存在!"),
+    USER_NOT_EXIST(2002,"用不存在!"),
+    FD_USER_NOT_EXIST(2003,"四维用不存在!"),
     PHONE_EXIST(2004,"手机号码已注册!"),
     PHONE_EXIST(2004,"手机号码已注册!"),
     OTHER_LOGIN(2005,"登录信息失效请重新登录!"),
     OTHER_LOGIN(2005,"登录信息失效请重新登录!"),
-    PASSWORD_ERROR(2006,"账号或密错误!"),
-    FD_NUM_ERROR(2007,"获取四维景失败!"),
-    FD_USER_ERROR(2008,"景不在设定账号中!"),
+    PASSWORD_ERROR(2006,"账号或密错误!"),
+    FD_NUM_ERROR(2007,"获取四维景失败!"),
+    FD_USER_ERROR(2008,"景不在设定账号中!"),
 
 
     NOT_RECORD(4001,"没有记录"),
     NOT_RECORD(4001,"没有记录"),
     PARAM_MISS(40002,"参数缺失!"),
     PARAM_MISS(40002,"参数缺失!"),
-    NOT_PERM(5014,"您没有该场景的编辑权限!"),
+    NOT_PERM(5014,"您没有该場景的編輯权限!"),
 
 
-    OLD_PASSWORD_ERROR(50001,"原密错误!"),
-    OLD_NEW_PASSWORD_EQ(50002,"原密码与新密码一致无需更改!"),
+    OLD_PASSWORD_ERROR(50001,"原密错误!"),
+    OLD_NEW_PASSWORD_EQ(50002,"原密碼与新密碼一致无需更改!"),
 
 
     NOT_DELETE_PARENT_DEPT(6001,"集团总部不可删除"),
     NOT_DELETE_PARENT_DEPT(6001,"集团总部不可删除"),
-    NOT_DELETE_DEPT_USER(6002,"请先删除专柜下用"),
-    NOT_DELETE_DEPT_SHOP(6003,"请先删除专柜下店"),
+    NOT_DELETE_DEPT_USER(6002,"请先删除专柜下用"),
+    NOT_DELETE_DEPT_SHOP(6003,"请先删除专柜下店"),
 
 
     UPLOAD_ERROR(7001,"文件上传失败"),
     UPLOAD_ERROR(7001,"文件上传失败"),
     UPLOAD_FILE_NO_EXIST(7002,"上传文件不存在"),
     UPLOAD_FILE_NO_EXIST(7002,"上传文件不存在"),

+ 7 - 7
src/main/java/com/cdf/controller/api/PageDataApiController.java

@@ -72,10 +72,10 @@ public class PageDataApiController {
         }
         }
         pageData.setUrl(whereUrl);
         pageData.setUrl(whereUrl);
         switch (type){
         switch (type){
-            case 0:     //用打开页面
+            case 0:     //用打开页面
                 pageData.setInPageTime(DateUtil.getDateTime(new Date()));
                 pageData.setInPageTime(DateUtil.getDateTime(new Date()));
                 break;
                 break;
-            case 1:     //用离开页面
+            case 1:     //用离开页面
                 if(pageData.getInPageTime() == null){
                 if(pageData.getInPageTime() == null){
                     pageData.setInPageTime(DateUtil.getFirstDay(new Date()));
                     pageData.setInPageTime(DateUtil.getFirstDay(new Date()));
                 }
                 }
@@ -83,22 +83,22 @@ public class PageDataApiController {
                 long time = DateUtil.getDateTime(pageData.getInPageTime());
                 long time = DateUtil.getDateTime(pageData.getInPageTime());
                 pageData.setStopTime(new Date().getTime() - time );
                 pageData.setStopTime(new Date().getTime() - time );
                 break;
                 break;
-            case 2:     //用点击寻宝游戏
+            case 2:     //用点击寻宝游戏
                 pageData.setIsClickGame(1);
                 pageData.setIsClickGame(1);
                 break;
                 break;
-            case 3:     //用点击商品详情
+            case 3:     //用点击商品详情
                 if(deptId == 22){
                 if(deptId == 22){
                     sendCdf(productId,cookieId,AccessToken,userId);
                     sendCdf(productId,cookieId,AccessToken,userId);
                 }
                 }
                 pageData.setIsClickShop(1);
                 pageData.setIsClickShop(1);
                 break;
                 break;
-            case 4:     //用户点击场景点位
+            case 4:     //用戶点击場景点位
                 pageData.setStepNum( pageData.getStepNum() + 1);
                 pageData.setStepNum( pageData.getStepNum() + 1);
                 break;
                 break;
-            case 5:     //用点击真人视频
+            case 5:     //用点击真人视频
                 pageData.setVideoNum( pageData.getVideoNum() + 1);
                 pageData.setVideoNum( pageData.getVideoNum() + 1);
                 break;
                 break;
-            case 6:     //用点击收藏
+            case 6:     //用点击收藏
             case 7:     //加入购物车
             case 7:     //加入购物车
                 if(deptId == 22){
                 if(deptId == 22){
                     sendCdf(productId,cookieId,AccessToken,userId);
                     sendCdf(productId,cookieId,AccessToken,userId);

+ 1 - 1
src/main/java/com/cdf/controller/back/LoginController.java

@@ -16,7 +16,7 @@ public class LoginController {
     private LoginService loginService;
     private LoginService loginService;
 
 
     @PostMapping("/login")
     @PostMapping("/login")
-    @SysLog(value = "登录系统",logType = "登录")
+    @SysLog(value = "登入系統",logType = "登入")
     ResultData login(@RequestBody LoginRequest param){
     ResultData login(@RequestBody LoginRequest param){
         return ResultData.ok(loginService.login(param));
         return ResultData.ok(loginService.login(param));
     }
     }

+ 6 - 6
src/main/java/com/cdf/controller/back/SceneBackController.java

@@ -22,7 +22,7 @@ public class SceneBackController {
     private FdkkSceneService fdkkSceneService;
     private FdkkSceneService fdkkSceneService;
 
 
     @PostMapping("/list")
     @PostMapping("/list")
-    @SysLog(logType = "查看场景列表",value = "场景管理")
+    @SysLog(logType = "查看場景清單",value = "場景管理")
     public ResultData list (@RequestBody FdkkSceneListRequest param, @RequestHeader String token ){
     public ResultData list (@RequestBody FdkkSceneListRequest param, @RequestHeader String token ){
         return ResultData.ok(fdkkSceneService.list(param,token));
         return ResultData.ok(fdkkSceneService.list(param,token));
     }
     }
@@ -35,7 +35,7 @@ public class SceneBackController {
     }
     }
 
 
     @PostMapping("/delete")
     @PostMapping("/delete")
-    @SysLog(logType = "景管理",value = "删除")
+    @SysLog(logType = "景管理",value = "删除")
     public ResultData delete (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
     public ResultData delete (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.delete(param,token);
         fdkkSceneService.delete(param,token);
         return ResultData.ok();
         return ResultData.ok();
@@ -48,25 +48,25 @@ public class SceneBackController {
     }
     }
 
 
     @PostMapping("/folderSave")
     @PostMapping("/folderSave")
-    @SysLog(logType = "场景管理",value = "新建文件夹")
+    @SysLog(logType = "場景管理",value = "新建資料夾")
     public ResultData folderSave (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
     public ResultData folderSave (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.folderSave(param,token);
         fdkkSceneService.folderSave(param,token);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/folderUpdate")
     @PostMapping("/folderUpdate")
-    @SysLog(logType = "场景管理",value = "文件夹重命名")
+    @SysLog(logType = "場景管理",value = "資料夾重命名")
     public ResultData folderUpdate (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
     public ResultData folderUpdate (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.folderUpdate(param,token);
         fdkkSceneService.folderUpdate(param,token);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/folderDelete")
     @PostMapping("/folderDelete")
-    @SysLog(logType = "场景管理",value = "文件夹删除")
+    @SysLog(logType = "場景管理",value = "資料夾删除")
     public ResultData folderDelete (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
     public ResultData folderDelete (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.folderDelete(param,token);
         fdkkSceneService.folderDelete(param,token);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/move")
     @PostMapping("/move")
-    @SysLog(logType = "场景管理",value = "移动")
+    @SysLog(logType = "場景管理",value = "移動")
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
     public ResultData move (@RequestBody FdkkSceneFolderRequest param, @RequestHeader String token ){
         fdkkSceneService.move(param,token);
         fdkkSceneService.move(param,token);
         return ResultData.ok();
         return ResultData.ok();

+ 6 - 6
src/main/java/com/cdf/controller/back/ShopBackController.java

@@ -51,18 +51,18 @@ public class ShopBackController extends BaseLogController{
     public ResultData saveOrUpdate(@RequestBody Shop shop){
     public ResultData saveOrUpdate(@RequestBody Shop shop){
         String info = null;
         String info = null;
         if(shop.getId()== null){
         if(shop.getId()== null){
-            info = String.format(LogInfoKey.baseInfo,"新增",shop.getShopName(),"店");
+            info = String.format(LogInfoKey.baseInfo,"新增",shop.getShopName(),"店");
         }else {
         }else {
-            info = String.format(LogInfoKey.baseInfo,"编辑",shop.getShopName(),"店铺");
+            info = String.format(LogInfoKey.baseInfo,"編輯",shop.getShopName(),"店鋪");
             shop.setCreateTime(null);
             shop.setCreateTime(null);
             shop.setUpdateTime(null);
             shop.setUpdateTime(null);
         }
         }
-        logService.addLog("店管理",info,getIp(),getToken());
+        logService.addLog("店管理",info,getIp(),getToken());
         shopService.saveOrUpdate(shop);
         shopService.saveOrUpdate(shop);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/list")
     @PostMapping("/list")
-    @SysLog(logType = "店铺管理",value = "查看店铺列表")
+    @SysLog(logType = "店鋪管理",value = "查看店鋪清單")
     public ResultData list(@RequestBody ShopRequest param){
     public ResultData list(@RequestBody ShopRequest param){
         param.setToken(getToken());
         param.setToken(getToken());
         PageInfo pageInfo = shopService.pageList(param);
         PageInfo pageInfo = shopService.pageList(param);
@@ -77,8 +77,8 @@ public class ShopBackController extends BaseLogController{
         Shop shop = shopService.getById(param.getId());
         Shop shop = shopService.getById(param.getId());
         if(shop!=null){
         if(shop!=null){
             shopService.removeById(param.getId());
             shopService.removeById(param.getId());
-            String info = String.format(LogInfoKey.baseInfo,"删除",shop.getShopName(),"店");
-            logService.addLog("店管理",info,getIp(),getToken());
+            String info = String.format(LogInfoKey.baseInfo,"删除",shop.getShopName(),"店");
+            logService.addLog("店管理",info,getIp(),getToken());
         }
         }
         return ResultData.ok();
         return ResultData.ok();
     }
     }

+ 6 - 6
src/main/java/com/cdf/controller/back/ShopCategoryController.java

@@ -33,13 +33,13 @@ public class ShopCategoryController extends BaseLogController{
     public ResultData saveOrUpdate(@RequestBody ShopCategory shopCategory){
     public ResultData saveOrUpdate(@RequestBody ShopCategory shopCategory){
         String info = null;
         String info = null;
         if(shopCategory.getId()== null){
         if(shopCategory.getId()== null){
-            info = String.format(LogInfoKey.baseInfo,"新增",shopCategory.getCategoryName(),"分");
+            info = String.format(LogInfoKey.baseInfo,"新增",shopCategory.getCategoryName(),"分");
         }else {
         }else {
-            info = String.format(LogInfoKey.baseInfo,"编辑",shopCategory.getCategoryName(),"分类");
+            info = String.format(LogInfoKey.baseInfo,"編輯",shopCategory.getCategoryName(),"分類");
             shopCategory.setCreateTime(null);
             shopCategory.setCreateTime(null);
             shopCategory.setUpdateTime(null);
             shopCategory.setUpdateTime(null);
         }
         }
-        logService.addLog("店铺分类",info,getIp(),getToken());
+        logService.addLog("店鋪分類",info,getIp(),getToken());
         shopCategoryService.saveOrUpdate(shopCategory);
         shopCategoryService.saveOrUpdate(shopCategory);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
@@ -51,13 +51,13 @@ public class ShopCategoryController extends BaseLogController{
         ShopCategory shopCategory1 = shopCategoryService.getById(shopCategory.getId());
         ShopCategory shopCategory1 = shopCategoryService.getById(shopCategory.getId());
         if(shopCategory1!=null){
         if(shopCategory1!=null){
             shopCategoryService.removeById(shopCategory.getId());
             shopCategoryService.removeById(shopCategory.getId());
-            String info = String.format(LogInfoKey.baseInfo,"删除",shopCategory1.getCategoryName(),"分");
-            logService.addLog("店铺分类",info,getIp(),getToken());
+            String info = String.format(LogInfoKey.baseInfo,"删除",shopCategory1.getCategoryName(),"分");
+            logService.addLog("店鋪分類",info,getIp(),getToken());
         }
         }
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/list")
     @PostMapping("/list")
-    @SysLog(logType = "店铺分类",value = "查看分类列表")
+    @SysLog(logType = "店鋪分類",value = "查看分類列表")
     public ResultData list(@RequestBody BaseRequest param){
     public ResultData list(@RequestBody BaseRequest param){
         Page<ShopCategory> page = shopCategoryService.page(new Page<>(param.getPageNum(), param.getPageSize()));
         Page<ShopCategory> page = shopCategoryService.page(new Page<>(param.getPageNum(), param.getPageSize()));
         return ResultData.ok(PageInfo.PageInfo(page));
         return ResultData.ok(PageInfo.PageInfo(page));

+ 6 - 6
src/main/java/com/cdf/controller/back/SysDeptController.java

@@ -52,13 +52,13 @@ public class SysDeptController extends BaseLogController{
         }
         }
         String info = null;
         String info = null;
         if(dept.getId()== null){
         if(dept.getId()== null){
-            info = String.format(LogInfoKey.baseInfo,"新增",dept.getDeptName(),"组织架构");
+            info = String.format(LogInfoKey.baseInfo,"新增",dept.getDeptName(),"組織架構");
         }else {
         }else {
-            info = String.format(LogInfoKey.baseInfo,"编辑",dept.getDeptName(),"组织架构");
+            info = String.format(LogInfoKey.baseInfo,"編輯",dept.getDeptName(),"組織架構");
             dept.setCreateTime(null);
             dept.setCreateTime(null);
             dept.setUpdateTime(null);
             dept.setUpdateTime(null);
         }
         }
-        logService.addLog("组织架构",info,getIp(),getToken());
+        logService.addLog("組織架構",info,getIp(),getToken());
         deptService.saveOrUpdate(dept);
         deptService.saveOrUpdate(dept);
         return ResultData.ok(dept);
         return ResultData.ok(dept);
     }
     }
@@ -87,14 +87,14 @@ public class SysDeptController extends BaseLogController{
         Dept byId = deptService.getById(dept.getId());
         Dept byId = deptService.getById(dept.getId());
         if(byId !=null){
         if(byId !=null){
             deptService.removeById(dept.getId());
             deptService.removeById(dept.getId());
-            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getDeptName(),"组织架构");
-            logService.addLog("组织架构",info,getIp(),getToken());
+            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getDeptName(),"組織架構");
+            logService.addLog("組織架構",info,getIp(),getToken());
         }
         }
         return ResultData.ok();
         return ResultData.ok();
     }
     }
 
 
     @PostMapping("/allList")
     @PostMapping("/allList")
-    @SysLog(logType = "组织架构",value = "查看组织架构")
+    @SysLog(logType = "組織架構",value = "查看組織架構")
     public ResultData list(){
     public ResultData list(){
         Integer id = JwtUtil.getId(getToken());
         Integer id = JwtUtil.getId(getToken());
         User user = userService.getById(id);
         User user = userService.getById(id);

+ 2 - 2
src/main/java/com/cdf/controller/back/SysMenuController.java

@@ -33,7 +33,7 @@ public class SysMenuController {
     private IUserService userService;
     private IUserService userService;
 
 
     @PostMapping("/saveOrUpdate")
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "系统菜单",value = "新增或修改")
+    @SysLog(logType = "系統菜單",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody Menu menu){
     public ResultData saveOrUpdate(@RequestBody Menu menu){
         menu.setCreateTime(null);
         menu.setCreateTime(null);
         menu.setUpdateTime(null);
         menu.setUpdateTime(null);
@@ -41,7 +41,7 @@ public class SysMenuController {
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/delete")
     @PostMapping("/delete")
-    @SysLog(logType = "系统菜单",value = "删除")
+    @SysLog(logType = "系統菜單",value = "删除")
     public ResultData delete(@RequestBody Menu menu){
     public ResultData delete(@RequestBody Menu menu){
         menuService.removeById(menu);
         menuService.removeById(menu);
         return ResultData.ok();
         return ResultData.ok();

+ 2 - 2
src/main/java/com/cdf/controller/back/SysRoleController.java

@@ -32,7 +32,7 @@ public class SysRoleController {
     private IRoleMenuService roleMenuService;
     private IRoleMenuService roleMenuService;
 
 
     @PostMapping("/saveOrUpdate")
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "系角色",value = "新增或修改")
+    @SysLog(logType = "系角色",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody Role role){
     public ResultData saveOrUpdate(@RequestBody Role role){
         role.setCreateTime(null);
         role.setCreateTime(null);
         role.setUpdateTime(null);
         role.setUpdateTime(null);
@@ -41,7 +41,7 @@ public class SysRoleController {
     }
     }
 
 
     @PostMapping("/delete")
     @PostMapping("/delete")
-    @SysLog(logType = "系角色",value = "删除")
+    @SysLog(logType = "系角色",value = "删除")
     public ResultData delete(@RequestBody Role role){
     public ResultData delete(@RequestBody Role role){
         roleService.removeById(role.getId());
         roleService.removeById(role.getId());
         return ResultData.ok();
         return ResultData.ok();

+ 9 - 9
src/main/java/com/cdf/controller/back/SysUserController.java

@@ -49,7 +49,7 @@ public class SysUserController extends BaseLogController {
     }
     }
 
 
     @PostMapping("/saveOrUpdate")
     @PostMapping("/saveOrUpdate")
-    @SysLog(logType = "用管理",value = "新增或修改")
+    @SysLog(logType = "用管理",value = "新增或修改")
     public ResultData saveOrUpdate(@RequestBody User user){
     public ResultData saveOrUpdate(@RequestBody User user){
         Integer userId = JwtUtil.getId(getToken());
         Integer userId = JwtUtil.getId(getToken());
         User createUser = userService.getById(userId);
         User createUser = userService.getById(userId);
@@ -75,19 +75,19 @@ public class SysUserController extends BaseLogController {
        }
        }
         String info = null;
         String info = null;
         if(user.getId()== null){
         if(user.getId()== null){
-            info = String.format(LogInfoKey.baseInfo,"新增",user.getNickName(),"用");
+            info = String.format(LogInfoKey.baseInfo,"新增",user.getNickName(),"用");
         }else {
         }else {
-            info = String.format(LogInfoKey.baseInfo,"编辑",user.getNickName(),"用户");
+            info = String.format(LogInfoKey.baseInfo,"編輯",user.getNickName(),"用戶");
             user.setCreateTime(null);
             user.setCreateTime(null);
             user.setUpdateTime(null);
             user.setUpdateTime(null);
         }
         }
-        logService.addLog("用管理",info,getIp(),getToken());
+        logService.addLog("用管理",info,getIp(),getToken());
         userService.saveOrUpdate(user);
         userService.saveOrUpdate(user);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
 
 
     @PostMapping("/list")
     @PostMapping("/list")
-    @SysLog(logType = "用户管理",value = "查看用户列表")
+    @SysLog(logType = "用戶管理",value = "查看用戶列表")
     public ResultData list(@RequestBody UserRequest param){
     public ResultData list(@RequestBody UserRequest param){
         param.setToken(getToken());
         param.setToken(getToken());
         PageInfo<UserVo> page = userService.getPageByParam(param);
         PageInfo<UserVo> page = userService.getPageByParam(param);
@@ -102,13 +102,13 @@ public class SysUserController extends BaseLogController {
         User byId = userService.getById(param.getId());
         User byId = userService.getById(param.getId());
         if(byId !=null){
         if(byId !=null){
             userService.removeById(param.getId());
             userService.removeById(param.getId());
-            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getNickName(),"用");
-            logService.addLog("用管理",info,getIp(),getToken());
+            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getNickName(),"用");
+            logService.addLog("用管理",info,getIp(),getToken());
         }
         }
         return ResultData.ok();
         return ResultData.ok();
     }
     }
     @PostMapping("/rePassword")
     @PostMapping("/rePassword")
-    @SysLog(logType = "用户管理",value = "重置密码")
+    @SysLog(logType = "用戶管理",value = "重置密碼")
     public ResultData rePassword(@RequestBody UserRequest param){
     public ResultData rePassword(@RequestBody UserRequest param){
         if(param.getId() == null){
         if(param.getId() == null){
             throw new BusinessException(ResultCode.PARAM_MISS);
             throw new BusinessException(ResultCode.PARAM_MISS);
@@ -121,7 +121,7 @@ public class SysUserController extends BaseLogController {
     }
     }
 
 
     @PostMapping("/updatePassword")
     @PostMapping("/updatePassword")
-    @SysLog(logType = "用户管理",value = "修改密码")
+    @SysLog(logType = "用戶管理",value = "修改密碼")
     public ResultData updatePassword(@RequestBody UserUpdateRequest param, @RequestHeader String token){
     public ResultData updatePassword(@RequestBody UserUpdateRequest param, @RequestHeader String token){
         Integer userId = JwtUtil.getId(token);
         Integer userId = JwtUtil.getId(token);
         User user = userService.getById(userId);
         User user = userService.getById(userId);

+ 1 - 1
src/main/java/com/cdf/controller/back/TestController.java

@@ -117,7 +117,7 @@ public class TestController {
         param.setPageSize(1000);
         param.setPageSize(1000);
         PageInfo pageInfo = shopService.pageList(param);
         PageInfo pageInfo = shopService.pageList(param);
         List<ShopVo> list = (List<ShopVo>) pageInfo.getList();
         List<ShopVo> list = (List<ShopVo>) pageInfo.getList();
-        this.commonExport(request,response,"店列表",list,ShopVo.class);
+        this.commonExport(request,response,"店列表",list,ShopVo.class);
 
 
     }
     }
 
 

+ 6 - 6
src/main/java/com/cdf/controller/back/VideoBackController.java

@@ -55,20 +55,20 @@ public class VideoBackController extends BaseLogController{
             User user = userService.getById(JwtUtil.getId(getToken()));
             User user = userService.getById(JwtUtil.getId(getToken()));
             FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
             FdkkUser fdkkUser = fdkkUserService.getById(user.getFdkkUserId());
             video.setDeptId(fdkkUser.getDeptId());
             video.setDeptId(fdkkUser.getDeptId());
-            info = String.format(LogInfoKey.baseInfo,"新增",video.getVideoName(),"开场视频");
+            info = String.format(LogInfoKey.baseInfo,"新增",video.getVideoName(),"開場視頻");
         }else {
         }else {
-            info = String.format(LogInfoKey.baseInfo,"编辑",video.getVideoName(),"开场视频");
+            info = String.format(LogInfoKey.baseInfo,"編輯",video.getVideoName(),"開場視頻");
             video.setDeptId(null);
             video.setDeptId(null);
             video.setCreateTime(null);
             video.setCreateTime(null);
             video.setUpdateTime(null);
             video.setUpdateTime(null);
         }
         }
-        logService.addLog("开场视频",info,getIp(),getToken());
+        logService.addLog("開場視頻",info,getIp(),getToken());
         videoService.saveOrUpdate(video);
         videoService.saveOrUpdate(video);
         return ResultData.ok();
         return ResultData.ok();
     }
     }
 
 
     @PostMapping("/list")
     @PostMapping("/list")
-    @SysLog(logType = "开场视频",value = "查看视频列表")
+    @SysLog(logType = "開場視頻",value = "查看視頻清單")
     public ResultData list (@RequestBody VideoParam param){
     public ResultData list (@RequestBody VideoParam param){
         LambdaQueryWrapper<Video> wrapper = new LambdaQueryWrapper<>();
         LambdaQueryWrapper<Video> wrapper = new LambdaQueryWrapper<>();
 
 
@@ -89,8 +89,8 @@ public class VideoBackController extends BaseLogController{
         Video byId = videoService.getById(param.getId());
         Video byId = videoService.getById(param.getId());
         if(byId !=null){
         if(byId !=null){
             videoService.removeById(param.getId());
             videoService.removeById(param.getId());
-            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getVideoName(),"开场视频");
-            logService.addLog("开场视频",info,getIp(),getToken());
+            String info = String.format(LogInfoKey.baseInfo,"删除",byId.getVideoName(),"開場視頻");
+            logService.addLog("開場視頻",info,getIp(),getToken());
         }
         }
         return ResultData.ok();
         return ResultData.ok();
     }
     }

+ 5 - 5
src/main/java/com/cdf/controller/service/FdkkSceneEditController.java

@@ -41,14 +41,14 @@ public class FdkkSceneEditController extends BaseLogController {
         FdkkResponse fdkkResponse = fdkkSceneEditService.saveTag(fdkkHotRequest, token);
         FdkkResponse fdkkResponse = fdkkSceneEditService.saveTag(fdkkHotRequest, token);
 
 
         String title = fdkkSceneEditService.getHotTitle(fdkkHotRequest.getHotDataList());
         String title = fdkkSceneEditService.getHotTitle(fdkkHotRequest.getHotDataList());
-        String info = String.format(LogInfoKey.baseInfo,"热点新增或编辑",title,"热点");
-        logService.addLog("景管理",info,getIp(),getToken());
+        String info = String.format(LogInfoKey.baseInfo,"熱點新增或編輯",title,"熱點");
+        logService.addLog("景管理",info,getIp(),getToken());
 
 
         return ResultData.ok(fdkkResponse.getMsg(),fdkkResponse.getData());
         return ResultData.ok(fdkkResponse.getMsg(),fdkkResponse.getData());
     }
     }
 
 
     @PostMapping("/tag/delete")
     @PostMapping("/tag/delete")
-    @SysLog(logType = "场景管理",value = "热点删除")
+    @SysLog(logType = "場景管理",value = "熱點刪除")
     public ResultData delete(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
     public ResultData delete(@RequestBody FdkkHotRequest fdkkHotRequest, @RequestHeader String token){
         fdkkSceneEditService.deleteTag(fdkkHotRequest,token);
         fdkkSceneEditService.deleteTag(fdkkHotRequest,token);
         return ResultData.ok();
         return ResultData.ok();
@@ -70,8 +70,8 @@ public class FdkkSceneEditController extends BaseLogController {
     public ResultData scenePublicScene(@RequestBody FdkkHotRequest fdkkHotRequest ,@RequestHeader String token) throws Exception{
     public ResultData scenePublicScene(@RequestBody FdkkHotRequest fdkkHotRequest ,@RequestHeader String token) throws Exception{
         fdkkSceneEditService.publicScene(fdkkHotRequest,token);
         fdkkSceneEditService.publicScene(fdkkHotRequest,token);
         String sceneName = fdkkSceneEditService.getSceneName(fdkkHotRequest.getNum());
         String sceneName = fdkkSceneEditService.getSceneName(fdkkHotRequest.getNum());
-        String info = String.format(LogInfoKey.baseInfo,"发布场景",sceneName,"");
-        logService.addLog("景管理",info,getIp(),getToken());
+        String info = String.format(LogInfoKey.baseInfo,"發佈場景",sceneName,"");
+        logService.addLog("景管理",info,getIp(),getToken());
         return ResultData.ok();
         return ResultData.ok();
     }
     }
 
 

+ 1 - 1
src/main/java/com/cdf/entity/NumRegion.java

@@ -25,7 +25,7 @@ public class NumRegion implements Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
-     * 景码
+     * 景码
      */
      */
     @TableId("num")
     @TableId("num")
     private String num;
     private String num;

+ 3 - 3
src/main/java/com/cdf/entity/User.java

@@ -32,19 +32,19 @@ public class User implements Serializable {
     private String nickName;
     private String nickName;
 
 
     /**
     /**
-     * 用
+     * 用
      */
      */
     @TableField("phone")
     @TableField("phone")
     private String phone;
     private String phone;
 
 
     /**
     /**
-     * 密
+     * 密
      */
      */
     @TableField("password")
     @TableField("password")
     private String password;
     private String password;
 
 
     /**
     /**
-     * 四维看看用id
+     * 四维看看用id
      */
      */
     @TableField("fdkk_user_id")
     @TableField("fdkk_user_id")
     private Integer fdkkUserId;
     private Integer fdkkUserId;

+ 3 - 3
src/main/java/com/cdf/httpClient/client/CdfClient.java

@@ -59,9 +59,9 @@ public interface CdfClient {
     JSONObject inCat(@Var("accessToken") String accessToken, @JSONBody CdfInCatRequest request);
     JSONObject inCat(@Var("accessToken") String accessToken, @JSONBody CdfInCatRequest request);
     /**
     /**
      * 上报商品来源
      * 上报商品来源
-     * 1,用点击进入商品详情时
-     * 2,用点击加入购物车时
-     * 3,用点击加入收藏时
+     * 1,用点击进入商品详情时
+     * 2,用点击加入购物车时
+     * 3,用点击加入收藏时
      */
      */
     @Post(url = "/api/prodextra/channelclick",
     @Post(url = "/api/prodextra/channelclick",
         headers = {
         headers = {

+ 11 - 11
src/main/java/com/cdf/httpClient/client/FdkkClient.java

@@ -28,19 +28,19 @@ public interface FdkkClient {
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse checkToken(@Header("token")  String token);
     FdkkResponse checkToken(@Header("token")  String token);
     /**
     /**
-     * 获取景列表
+     * 获取景列表
      */
      */
     @Post("/api/user/scene/newList")
     @Post("/api/user/scene/newList")
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse sceneList(@JSONBody FdkkSceneListRequest fdkkSceneRequest , @Header("token")  String token);
     FdkkResponse sceneList(@JSONBody FdkkSceneListRequest fdkkSceneRequest , @Header("token")  String token);
     /**
     /**
-     * 获取景列表
+     * 获取景列表
      */
      */
     @Post("/api/user/scene/getOnlySceneList")
     @Post("/api/user/scene/getOnlySceneList")
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse getOnlySceneList(@JSONBody FdkkSceneListRequest fdkkSceneRequest , @Header("token")  String token);
     FdkkResponse getOnlySceneList(@JSONBody FdkkSceneListRequest fdkkSceneRequest , @Header("token")  String token);
     /**
     /**
-     * 删除
+     * 删除
      */
      */
     @Post("/api/user/scene/delete")
     @Post("/api/user/scene/delete")
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
@@ -70,37 +70,37 @@ public interface FdkkClient {
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse folderDelete(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
     FdkkResponse folderDelete(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
     /**
     /**
-     * 移动景,文件夹
+     * 移动景,文件夹
      */
      */
     @Post("/api/user/folder/move")
     @Post("/api/user/folder/move")
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse sceneMove(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
     FdkkResponse sceneMove(@JSONBody FdkkSceneFolderRequest fdkkSceneDeleteRequest , @Header("token")  String token);
     /**
     /**
-     * 全部景列表
+     * 全部景列表
      */
      */
     @Post("/api/user/scene/list")
     @Post("/api/user/scene/list")
     @Address(source = FdkkLoginAddressSource.class)
     @Address(source = FdkkLoginAddressSource.class)
     FdkkResponse getAllScene(@JSONBody FdkkAllSceneRequest fdkkAllSceneRequest,@Header("token")String token);
     FdkkResponse getAllScene(@JSONBody FdkkAllSceneRequest fdkkAllSceneRequest,@Header("token")String token);
     /**
     /**
-     * 添加热点
+     * 添加熱點
      */
      */
     @Post("/service/scene/edit/tag/save")
     @Post("/service/scene/edit/tag/save")
     @Address(source = FdkkSceneAddressSource.class)
     @Address(source = FdkkSceneAddressSource.class)
     FdkkResponse hotSave(@JSONBody FdkkHotRequest fdkkHotRequest, @Header("token")  String token);
     FdkkResponse hotSave(@JSONBody FdkkHotRequest fdkkHotRequest, @Header("token")  String token);
     /**
     /**
-     * 删除热点
+     * 删除熱點
      */
      */
     @Post("/service/scene/edit/tag/delete")
     @Post("/service/scene/edit/tag/delete")
     @Address(source = FdkkSceneAddressSource.class)
     @Address(source = FdkkSceneAddressSource.class)
     FdkkResponse hotDelete(@JSONBody FdkkHotRequest fdkkHotRequest, @Header("token")  String token);
     FdkkResponse hotDelete(@JSONBody FdkkHotRequest fdkkHotRequest, @Header("token")  String token);
     /**
     /**
-     * 获取热点列表
+     * 获取熱點列表
      */
      */
     @Post("/service/scene/edit/tag/list")
     @Post("/service/scene/edit/tag/list")
     @Address(source = FdkkSceneAddressSource.class)
     @Address(source = FdkkSceneAddressSource.class)
     FdkkResponse hotList(@Body SceneRequest sceneRequest, @Header("token")  String token);
     FdkkResponse hotList(@Body SceneRequest sceneRequest, @Header("token")  String token);
     /**
     /**
-     * 场景发布
+     * 場景發佈
      */
      */
     @Post("/service/scene/edit/publicScene")
     @Post("/service/scene/edit/publicScene")
     @Address(source = FdkkSceneAddressSource.class)
     @Address(source = FdkkSceneAddressSource.class)
@@ -113,7 +113,7 @@ public interface FdkkClient {
     FdkkResponse uploadFiles(@Query FdkkUploadRequest fdkkUploadRequest, @DataFile("files") List<String> files, @Header("token")String token);
     FdkkResponse uploadFiles(@Query FdkkUploadRequest fdkkUploadRequest, @DataFile("files") List<String> files, @Header("token")String token);
 
 
     /**
     /**
-     * 获取景详情-查看页面
+     * 获取景详情-查看页面
      */
      */
     @Get("/service/scene/getInfo")
     @Get("/service/scene/getInfo")
     @Address(source = FdkkSceneAddressSource.class)
     @Address(source = FdkkSceneAddressSource.class)
@@ -124,7 +124,7 @@ public interface FdkkClient {
     JSONObject getAuth(@Body HashMap<String,String> param,@Header("token")  String token );
     JSONObject getAuth(@Body HashMap<String,String> param,@Header("token")  String token );
 
 
     /**
     /**
-     * 获取景详情-查看页面
+     * 获取景详情-查看页面
      */
      */
     @Get("/api/laser/getSceneByNum")
     @Get("/api/laser/getSceneByNum")
     @Address(source = FdkkSceneAddressSource.class)
     @Address(source = FdkkSceneAddressSource.class)

+ 2 - 2
src/main/java/com/cdf/httpClient/request/FdkkSceneFolderRequest.java

@@ -8,8 +8,8 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor
 public class FdkkSceneFolderRequest {
 public class FdkkSceneFolderRequest {
-    private String sceneNum;    //删除景使用
-    private Integer type = 2;       //获取景列表使用
+    private String sceneNum;    //删除景使用
+    private Integer type = 2;       //获取景列表使用
     private Integer parentId;
     private Integer parentId;
     private String folderIds;
     private String folderIds;
     private String sceneIds;
     private String sceneIds;

+ 1 - 1
src/main/java/com/cdf/response/ShopVo.java

@@ -16,7 +16,7 @@ public class ShopVo extends Shop {
     @ExcelProperty("组织")
     @ExcelProperty("组织")
     private String deptName;
     private String deptName;
 
 
-    @ExcelProperty("分")
+    @ExcelProperty("分")
     private String categoryName;
     private String categoryName;
 
 
 }
 }

+ 2 - 2
src/main/java/com/cdf/service/impl/FdkkSceneEditService.java

@@ -274,7 +274,7 @@ public class FdkkSceneEditService {
             String sid = tag.getString("sid");
             String sid = tag.getString("sid");
             sidsList.add(sid);
             sidsList.add(sid);
         }
         }
-        List<HotRelation> hotRelations = hotRelationService.listByIds(sidsList); //批量查询热点
+        List<HotRelation> hotRelations = hotRelationService.listByIds(sidsList); //批量查询熱點
         for (HotRelation hotRelation : hotRelations) {
         for (HotRelation hotRelation : hotRelations) {
             hotRelationMap.put(hotRelation.getHotId(),hotRelation);
             hotRelationMap.put(hotRelation.getHotId(),hotRelation);
         }
         }
@@ -286,7 +286,7 @@ public class FdkkSceneEditService {
                 continue;
                 continue;
             }
             }
             tag.put("hotType",hotRelation.getHotType());
             tag.put("hotType",hotRelation.getHotType());
-            //0商品,1优惠劵,2第三方跳转,3瀑布流 ,景关联
+            //0商品,1优惠劵,2第三方跳转,3瀑布流 ,景关联
             if(hotRelation.getHotType() == null){
             if(hotRelation.getHotType() == null){
                 continue;
                 continue;
             }
             }

+ 1 - 1
src/main/java/com/cdf/util/Base64Converter.java

@@ -50,7 +50,7 @@ public class Base64Converter {
     }
     }
 
 
     /**
     /**
-     * 根据逻辑截取加密后的密
+     * 根据逻辑截取加密后的密
      * @param text
      * @param text
      * @return
      * @return
      */
      */

+ 4 - 4
src/main/java/com/cdf/util/JwtUtil.java

@@ -18,8 +18,8 @@ import java.util.UUID;
 public class JwtUtil {
 public class JwtUtil {
 
 
     /**
     /**
-     * 用登录成功后生成Jwt
-     * 使用Hs256算法  私匙使用用户密码
+     * 用登录成功后生成Jwt
+     * 使用Hs256算法  私匙使用用戶密碼
      *
      *
      * @param ttlMillis jwt过期时间
      * @param ttlMillis jwt过期时间
      * @param map      登录成功的user对象
      * @param map      登录成功的user对象
@@ -34,7 +34,7 @@ public class JwtUtil {
         Date now = new Date(nowMillis);
         Date now = new Date(nowMillis);
 
 
         //创建payload的私有声明(根据特定的业务需要添加,如果要拿这个做验证,一般是需要和jwt的接收方提前沟通好验证方式的)
         //创建payload的私有声明(根据特定的业务需要添加,如果要拿这个做验证,一般是需要和jwt的接收方提前沟通好验证方式的)
-        //生成签名的时候使用的秘钥secret,这个方法本地封装了的,一般可以从本地配置文件中读取,切记这个秘钥不能外露哦。它就是你服务端的私钥,在任何场景都不应该流露出去。一旦客户端得知这个secret, 那就意味着客户端是可以自我签发jwt了。
+        //生成签名的时候使用的秘钥secret,这个方法本地封装了的,一般可以从本地配置文件中读取,切记这个秘钥不能外露哦。它就是你服务端的私钥,在任何場景都不应该流露出去。一旦客戶端得知这个secret, 那就意味着客戶端是可以自我签发jwt了。
         String key = getKey();
         String key = getKey();
 
 
         //生成签发人
         //生成签发人
@@ -48,7 +48,7 @@ public class JwtUtil {
                 .setId(UUID.randomUUID().toString())
                 .setId(UUID.randomUUID().toString())
                 //iat: jwt的签发时间
                 //iat: jwt的签发时间
                 .setIssuedAt(now)
                 .setIssuedAt(now)
-                //代表这个JWT的主体,即它的所有人,这个是一个json格式的字符串,可以存放什么userid,roldid之类的,作为什么用的唯一标志。
+                //代表这个JWT的主体,即它的所有人,这个是一个json格式的字符串,可以存放什么userid,roldid之类的,作为什么用的唯一标志。
                 .setSubject(subject)
                 .setSubject(subject)
                 //设置签名使用的签名算法和签名使用的秘钥
                 //设置签名使用的签名算法和签名使用的秘钥
                 .signWith(signatureAlgorithm, key);
                 .signWith(signatureAlgorithm, key);

+ 2 - 2
src/main/java/com/cdf/util/UploadToCdfOssUtil.java

@@ -849,7 +849,7 @@ public class UploadToCdfOssUtil {
 	 * @return
 	 * @return
 	 */
 	 */
 	public String getObjectContentFromAli(String bucketName, String objectName){
 	public String getObjectContentFromAli(String bucketName, String objectName){
-		//创建oss客
+		//创建oss客
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		InputStream objectContent = null;
 		InputStream objectContent = null;
 		StringBuilder contentJson = new StringBuilder();
 		StringBuilder contentJson = new StringBuilder();
@@ -883,7 +883,7 @@ public class UploadToCdfOssUtil {
 	 * @return
 	 * @return
 	 */
 	 */
 	public boolean existOnAli(String objectName){
 	public boolean existOnAli(String objectName){
-		//创建oss客
+		//创建oss客
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
 		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
 		try{
 		try{

+ 2 - 2
src/main/java/com/cdf/util/UploadToFdkkOssUtil.java

@@ -694,7 +694,7 @@ public class UploadToFdkkOssUtil {
 	 * @return
 	 * @return
 	 */
 	 */
 	public String getObjectContentFromAli(String bucketName, String objectName){
 	public String getObjectContentFromAli(String bucketName, String objectName){
-		//创建oss客
+		//创建oss客
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		InputStream objectContent = null;
 		InputStream objectContent = null;
 		StringBuilder contentJson = new StringBuilder();
 		StringBuilder contentJson = new StringBuilder();
@@ -728,7 +728,7 @@ public class UploadToFdkkOssUtil {
 	 * @return
 	 * @return
 	 */
 	 */
 	public boolean existOnAli(String objectName){
 	public boolean existOnAli(String objectName){
-		//创建oss客
+		//创建oss客
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
 		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
 		try{
 		try{