address-client 3.2.112-yangchun → 3.2.112

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Wed Jun 19 13:32:59 CST 2024
-gradle.version=8.5
+#Mon Dec 07 15:35:10 CST 2020
+gradle.version=5.2.1

package/build/dev-server.js

@@ -3,23 +3,26 @@ var webpack = require('webpack')
 var config = require('./webpack.dev.conf')
 var proxyMiddleware = require('http-proxy-middleware')
 var httpProxy = require('http-proxy')
-
+var checkVersion = require('./versionCheck.js')
+checkVersion()
 var app = express()
 var compiler = webpack(config)
 var proxy = httpProxy.createProxyServer()
 
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
-var str = 'http://192.168.50.4:8400/', str2= 'http://192.168.50.4:8400/'
-// var str3= 'http://172.168.1.11:9001/#'
-var str3= 'http://192.168.50.4:8400/'
-//
+var str = 'http://192.168.50.67:30785/', str2= 'http://192.168.50.67:30785/'
+var str3= 'http://192.168.50.67:30785/'
 var proxyTable = {
-  '/rs/sql/address_getAddress': {
-    target: 'http://127.0.0.1:9014/',
-    // secure:true,
-    // changeOrigin:true
-    // target: 'http://127.0.0.1:8080'
+  '/api/af-auth': {
+    target: str
+  },
+  '/api/af-system': {
+    target: str
+  },
+  '/api/af-revenue': {
+    pathRewrite: {'/api/af-revenue': '/'},
+    target: 'http://127.0.0.1:9026'
   },
   '/rs/entity': {
     target: str

package/build/versionCheck.js

@@ -0,0 +1,31 @@
+function isVersionGreaterThan (version1, version2) {
+  const v1parts = version1.split('.')
+  const v2parts = version2.split('.')
+  let flag = false
+  for (let i = 0; i < v1parts.length; ++i) {
+    if (v1parts[i] > v2parts[i]) {
+      flag = true
+      break
+    }
+  }
+
+  return flag
+}
+
+const pkg = require('../package.json')
+const checkVersion = () => {
+  console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 addressclient 版本, 会发送 api/af-revenue/sql ,api/af-revenue/logic 到v4 服务')
+  const {devDependencies} = pkg
+  if (devDependencies && devDependencies['system-clients']) {
+    if (isVersionGreaterThan(devDependencies['system-clients'], '3.2.87')) {
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请注意：当前使用的 systemClients 版本不兼容旧版登录')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '登录是会发送 api/af-auth 请求')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请转发到公司 v4 测试地址或者客户 v4 网关')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '如不使用新版登录，请降级 system-clients 版本到 3.2.87')
+      console.log('\x1b[48;5;88m\x1b[1m\x1b[37m%s\x1b[0m', '请查看营收后台升级日志：' +
+        'http://aote-office.8866.org:31467/sale-doc-web/V4Product/%E8%90%A5%E6%94%B6%E5%90%8E%E5%8F%B0%E6%94%B9%E9%80%A0%E8%AF%B4%E6%98%8E')
+    }
+  }
+}
+
+module.exports = checkVersion

package/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

package/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

package/gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.112-yangchun",
+  "version": "3.2.112",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",
@@ -23,6 +23,7 @@
     "url": "https://gitee.com/aote/address_management.git"
   },
   "dependencies": {
+    "crypto-js": "^4.1.1",
     "less-loader": "^2.2.3",
     "vue": "^1.0.17"
   },
@@ -78,10 +79,10 @@
     "sinon-chai": "^2.8.0",
     "style": "0.0.3",
     "style-loader": "^0.20.3",
-    "ldap-clients": "3.0.48",
-    "system-clients": "3.2.68",
+    "ldap-clients": "3.0.96",
+    "system-clients": "4.0.12",
     "url-loader": "^0.5.7",
-    "vue-client": "1.24.98",
+    "vue-client": "1.25.38",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",