Merge remote-tracking branch 'origin/master'

src/main/java/net/mingsoft/cms/action/CategoryAction.java

@@ -13,7 +13,7 @@ import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.basic.util.StringUtil;
 import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.entity.CategoryEntity;
-import net.mingsoft.cms.util.PinYinUtil;
+import net.mingsoft.basic.util.PinYinUtil;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

src/main/java/net/mingsoft/cms/biz/impl/CategoryBizImpl.java

@@ -28,7 +28,7 @@ import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.dao.ICategoryDao;
 import net.mingsoft.cms.entity.CategoryEntity;
-import net.mingsoft.cms.util.PinYinUtil;
+import net.mingsoft.basic.util.PinYinUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/net/mingsoft/cms/upgrade/Upgrade.java

@@ -5,7 +5,7 @@ import net.mingsoft.basic.util.BasicUtil;
 import net.mingsoft.basic.util.SpringUtil;
 import net.mingsoft.cms.biz.ICategoryBiz;
 import net.mingsoft.cms.entity.CategoryEntity;
-import net.mingsoft.cms.util.PinYinUtil;
+import net.mingsoft.basic.util.PinYinUtil;
 
 import java.util.List;
 

src/main/java/net/mingsoft/cms/util/PinYinUtil.java

@@ -1,33 +0,0 @@
-package net.mingsoft.cms.util;
-
-import com.github.stuxuhai.jpinyin.PinyinException;
-import com.github.stuxuhai.jpinyin.PinyinFormat;
-import com.github.stuxuhai.jpinyin.PinyinHelper;
-import org.apache.commons.lang3.StringUtils;
-
-/**
- * @author by 铭飞开源团队
- * @Description TODO
- * @date 2020/6/16 14:40
- */
-public class PinYinUtil {
-
-
-    /**
-     * 将字符串中的中文转化为拼音,其他字符不变
-     *
-     * @param inputString
-     * @return
-     */
-    public static String getPingYin(String inputString)  {
-        if (!StringUtils.isBlank(inputString)) {
-            try {
-                return  PinyinHelper.convertToPinyinString(inputString,"", PinyinFormat.WITHOUT_TONE);
-            } catch (PinyinException e) {
-                e.printStackTrace();
-            }
-        }
-        return "";
-    }
-
-}