9.26。13

luo

2023-09-27 c4a8185f1268e8c66c3dae2c65db8f905952c6e1

9.26。13

 .idea/workspace.xml

@@ -25,11 +25,18 @@
    <select />
  </component>
  <component name="ChangeListManager">
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。11">
    <list default="true" id="cb08d02f-fd4f-4fa2-85fe-abd508fa83ac" name="Default Changelist" comment="9.26。12">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-course/src/main/resources/mapper/CoursePackageSchedulingMapper.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/TStudentController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/webapp/WEB-INF/view/system/tStudent/banckmoney.html" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java" beforeDir="false" afterPath="$PROJECT_DIR$/cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -59,13 +66,15 @@
  <component name="MavenImportPreferences">
    <option name="generalSettings">
      <MavenGeneralSettings>
        <option name="mavenHome" value="$PROJECT_DIR$/../../../apache-maven/apache-maven-3.6.1" />
        <option name="userSettingsFile" value="D:\apache-maven\apache-maven-3.6.1\conf\settings.xml" />
        <option name="mavenHome" value="使用 Maven 包装器" />
      </MavenGeneralSettings>
    </option>
  </component>
  <component name="PackageJsonUpdateNotifier">
    <dismissed value="$PROJECT_DIR$/package.json" />
  </component>
  <component name="ProblemsViewState">
    <option name="selectedTabId" value="ProjectErrors" />
  </component>
  <component name="ProjectId" id="2T0poWYlZShlnPso29uxjn4gQQo" />
  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
@@ -96,7 +105,7 @@
    &quot;project.structure.last.edited&quot;: &quot;模块&quot;,
    &quot;project.structure.proportion&quot;: &quot;0.15&quot;,
    &quot;project.structure.side.proportion&quot;: &quot;0.54367816&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;,
    &quot;settings.editor.selected.configurable&quot;: &quot;MavenSettings&quot;,
    &quot;spring.configuration.checksum&quot;: &quot;b0c8222ba40624e179f539b98c2e8cad&quot;,
    &quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
  }
@@ -294,7 +303,8 @@
      <workItem from="1695689815334" duration="13353000" />
      <workItem from="1695718856285" duration="22098000" />
      <workItem from="1695775091167" duration="4246000" />
      <workItem from="1695794503293" duration="1371000" />
      <workItem from="1695794503293" duration="3283000" />
      <workItem from="1695799021203" duration="5869000" />
    </task>
    <task id="LOCAL-00001" summary="后台代码删除">
      <created>1690249807612</created>
@@ -539,7 +549,15 @@
      <option name="project" value="LOCAL" />
      <updated>1695740202022</updated>
    </task>
    <option name="localTasksCounter" value="33" />
    <task id="LOCAL-00033" summary="9.26。12">
      <option name="closed" value="true" />
      <created>1695795966970</created>
      <option name="number" value="00033" />
      <option name="presentableId" value="LOCAL-00033" />
      <option name="project" value="LOCAL" />
      <updated>1695795966970</updated>
    </task>
    <option name="localTasksCounter" value="34" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -576,7 +594,8 @@
    <MESSAGE value="9.26。9" />
    <MESSAGE value="9.26。10" />
    <MESSAGE value="9.26。11" />
    <option name="LAST_COMMIT_MESSAGE" value="9.26。11" />
    <MESSAGE value="9.26。12" />
    <option name="LAST_COMMIT_MESSAGE" value="9.26。12" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/CoachController.java

@@ -128,7 +128,9 @@
            coach.setCityManagerId(objectId);

        }
        if (coach.getDiploma().equals("")) coach.setDiploma(null);
        if (coach.getDiploma().equals("")) {
            coach.setDiploma(null);
        }
        if (coach.getCertificateImg().equals("") ){
            coach.setCertificateImg(null);
        }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TAppUserController.java

@@ -172,7 +172,7 @@
            for (QueryAppUserVO queryAppUserVO : queryAppUserVOS) {
                if (queryAppUserVO.getSalesmanUserId()!=null){
                    for (User sale : sales) {
                        if (queryAppUserVO.getSalesmanUserId() == sale.getId()){
                        if (queryAppUserVO.getSalesmanUserId().equals(sale.getId())){
                            result.add(queryAppUserVO);
                        }
                    }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCityController.java

@@ -172,7 +172,9 @@
    @RequestMapping(value = "/onChange")
    @ResponseBody
    public Object onChange(Integer oneId) {
        if (oneId == null) return null;
        if (oneId == null) {
            return null;
        }
        try {
            TCity one = cityService.getOne(new LambdaQueryWrapper<TCity>().eq(TCity::getCode, oneId));
            QueryWrapper<TCity> query = new QueryWrapper<TCity>().eq("parent_id", one.getId());

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TWelfareVideoController.java

@@ -176,7 +176,7 @@
        List<TQueryBenefitsVideosVO> courseByCourseIds = courseClient.getCourseByCourseIds(vo);
        for (BenefitsVideos benefitsVideos : benefitVideoById) {
            for (TQueryBenefitsVideosVO courseByCourseId : courseByCourseIds) {
                if (benefitsVideos.getCourseId() == courseByCourseId.getId()){
                if (benefitsVideos.getCourseId().equals(courseByCourseId.getId())){
                    courseByCourseId.setIntegral(benefitsVideos.getIntegral());
                    courseByCourseId.setBenefitsVideosId(benefitsVideos.getId());
                }

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/KaptchaController.java

@@ -23,6 +23,7 @@
 * @author fengshuonan
 * @date 2017-05-05 23:10
 */

@Controller
@RequestMapping("/kaptcha")
public class KaptchaController {

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/Convert.java

@@ -37,10 +37,11 @@
        try {
            if (clazz.isAssignableFrom(String.class)) {
                // ----2016-12-19---zhuangqian----防止beetlsql对空字符串不检测导致无法入库的问题----
                if (StrKit.isBlank(String.valueOf(value)))
                if (StrKit.isBlank(String.valueOf(value))) {
                    return " ";
                else
                } else {
                    return String.valueOf(value);
                }
            }
            return clazz.cast(value);
        } catch (ClassCastException e) {
@@ -83,7 +84,9 @@
            return null;
        }

        if (StrKit.isBlank(valueStr)) return null;
        if (StrKit.isBlank(valueStr)) {
            return null;
        }
        
        BasicType basicType = null;
        try {
@@ -971,11 +974,13 @@
            c = strText.charAt(i);
            intAsc = (int) c;
            strHex = Integer.toHexString(intAsc);
            if (intAsc > 128)
            if (intAsc > 128) {
                str.append("\\u" + strHex);
            else // 低位在前面补00
            } else // 低位在前面补00
            {
                str.append("\\u00" + strHex);
        }
        }
        return str.toString();
    }


 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/MD5.java

@@ -25,8 +25,9 @@
     * 
     */
    public static String md5(String input) {
        if (input == null)
        if (input == null) {
            return null;
        }

        try {
            // 拿到一个MD5转换器（如果想要SHA1参数换成”SHA1”）

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/util/SignUtil.java

@@ -73,11 +73,12 @@
    private static String byteArrayToString(byte[] byteArray){
        StringBuilder strBuilder = new StringBuilder();
        for (int i = 0; i < byteArray.length; i++) {
            if (Integer.toHexString(0xFF & byteArray[i]).length() == 1)
            if (Integer.toHexString(0xFF & byteArray[i]).length() == 1) {
                strBuilder.append("0").append(Integer.toHexString(0xFF & byteArray[i]));
            else
            } else {
                strBuilder.append(Integer.toHexString(0xFF & byteArray[i]));
        }
        }
        return strBuilder.toString();
    }


 cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/OrderUtil.java

@@ -12,7 +12,7 @@
public class OrderUtil {
    
    /* 订单号 */
    private static long orderNum = 0l;
    private static long orderNum = 0L;
    
    /* 日期 */
    private static String date;
@@ -25,7 +25,7 @@
        String str = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
        if (date == null || !date.equals(str)) {
            date = str;
            orderNum = 0l;
            orderNum = 0L;
        }
        orderNum++;
        long orderNo = Long.parseLong((date)) * 1000000;

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/util/three/Base64Coder.java

@@ -26,16 +26,18 @@
                char_array_4[1] = (byte) (((char_array_3[0] & 0x03) << 4) + ((char_array_3[1] & 0xf0) >> 4));
                char_array_4[2] = (byte) (((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6));
                char_array_4[3] = (byte) (char_array_3[2] & 0x3f);
                for (i = 0; (i < 4); i++)
                for (i = 0; (i < 4); i++) {
                    retContent += base64_alphabet[char_array_4[i]];
                }
                i = 0;
            }
        }

        // handling the last input content
        if (i > 0) {
            for (j = i; j < 3; j++)
            for (j = i; j < 3; j++) {
                char_array_3[j] = 0; // padding of zero
            }

            char_array_4[0] = (byte) ((char_array_3[0] & 0xfc) >> 2); // right
                                                                        // shift
@@ -43,12 +45,15 @@
            char_array_4[2] = (byte) (((char_array_3[1] & 0x0f) << 2) + ((char_array_3[2] & 0xc0) >> 6));
            char_array_4[3] = (byte) (char_array_3[2] & 0x3f);

            for (j = 0; (j < i + 1); j++)
            for (j = 0; (j < i + 1); j++) {
                retContent += base64_alphabet[char_array_4[j]];
            }

            while ((i++ < 3))
                // padding of '=' of output string
            {
                retContent += '=';
            }

        }
        return retContent;
@@ -68,34 +73,39 @@
            mLength--;
            char_array_4[i++] = data[enCode++];
            if (i == 4) {
                for (i = 0; i < 4; i++)
                for (i = 0; i < 4; i++) {
                    char_array_4[i] = findChar((char) char_array_4[i]);
                }

                char_array_3[0] = (byte) ((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4));
                char_array_3[1] = (byte) (((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2));
                char_array_3[2] = (byte) (((char_array_4[2] & 0x3) << 6) + char_array_4[3]);

                for (i = 0; (i < 3); i++)
                for (i = 0; (i < 3); i++) {
                    retContent += (char) char_array_3[i];
                }
                i = 0;
            }
        }

        // last content handling
        if (i > 0) {
            for (j = i; j < 4; j++)
            for (j = i; j < 4; j++) {
                char_array_4[j] = 0;
            }

            for (j = 0; j < 4; j++)
            for (j = 0; j < 4; j++) {
                char_array_4[j] = findChar((char) char_array_4[j]);
            }

            char_array_3[0] = (byte) ((char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4));
            char_array_3[1] = (byte) (((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2));
            char_array_3[2] = (byte) (((char_array_4[2] & 0x3) << 6) + char_array_4[3]);

            for (j = 0; (j < i - 1); j++)
            for (j = 0; (j < i - 1); j++) {
                retContent += (char) char_array_3[j];
        }
        }

        return retContent;
    }