init aidea products by 20200922

cftech-common-web/src/main/resources/common-test.properties

@@ -39,8 +39,8 @@ WOEK_TEMPLATE_MESSAGE=8m-_tt_EqoQO-wsE6_JLJdn3nO15_hgUp9mLTujz5RU
 userfiles.imgdir=E:\\fileResource
 
 #\u56FE\u7247\u8BBF\u95EE\u5730\u5740
-IMAGEURL=/schaeffler/mobile/qybase/showPic?picFileName={PICFILENAME}
-ROOT_ORG_NAME=\u4E1C\u660C\u96C6\u56E2
+ROOT_ORG_NAME=\u827E\u8FEA\u836F\u4E1A
+IMAGEURL=/aidea/mobile/qybase/showPic?picFileName={PICFILENAME}
 ROOT_PAPERCATEGORY_NAME=\u95EE\u5377\u7C7B\u578B
 ROOT_QUESTIONSCATEGORY_NAME=\u95EE\u9898\u7C7B\u522B
 ROOT_MATERIALCATEGORY_NAME=\u7D20\u6750\u7C7B\u522B
@@ -106,7 +106,7 @@ orderDeliverGoodsTemplateId=TH3I5prFYPC54M14zFJfgN4gvjx8SpJayctIHmzThwg
 #\u670D\u52A1\u5B8C\u6210\u901A\u77E5
 serverEndTemplateId=7L1KIroXNxejxotFTzll-dVLdo1xbmqoiAo7UmDKWcc
 
-PRODUCT_CLASSIFY_FATHER_NAME=Ʒ
+PRODUCT_CLASSIFY_FATHER_NAME=\uFFFD\uFFFD\u01B7\uFFFD\uFFFD\uFFFD\uFFFD
 
 #\u54C1\u724C\u7533\u8BF7\u6D88\u606F\u6A21\u677F
 brandApplyCommTemplateId=82ByH2tkWI1-jlYiWr_-CIihWsgjrvLdFvuO771FwBo

cftech-common-web/src/main/webapp/assets/adminlte/plugins/ueditor-min-1.4.3/ueditor.config.js

@@ -21,7 +21,7 @@
      */
 	//var URL = base + '/ueditor-min-1.4.3/';
     //var URL = 'plugins/ueditor-min-1.4.3/';
-        var URL = '/schaeffler/assets/adminlte/plugins/ueditor-min-1.4.3/';
+        var URL = '/aidea/assets/adminlte/plugins/ueditor-min-1.4.3/';
 
     /**
      * 配置项主体。注意，此处所有涉及到路径的配置别遗漏URL变量。

cftech-common/src/main/java/com/cftech/core/util/OKHttpUtils.java

@@ -18,7 +18,7 @@ public class OKHttpUtils {
 
     static OkHttpClient client;
     static {
-         OkHttpClient.Builder builder = new OkHttpClient.Builder();
+        OkHttpClient.Builder builder = new OkHttpClient.Builder();
         Dispatcher dispatcher = new Dispatcher();
         dispatcher.setMaxRequests(100);
         dispatcher.setMaxRequestsPerHost(50);

cos-modules/cos-upload-module-web/src/main/webapp/WEB-INF/views/upload/materialUploadform.html

@@ -242,6 +242,9 @@
                                         #if($cosconfig.cosType == "qiniu")
                                         <option value="$cosconfig.id">七牛</option>
                                         #end
+                                        #if($cosconfig.cosType == "local")
+                                        <option value="$cosconfig.id">本地</option>
+                                        #end
                                         #end
                                     </select>
                                 </div>

portal-web/pom.xml

@@ -238,6 +238,12 @@
             <version>1.0-SNAPSHOT</version>
             <type>war</type>
         </dependency>
+        <dependency>
+            <groupId>com.cftech</groupId>
+            <artifactId>product-classify-module-web</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>war</type>
+        </dependency>
         <!--<dependency>
             <groupId>com.cftech</groupId>
             <artifactId>fours-job-module</artifactId>

portal-web/src/main/webapp/WEB-INF/web.xml

@@ -38,7 +38,7 @@
 
 	<context-param>
 		<param-name>webAppRootKey</param-name>
-		<param-value>schaeffler</param-value>
+		<param-value>aidea</param-value>
 	</context-param>
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>

qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerorgunit/orgunitadd.html

@@ -112,19 +112,19 @@
                                            maxlength="50" placeholder="组织名称" required="required"
                                            value="$!{data.orgName}">
                                 </div>
-                                <div class="form-group form-md-line-input">
-                                    <label>组织分类</label>
-                                    <div class="input-group">
-                                        <input type="text" id="orgtypeId" name="orgtypeId" value="$!{data.orgtypeId}"
-                                               class="form-control" style="display: none">
-                                        <input type="text" id="orgtypeName" name="orgtypeName" value="$!{orgtypeName}"
-                                               class="form-control" disabled>
-                                        <span class="input-group-btn">
-                                            <button type="button" id="orgtypeSelect"
-                                                    class="btn btn-info btn-flat">选择</button>
-                                         </span>
-                                    </div>
-                                </div>
+                                <!--<div class="form-group form-md-line-input">-->
+                                    <!--<label>组织分类</label>-->
+                                    <!--<div class="input-group">-->
+                                        <!--<input type="text" id="orgtypeId" name="orgtypeId" value="$!{data.orgtypeId}"-->
+                                               <!--class="form-control" style="display: none">-->
+                                        <!--<input type="text" id="orgtypeName" name="orgtypeName" value="$!{orgtypeName}"-->
+                                               <!--class="form-control" disabled>-->
+                                        <!--<span class="input-group-btn">-->
+                                            <!--<button type="button" id="orgtypeSelect"-->
+                                                    <!--class="btn btn-info btn-flat">选择</button>-->
+                                         <!--</span>-->
+                                    <!--</div>-->
+                                <!--</div>-->
                                 <!--<div class="checkbox">-->
                                 <!--<label>-->
                                 <!--<input type="checkbox" id="isAdminUnit" name="isAdminUnit"-->

qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/OrgUnitController.java

@@ -105,7 +105,7 @@ public class OrgUnitController {
 
     //提交编辑页面（新增、修改）
     @RequiresPermissions(value = PermissionSign.ORGUNIT_EDIT)
-    @RequestMapping(value = "/formData",method = {RequestMethod.POST})
+    @RequestMapping(value = "/formData")
     @ResponseBody
     public JSONObject formData(OrgUnit orgUnit, Model model, HttpServletRequest request) {
         Long accountsId = UserUtils.getmpaccounts(request);
@@ -123,20 +123,20 @@ public class OrgUnitController {
                     orgUnit.setParentIds("0," + orgUnit.getId() + ",");
                 }
 
-// 2017-10-27      取消同步企业号，组织功能
-//                if (StringUtils.isEmpty(orgUnit.getWxorgId())) {
-//                    int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit);
-//                    if (wxorgid == -1) {
-//                        log.error("同步微信端出错," + orgUnit.toString());
-//                    } else {
-//                        orgUnit.setWxorgId("" + wxorgid);
-//
-//                    }
-//                } else {
-//                    if (!qyOrgUtil.update(orgUnit)) {
-//                        log.error("同步微信端出错," + orgUnit.toString());
-//                    }
-//                }
+                //同步至企业号
+                if (StringUtils.isEmpty(orgUnit.getWxorgId())) {
+                    int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit);
+                    if (wxorgid == -1) {
+                        log.error("同步微信端出错," + orgUnit.toString());
+                    } else {
+                        orgUnit.setWxorgId("" + wxorgid);
+
+                    }
+                } else {
+                    if (!qyOrgUtil.update(orgUnit)) {
+                        log.error("同步微信端出错," + orgUnit.toString());
+                    }
+                }
 
                 orgUnitService.updateCache(orgUnit);
                 rtnJson.put("errorNo", 0);
@@ -157,14 +157,13 @@ public class OrgUnitController {
                 orgUnit.setUpdateBy(UserUtils.getUser().getId());
                 orgUnitService.saveCache(orgUnit);
 
-//                2017-10-27      取消同步企业号，组织功能
-//                int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit);
-//                if (wxorgid == -1 || wxorgid == 0) {
-//                    rtnJson.put("errorNo", 1);
-//                    throw new Exception("同步微信端出错");
-//                } else {
-//                    orgUnit.setWxorgId("" + wxorgid);
-//                }
+                int wxorgid = qyOrgUtil.create(orgUnit, parentOrgUnit);
+                if (wxorgid == -1 || wxorgid == 0) {
+                    rtnJson.put("errorNo", 1);
+                    throw new Exception("同步微信端出错");
+                } else {
+                    orgUnit.setWxorgId("" + wxorgid);
+                }
 
                 orgUnit.setParentIds(orgUnit.getParentIds() + orgUnit.getId() + ",");
                 orgUnitService.updateCache(orgUnit);